Parcourir la source

1.AssetsNodeHandler选择节点处理人方法调整
2.新增资产评估对象接口调整

GouGengquan il y a 1 an
Parent
commit
f69bbae995

+ 5 - 2
biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetController.java

@@ -1,6 +1,8 @@
 package com.dayou.controller;
 
+import com.dayou.dto.TaskRecordDTO;
 import com.dayou.vo.AssetsEvaluationTargetVO;
+import com.dayou.workflow.annotation.FinishTask;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -67,9 +69,10 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 资产评估对象表新增
      */
+    @FinishTask
     @PostMapping("/save")
-    public RestResponse<Boolean> save(@RequestBody AssetsEvaluationTarget assetsEvaluationTarget) {
-        Boolean ret = assetsEvaluationTargetService.add(assetsEvaluationTarget);
+    public RestResponse<Boolean> save(@RequestBody TaskRecordDTO<AssetsEvaluationTarget> taskRecordDTO) {
+        Boolean ret = assetsEvaluationTargetService.add(taskRecordDTO.getTaskData());
         return RestResponse.data(ret);
     }
 

+ 1 - 1
service/src/main/java/com/dayou/workflow/handler/AssetsNodeHandler.java

@@ -151,7 +151,7 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
     @Override
     public Long searchHandlerId(WorkFlowNodeInstance instanceNode, HandlerPermissionDTO handlerPermissionDTO){
         HandlerPermissionEnum handlerPermissionEnum = handlerPermissionDTO.getName();
-        Assets assets = assetsMapper.selectOne(new LambdaQueryWrapper<Assets>().select(Assets::getClientManagerId)
+        Assets assets = assetsMapper.selectOne(new LambdaQueryWrapper<Assets>().select(Assets::getClientManagerId, Assets::getPrincipalId)
                 .eq(BaseEntity::getId, instanceNode.getBusinessId()));
         switch (handlerPermissionEnum){
             case EMPLOYEE: