item：修改防火监督审核流程

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanAuditController.java

 package com.yeejoin.amos.supervision.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanAuditService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
@@ -33,7 +32,6 @@ public class PlanAuditController extends AbstractBaseController {
             @ApiParam(value = "工作流流水实例", required = true) @RequestBody PlanAuditLog planAuditLog,
             @ApiParam(value = "执行控制条件", required = true) @RequestParam String condition) {
         try {
-            AgencyUserModel userInfo = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
             return CommonResponseUtil.success(planAuditService.auditWorkFlow(planAuditLog, condition, reginParams));
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -36,12 +36,12 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
         PlanAudit planAudit = planAuditDao.findByPlanId(planAuditLog.getPlanId());
         if (ObjectUtils.isNotEmpty(planAudit)) {
             String instanceId = planAudit.getProcessInstanceId();
-            Map<String, Object> taskAuthMap = workflowExcuteService.checkTaskAuthMap(instanceId);
+            Map<String, Object> taskAuthMap = workflowExcuteService.checkTaskAuthMap(instanceId, reginParams);
             if (taskAuthMap != null && !taskAuthMap.isEmpty()) {
-                String taskId = taskAuthMap.get("taskId").toString();
-                String name = taskAuthMap.get("name").toString();
+                String taskId = taskAuthMap.get("taskId") == null ? null : taskAuthMap.get("taskId").toString();
+                String name = taskAuthMap.get("name") == null ? null : taskAuthMap.get("name").toString();
                 String roleName = reginParams.getRole().getRoleName();
-                boolean b = workflowExcuteService.CompleteTask(instanceId, condition);
+                boolean b = workflowExcuteService.CompleteTask(instanceId, condition, reginParams);
                 if (b) {
                     ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
                     workflowExcuteService.setTaskAssign(instanceId, personIdentity.getPersonSeq());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -142,7 +142,7 @@ public class PlanServiceImpl implements IPlanService {
                 if ("1".equals(checkTypeId)) {
                     processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.SUPERVISED.getCondition());
                 } else if ("2".equals(checkTypeId)) {
-                    processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.SUPERVISED.getCondition());
+                    processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.DAILY.getCondition());
                 }
                 PlanAudit audit = new PlanAudit();
                 audit.setPlanId(param.getId());