fix:1.修复业务研发净利润与内部生产净利润在锁定表中由于对prefix进行了唯一索引,所以在查询时不能再判断userid申请,无论谁申请都能查到才不会出现唯一索引出错的情况。

2.修复应收款应付款管理,由于数据幂等性,造成利润表插入多条相同orderId数据,在应收款查询出来多条应收应付数据的问题。

fix:1.修复业务研发净利润与内部生产净利润在锁定表中由于对prefix进行了唯一索引,所以在查询时不能再判断userid申请,无论谁申请都能查到才不会出现唯一索引出错的情况。
2.修复应收款应付款管理,由于数据幂等性,造成利润表插入多条相同orderId数据,在应收款查询出来多条应收应付数据的问题。
chenhang4442024
1 parent b3efa9a2
Showing 2 changed files with 10 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
src/main/resources/mapper/InvoiceBillOrderMapper.xml
@@ -112,7 +112,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(ProjectFieldLockRecord::getProjectNoPrefix, projectNoPrefix)
-                .eq(ProjectFieldLockRecord::getUserId, dataScope.getLoginUserId())
+//                .eq(ProjectFieldLockRecord::getUserId, dataScope.getLoginUserId())
                 .orderByDesc(ProjectFieldLockRecord::getId)
                 .last("limit 1"));
         if (Objects.isNull(recordDO)) {
@@ -251,7 +251,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                     .eq(ProjectFieldLockRecord::getProjectNoPrefix, applyDO.getProjectNoPrefix())
-                    .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
+//                    .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
                     .orderByDesc(ProjectFieldLockRecord::getId)
                     .last("limit 1"));
             if (Objects.isNull(recordDO)) {
@@ -123,8 +123,14 @@
         ON o.id = i.order_id AND i.enable_flag = 10
         LEFT JOIN produce_payment_check_bill_order AS p
         ON o.id = p.order_id AND p.enable_flag = 10
-        LEFT JOIN order_profit_analysis AS a
-        ON o.id = a.order_id AND a.enable_flag = 10
+        LEFT JOIN (      --  子查询,当时存储利润数据时,可能幂等性问题造成一个orderId创建了两条或者多条利润数据,现在需要对利润数据进行保留一条,一一对应。
+        SELECT *  FROM (
+        SELECT *,
+        ROW_NUMBER() OVER(PARTITION BY order_id ORDER BY id ASC) AS rn
+        FROM order_profit_analysis
+        WHERE enable_flag = 10
+        ) AS temp WHERE temp.rn = 1) AS a
+        ON o.id = a.order_id
         WHERE o.enable_flag = 10
         <if test="queryVO.invoiceNo != null and queryVO.invoiceNo != ''">
             AND i.invoice_no LIKE CONCAT('%', #{queryVO.invoiceNo}, '%')