隐患修改

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

@@ -246,7 +246,7 @@ public class LatentDangerController extends BaseController {
     }
 
     @ApiOperation(value = "获取隐患整改方式", notes = "获取隐患整改方式")
-    @GetMapping(value = "/danger/governance")
+    @GetMapping(value = "/dangerGovernance")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     public CommonResponse getDangerGovernance() {
         return CommonResponseUtil.success(iLatentDangerService.getDangerGovernance());

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -13,6 +13,7 @@ import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -164,6 +165,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    private WorkflowFeignService workflowFeignService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CommonResponse saveNormal(LatentDangerNormalParam latentDangerDto, String userId, String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
@@ -353,6 +357,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                                           LatentDangerTypeEnum dangerTypeEnum) {
         LatentDanger latentDanger = new LatentDanger();
         Bean.copyExistPropertis(param, latentDanger);
+        latentDanger.setDangerName(param.getName());
         if (ValidationUtil.isEmpty(param.getId())) {
             // 新增
             latentDanger.setBusinessKey(businessKey);
@@ -1106,7 +1111,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     }
 
     private DangerExecuteSubmitDto executeSupervisionBiz(LatentDangerExecuteParam param, LatentDanger latentDanger, String userId, String userRealName, String departmentId, String departmentName, DangerExecuteSubmitDto executeSubmitDto, RoleBo role) {
-
+        // 1、开启工作流
+        JSONObject result = workflowFeignService.startByVariable(latentDanger.getId());
         return executeSubmitDto;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/aop/EnumFillAop.java

@@ -47,6 +47,9 @@ public class EnumFillAop {
         if (!redisUtils.hasKey(Constants.DANGER_BIZ_TYPE_KEY)) {
             redisUtils.set(Constants.DANGER_BIZ_TYPE_KEY, bizType);
         }
+        if (bizType == null) {
+            bizType = redisUtils.get(Constants.DANGER_BIZ_TYPE_KEY).toString();
+        }
 
         // 获取隐患等级枚举
         if (ValidationUtil.isEmpty(LatentDangerLevelEnum.enumMap)) {