隐患流程修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -13,7 +13,8 @@ import com.alibaba.fastjson.JSONObject;
 
 import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW-chenhao", path = "workflow", configuration =
+		{ CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDangerFlowRecord.java

@@ -50,6 +50,9 @@ public class LatentDangerFlowRecord extends BasicEntity {
     @Column(name = "execute_user_id")
     private String executeUserId;
 
+    @Column(name = "execute_user_name")
+    private String executeUserName;
+
     @Column(name = "execute_result")
     private String executeResult;
 
@@ -74,4 +77,7 @@ public class LatentDangerFlowRecord extends BasicEntity {
     @Column(name = "execute_department_id")
     private String executeDepartmentId;
 
+    @Column(name = "execute_department_name")
+    private String executeDepartmentName;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -146,9 +146,8 @@ public class LatentDangerController extends BaseController {
             String departmentName = getDepartmentName(reginParams);
             String userRealName = user.getRealName();
             String userId = user.getUserId();
-            RoleBo role = reginParams.getRole();
             DangerExecuteSubmitDto executeSubmitDto = iLatentDangerService.execute(latentDangerExecuteParam, userId,
-                    userRealName, deptId, departmentName, role);
+                    userRealName, deptId, departmentName, reginParams);
 //            iLatentDangerService.freshRiskJudgmentLangerCount(latentDangerExecuteParam);//更新统计
             // 执行通过，发送执行结果消息
 //            if (executeSubmitDto.getIsOk()) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerDto;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerExecuteParam;
@@ -55,7 +56,7 @@ public interface ILatentDangerService {
      * @return
      */
     DangerExecuteSubmitDto execute(LatentDangerExecuteParam latentDangerExecuteParam, String userId,
-                                   String userRealName, String departmentId, String departmentName, RoleBo role) throws Exception;
+                                   String userRealName, String departmentId, String departmentName, ReginParams reginParams) throws Exception;
 
     ResponseModel<LatentDangerDetailVo> detail(Long dangerId, String userId, boolean isFinish) throws Exception;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/vo/LatentDangerDetailVo.java

@@ -31,6 +31,8 @@ public class LatentDangerDetailVo {
 
     private Date reformLimitDate;
 
+    private String reformLimitDateStr;
+
     private JSONObject reformJson;
 
     private Long currentFlowRecordId;