1.资产退回流程优化

2.资产取号优化
3.资产审核定价优化

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

@@ -123,7 +123,9 @@
         UPDATE assets_evaluation_target
         SET check_value = #{checkValue},
             evaluation_method_id = #{evaluationMethodId},
-            choice_evaluation_method_id = #{choiceEvaluationMethodId}
+            choice_evaluation_method_id = #{choiceEvaluationMethodId},
+            defined_evaluation_method = #{definedEvaluationMethod},
+            choice_defined_evaluation_method = #{choiceDefinedEvaluationMethod}
         WHERE id = #{id}
           AND assets_id = #{assetsId}
           AND deleted = 0

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

@@ -326,9 +326,11 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
                             .eq(BusinessProductionChoiceLog::getBusinessId, dto.getBusinessId())
                             .eq(BusinessProductionChoiceLog::getTakeNoStatus, 0));
                     // 将未取号的评估对象对应的产品选择记录的产品id改为新的
-                    choiceLog.setProductionId(copyProductionInfo.getId());
-                    // 获取后将选择记录对应的产品id改为前面新添加的产品信息
-                    choiceLogList.add(choiceLog);
+                    if (ObjectUtil.isNotNull(choiceLog)){
+                        choiceLog.setProductionId(copyProductionInfo.getId());
+                        // 获取后将选择记录对应的产品id改为前面新添加的产品信息
+                        choiceLogList.add(choiceLog);
+                    }
                 }
             }
         }

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

@@ -154,15 +154,16 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
     public boolean goBack(WorkNodeCommit commit) {
         Long instanceNodeId = commit.getInstanceNodeId();
         WorkFlowNodeInstance currentNode = workFlowNodeInstanceMapper.getInstanceNodeInfoById(instanceNodeId);
-        //判断是否是审核节点退回
+        //判断是否是审核节点退回到撰写节点
         List<String> writeNodes = Arrays.asList(new String[]{REVIEW_STATEMENT.name(), CHECK_REPORT.name()});
         if (writeNodes.contains(currentNode.getNodeCode())) {
             //将上一个节点状态改为PENDING
-            workFlowNodeInstanceService.update(new LambdaUpdateWrapper<WorkFlowNodeInstance>().set(WorkFlowNodeInstance::getState, PENDING)
-                    .eq(WorkFlowNodeInstance::getBusinessId, currentNode.getBusinessId()).eq(WorkFlowNodeInstance::getFlowId, currentNode.getFlowId())
-//                    .eq(StrUtil.isNotEmpty(commit.getBusinessSubId()), WorkFlowNodeInstance::getBusinessSubId, commit.getBusinessSubId())
-//                    .eq(StrUtil.isNotEmpty(commit.getBusinessMinId()), WorkFlowNodeInstance::getBusinessMinId, commit.getBusinessMinId())
-                    .eq(WorkFlowNodeInstance::getSequence, (currentNode.getSequence() - 1)).eq(BaseEntity::getDeleted, Boolean.FALSE));
+            workFlowNodeInstanceService.update(new LambdaUpdateWrapper<WorkFlowNodeInstance>()
+                    .set(WorkFlowNodeInstance::getState, PENDING)
+                    .eq(WorkFlowNodeInstance::getBusinessId, currentNode.getBusinessId())
+                    .eq(WorkFlowNodeInstance::getFlowId, currentNode.getFlowId())
+                    .eq(WorkFlowNodeInstance::getSequence, (currentNode.getSequence() - 1))
+                    .eq(BaseEntity::getDeleted, Boolean.FALSE));
             //删除当前节点
             workFlowNodeInstanceService.delete(instanceNodeId);