1.资产流程分叉节点修改后退回逻辑变更

biz-base/src/main/java/com/dayou/controller/AssetsProductionController.java

@@ -92,12 +92,13 @@ public class AssetsProductionController extends BaseController {
 
     /**
      * 产品信息更新
-     * @param assetsProduction prod
+     * @param dto prod
      * @return RestResponse<Boolean>
      */
+    @FinishTask
     @PutMapping("/update")
-    public RestResponse<Boolean> update(@RequestBody AssetsProduction assetsProduction) {
-        Boolean ret = assetsProductionService.update(assetsProduction);
+    public RestResponse<Boolean> update(@RequestBody TaskRecordDTO<AssetsProduction> dto) {
+        Boolean ret = assetsProductionService.update(dto.getTaskData());
         return RestResponse.data(ret);
     }
 

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

@@ -158,13 +158,13 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
     public boolean goBack(WorkNodeCommit commit) {
         Long instanceNodeId = commit.getInstanceNodeId();
         WorkFlowNodeInstance currentNode = workFlowNodeInstanceMapper.getInstanceNodeInfoById(instanceNodeId);
-        // 用于判断是否是审核节点退回到撰写节点
-        List<String> checkNodes = Arrays.asList(REVIEW_STATEMENT.name(), CHECK_REPORT.name());
+        // 用于判断是否是审核意见书节点退回到撰写意见书节点 或 撰写报告节点退回到报告取号节点
+        List<String> checkNodes = Arrays.asList(REVIEW_STATEMENT.name(), WRITE_REPORT.name());
 
         // 用于判断是否是复审节点进行退回操作
         List<String> reCheckNodes = Arrays.asList(REEXAMINE_STATEMENT.name(), RECHECK_REPORT.name());
 
-        if (checkNodes.contains(currentNode.getNodeCode())) { // 审核节点退回到撰写节点
+        if (checkNodes.contains(currentNode.getNodeCode())) { // 审核意见书节点退回到撰写意见书节点 或 撰写报告节点退回到报告取号节点
             //将上一个节点状态改为PENDING
             workFlowNodeInstanceService.update(new LambdaUpdateWrapper<WorkFlowNodeInstance>()
                     .set(WorkFlowNodeInstance::getState, PENDING)