中间合同BUG修复

hx-sale/src/main/java/com/fjhx/sale/entity/intermediate/vo/IntermediateContractVo.java

@@ -130,4 +130,9 @@ public class IntermediateContractVo extends IntermediateContract {
      */
     private Long flowId;
 
+    /**
+     * 合同ID
+     */
+    private Long cId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1748,12 +1748,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         map.put("contract",contract);
         //查询合同产品
         List<ContractProduct> contractProductList = contractProductService.list(Wrappers.<ContractProduct>query().lambda().in(ContractProduct::getContractId,contractIds));
-        productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
-            item.setProductCnName(product.getName());
-            item.setProductCode(product.getCode());
-            item.setProductUnit(product.getUnit());
-        });
+        //查询合同产品
+        List<ContractProject> contractProjectList = contractProjectService.list(Wrappers.<ContractProject>query().lambda().in(ContractProject::getContractId,contractIds));
         map.put("contractProductList",contractProductList);
+        map.put("contractProjectList",contractProjectList);
         return map;
     }
 }

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -95,7 +95,7 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         });
         // 赋值流程id
         List<IntermediateContractVo> collect = records.stream().filter(item -> Objects.isNull(item.getFlowId())).collect(Collectors.toList());
-        flowExampleService.setFlowId(collect, IntermediateContractVo::setFlowId);
+        flowExampleService.setFlowId(collect, 2,IntermediateContractVo::setFlowId);
         UserUtil.assignmentNickName(records, IntermediateContractVo::getCreateUser, IntermediateContractVo::setUserName);
         return page;
     }

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -10,7 +10,8 @@
             c.sell_corporation_id,
             c.buy_corporation_id,
             d.create_user,
-            c.flow_id AS flowId
+            c.flow_id AS flowId,
+            c.id AS cId
         FROM
             documents d
         LEFT JOIN contract c ON d.contract_id = c.id
@@ -25,7 +26,7 @@
             c.flow_id AS flowId,
             (
                 SELECT
-                    `code`
+                    c.`code`
                 FROM
                     intermediate_contract i
                         JOIN documents d ON FIND_IN_SET( d.id, i.documents_ids )
@@ -35,7 +36,20 @@
                 ORDER BY
                     d.create_time DESC
                 LIMIT 1
-            ) AS `code`
+            ) AS `code`,
+            (
+            SELECT
+                c.id
+            FROM
+                intermediate_contract i
+                JOIN documents d ON FIND_IN_SET( d.id, i.documents_ids )
+                LEFT JOIN contract c ON d.contract_id = c.id
+            WHERE
+                i.id = t1.id
+            ORDER BY
+                d.create_time DESC
+                LIMIT 1
+            ) AS `cId`
         FROM
             intermediate_contract t1
             JOIN documents d ON FIND_IN_SET( d.id, t1.documents_ids )