1.资产业务流程分叉节点调整从撰写报告调整为资产报告取号

dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetMapper.java

@@ -67,4 +67,11 @@ public interface AssetsEvaluationTargetMapper extends CustomBaseMapper<AssetsEva
      * @return Integer
      */
     Integer targetCount(@Param("businessId") Long businessId, @Param("statementNo") String statementNo);
+
+    /**
+     * 根据业务id获取业务下所有评估对象的id
+     * @param businessId 业务id
+     * @return List<Long>
+     */
+    List<Long> getTargetIdsByBusinessId(@Param("businessId") Long businessId);
 }

dao/src/main/resources/mapper/AssetsEvaluationTargetMapper.xml

@@ -142,4 +142,12 @@
         </if>
     </select>
 
+    <!--根据业务id获取业务下所有评估对象的id-->
+    <select id="getTargetIdsByBusinessId" resultType="java.lang.Long">
+        SELECT id
+        FROM assets_evaluation_target
+        WHERE deleted = 0
+        AND assets_id = #{businessId}
+    </select>
+
 </mapper>

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -467,7 +467,9 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
 
         //获取当前资产业务流程的评估对象已经生成的产品号集合
         List<String> productionNoList = null;
-        //判断取号的产品类型
+        // 获取业务下所有评估对象的id集合
+        takeAssetsProductionNoDTO.setAllTargetIdList(assetsEvaluationTargetMapper.getTargetIdsByBusinessId(takeAssetsProductionNoDTO.getBusinessId()));
+        //判断取号的产品类型(获取已取过的号)
         if (takeAssetsProductionNoDTO.getProductionType().equals(STATEMENT.getCode())) { //意见书
             productionNoList = assetsEvaluationTargetMapper.getStatementNoList(takeAssetsProductionNoDTO.getBusinessId());
         } else { //报告

service/src/main/java/com/dayou/workflow/handler/AssetsNodeHandler.java

@@ -112,11 +112,11 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
                         .eq(BaseEntity::getId, currentInstanceNode.getNodeId()).eq(BaseEntity::getDeleted, Boolean.FALSE)).getCode();
                 WorkflowNodeEnum workflowNodeEnum = WorkflowNodeEnum.valueOf(code);
 
-                if (workflowNodeEnum.equals(WorkflowNodeEnum.GENERATE_STATEMENT)) {
+                if (workflowNodeEnum.equals(WorkflowNodeEnum.GENERATE_STATEMENT)) { // 意见书撰写后分叉
                     for (String businessSubId : workNodeCommit.getReportNos()) {
                         addNextInstanceNode(currentInstanceNode, nextWorkNode, workNodeCommit.getNextHandlerId(), businessSubId, null);
                     }
-                } else if (workflowNodeEnum.equals(WorkflowNodeEnum.WRITE_REPORT)) {
+                } else if (workflowNodeEnum.equals(WorkflowNodeEnum.ASSET_REPORT_TAKE_NO)) { // 报告取号后分叉
                     for (String businessMinId : workNodeCommit.getReportNos()) {
                         addNextInstanceNode(currentInstanceNode, nextWorkNode, workNodeCommit.getNextHandlerId(), workNodeCommit.getBusinessSubId(), businessMinId);
                     }