提交防火监督流程图的节点修改

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
+import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -1191,6 +1192,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             JSONObject body = new JSONObject();
             body.put("businessKey", latentDanger.getBusinessKey());
             body.put("processDefinitionKey", workflowProcessDefinitionKey);
+            /*	修改现场确认的工作流流程的节点执行条件分支------strat by chenhao 2022-01-18*/
+            String startCondition = "inner";
+            if("1".equals(bizInfo.getString("isOuter")) ) startCondition = "outer";
+            HashMap<String, Object> conditionMap = new HashMap<String, Object>();
+            conditionMap.put(WorkFlowEnum.CONDITION.getCode(), startCondition);
+            body.put("variables", conditionMap);
+            /*	修改现场确认的工作流流程的节点执行条件分支------end by chenhao 2022-01-18*/
             JSONObject result = workflowFeignService.startByVariable(body);
             if (result == null || ValidationUtil.isEmpty(result.get("data"))) {
                 executeSubmitDto.setIsOk(false);
@@ -1202,7 +1210,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setUpdateDate(new Date());
             latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode());
             latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.现场确认.getName());
-
+			
             // 3、执行一步现场确认
             boolean executeResult = workflowExecuteService.excuteTask(latentDanger.getInstanceId(), planType);
             if (!executeResult) {