yzc il y a 1 an
Parent
commit
a61cfbd13f

+ 3 - 0
hx-common/src/main/java/com/fjhx/common/entity/claim/po/Claim.java

@@ -68,6 +68,9 @@ public class Claim extends BasePo {
      */
     private Date claimTime;
 
+    private Integer confirmStatus;
+    //=========================
+
     /**
      * 到账认领合同列表
      */

+ 6 - 0
hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -258,6 +258,12 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                 .set(BasePo::getUpdateTime, new Date())
         );
+        this.update(q -> q
+                .eq(Claim::getBusinessId, dto.getId())
+                .set(Claim::getConfirmStatus, 1)
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                .set(BasePo::getUpdateTime, new Date())
+        );
         ObsFileUtil.saveFile(dto.getFileList(), dto.getId(), 1);
     }
 

+ 3 - 1
hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -19,7 +19,9 @@
                            us.user_id                        salesmanId,
                            (SELECT IFNULL(SUM(cc.contract_money), 0)
                             FROM claim_contract cc
-                            WHERE cc.contract_id = t1.id) AS sumClaimMoney,
+                                     JOIN claim cl ON cc.claim_id = cl.id
+                            WHERE cl.confirm_status = 1
+                              and cc.contract_id = t1.id) AS sumClaimMoney,
                            po.produce_status,
                            IFNULL(t3.quantity, 0)         AS waitStockQuantity,
                            IFNULL(t3.receipt_quantity, 0) AS receiptStockQuantity,