26854 【智信户用(管理端)】迁移工作台相关代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/FlowKeyTodoEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 此处是为了待办提供的流程状态    提供流程Key对应此时流程的状态名称
+ */
+@Getter
+@AllArgsConstructor
+public enum FlowKeyTodoEnum {
+    TSRZ(1001, "待推送", "AbarbeitungWaitPush", "推送融资"),
+    JXSZG(1002, "待整改", "WaitAbarbeitung", "经销商整改"),
+    RZSH(1003, "待审核", "FinancingAudit", "融资审核"),
+    XXFK(1004, "待放款", "AuditPass", "线下放款"),
+    JXSGLYSH(1005, "待经销商管理员审核", "jxs_03", "经销商管理员审核"),
+    ;
+
+    private final int code;
+
+    private final String dealName;
+    private final String flowNodeKey;
+    private final String flowNodeName;
+
+
+    public static FlowKeyTodoEnum getEumByFlowNodeKey(String flowNodeKey) {
+        for (FlowKeyTodoEnum statusEnum : FlowKeyTodoEnum.values()) {
+            if (statusEnum.getFlowNodeKey().equals(flowNodeKey)) {
+                return statusEnum;
+            }
+        }
+        return null;
+    }
+
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkflowResultDto.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class WorkflowResultDto {
 
@@ -11,11 +13,6 @@ public class WorkflowResultDto {
      */
     String instanceId;
 
-//    /**
-//     * 执行人角色
-//     */
-//    String nextExecutorIds;
-
 
     String executorId;
 
@@ -49,4 +46,22 @@ public class WorkflowResultDto {
 
     String nextNodeKey;
 
+    /**
+     * 任务发起人id 不变  第一次提交的人
+     * 从业务表中 created_uesr_id
+     */
+    private String startUserId;
+    /**
+     * 任务发起人名称 不变
+     * 名字
+     */
+    private String startUser;
+    /**
+     * 任务发起人所在单位 不变
+     */
+    private String startUserCompanyName;
+    /**
+     * 任务发起人发起时间 不变
+     */
+    private Date startDate;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -17,11 +16,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.FinancingAuditEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
 import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
@@ -37,7 +34,6 @@ import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -51,7 +47,6 @@ import java.util.*;
  */
 @Service
 public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, FinancingInfo, FinancingInfoMapper> implements IFinancingInfoService {
-    private static String PROCESSKEY = "StationFinancing";
     @Autowired
     RedisUtils redisUtils;
     /**
@@ -61,8 +56,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     private FinancingInfoMapper financingInfoMapper;
     @Autowired
     private WorkFlowService workFlowService;
-    @Autowired
-    private WorkflowImpl workflow;
+    //    @Autowired
+//    private WorkflowImpl workflow;
     @Autowired
     private FinancingAuditingServiceImpl financingAuditingService;
     @Autowired
@@ -145,7 +140,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey(PROCESSKEY);
+            dto.setProcessDefinitionKey(BusinessTypeEnum.HYGF_DZTRRZ.getCode());
             Date date = new Date();
             dto.setBusinessKey(String.valueOf(date.getTime()));
             dto.setCompleteFirstTask(true);
@@ -164,44 +159,16 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             financingAuditingDto.setPromoter(RequestContext.getExeUserId());
             financingAuditingService.createWithModel(financingAuditingDto);
             //发起待办
-//            commonService.buildTaskModel(buildDZTRZTaskModel(model, workflowResultDto, date));
+            FinancingInfo newFinancingInfo = new FinancingInfo();
+            BeanUtils.copyProperties(model, newFinancingInfo);
+            newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
+            commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
         });
 
 
         return model;
     }
 
-    private List<TaskModelDto> buildDZTRZTaskModel(FinancingInfoDto model, WorkflowResultDto workflowResultDto, Date startDate) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        List<TaskModelDto> taskModelDtoList = new ArrayList<>();
-        TaskModelDto taskModelDto = new TaskModelDto();
-        taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
-        taskModelDto.setFlowCreateDate(new Date());
-        taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-        taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-        taskModelDto.setPageType(null);
-        taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecuteUserIds());
-        taskModelDto.setModel(model);
-        taskModelDto.setRelationId(workflowResultDto.getInstanceId());
-        taskModelDto.setRoutePath(null);
-        taskModelDto.setStartUserId(reginParams.getUserModel().getUserId());
-        taskModelDto.setStartUser(reginParams.getUserModel().getUserName());
-        taskModelDto.setStartDate(startDate);
-        taskModelDto.setStartUserCompanyName(null);
-        taskModelDto.setTaskName(workflowResultDto.getNextNodeName());
-        taskModelDto.setTaskCode(workflowResultDto.getNextNodeCode());
-        taskModelDto.setTaskType(BusinessTypeEnum.HYGF_DZTRRZ.getCode());
-        taskModelDto.setTaskTypeLabel(BusinessTypeEnum.HYGF_DZTRRZ.getName());
-        taskModelDto.setTaskStatus(TaskStatusEnum.UNDERWAY.getValue());
-        taskModelDto.setTaskStatusLabel(TaskStatusEnum.UNDERWAY.getName());
-//        taskModelDto.setTaskDesc();
-//        taskModelDto.setTaskContent();
-        taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorIds());
-        taskModelDtoList.add(taskModelDto);
-        return taskModelDtoList;
-    }
-
-
     @Override
     @GlobalTransactional
     public void rollback(String processId, String peasantHouseholdId) {
@@ -219,7 +186,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             this.updateById(financingInfo);
         }
         //停止流程
-//        commonService.rollbackTask();
+        commonService.deleteTaskModel(processId);
     }
 
     @Override
@@ -267,6 +234,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         financingAuditingDto.setPromoter(financingAuditing.getPromoter());
         if (null == financingAuditingDto.getInstanceId()) {
             financingAuditingDto.setInstanceId(financingAuditing.getInstanceId());
+            workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
         }
         financingAuditingDto.setStatus(params.getOrDefault("comments", "").toString());
         financingAuditingDto.setNodeRouting(FinancingAuditEnum.getNodeByCode(workflowResultDto.getNextNodeKey()));
@@ -288,7 +256,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             financingInfo.setStatus(statusName);
         }
         this.updateById(financingInfo);
-
+        //更新待办
+        updateFinancingInfoTask(financingInfo, workflowResultDto);
         //节点为待整改时生成整改单
         if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
 
@@ -316,27 +285,24 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             financingRectificationOrder.setResponsibleUserPhone(params.getOrDefault("responsibleUserPhone", "").toString());
             financingRectificationOrderService.save(financingRectificationOrder);
         }
-        //更新待办
-//        commonService.updateTaskModelNew(buildDZTRZUpdateTaskParams(params,financingAuditing));
 
     }
 
-    private Map<String, Object> buildDZTRZUpdateTaskParams(Map<String, Object> params, FinancingAuditing financingAuditing) {
-        Map<String, Object> map = new HashMap<>();
-        if ("0".equals(params.get("approvalStatus"))) {
-            map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-            map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-            map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-            map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        } else {
-            map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-            map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-        }
-        map.put("model", financingAuditing);
-        map.put("relationId", financingAuditing.getInstanceId());
-        return map;
+    /**
+     * 此处先更新完成待办然后在新增待办
+     * @param financingInfo
+     * @param workflowResultDto
+     */
+    private void updateFinancingInfoTask(FinancingInfo financingInfo, WorkflowResultDto workflowResultDto) {
+        Map<String, Object> updateTaskParam = new HashMap<>();
+        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("model", financingInfo);
+        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
+        commonService.updateTaskModel(updateTaskParam);
+        commonService.buildTaskModel((commonService.buildTaskModelDto(financingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ)));
     }
 
     public List<Map<String, Object>> selectOrgList() {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -24,6 +23,10 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -32,15 +35,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 勘察信息服务实现类
@@ -54,30 +54,28 @@ public class SurveyInformationServiceImpl
         extends BaseService<SurveyInformationDto, SurveyInformation, SurveyInformationMapper>
         implements ISurveyInformationService {
 
+    private static final String regionRedis = "app_region_redis";
+    private static final String OPERATION_TYPE_SUBMIT = "submit";
+    private static final String OPERATION_TYPE_APPLY = "apply";
+    private static final String IDX_REQUEST_STATE = "200";
+    @Autowired
+    protected EmqKeeper emqKeeper;
     @Autowired
     SurveyDetailsServiceImpl surveyDetailsService;
-
     @Autowired
     InformationServiceImpl informationService;
-
     @Autowired
     ExtendedInformationServiceImpl extendedInformationService;
-
     @Autowired
     CommercialServiceImpl commercialService;
-
     @Autowired
     PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
-
     @Autowired
     DesignInformationServiceImpl designInformationService;
-
     @Autowired
     WorkflowFeignClient workflowFeignClient;
-
     @Autowired
     RedisUtils redisUtils;
-
     @Autowired
     IdxFeginService idxFeginService;
     @Autowired
@@ -88,22 +86,10 @@ public class SurveyInformationServiceImpl
     ToDoTasksMapper toDoTasksMapper;
     @Autowired
     UserMessageMapper userMessageMapper;
-    @Value("${power.station.examine.pageId}")
-    private long pageId;
-    @Autowired
-    protected EmqKeeper emqKeeper;
-    @Value("${power.station.examine.planId}")
-    private String planId;
-
-    private static final String regionRedis = "app_region_redis";
-    private static final String OPERATION_TYPE_SUBMIT = "submit";
-    private static final String OPERATION_TYPE_APPLY = "apply";
-    private static final String IDX_REQUEST_STATE = "200";
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
-
     @Autowired
     WorkOrderMapper workOrderMapper;
     @Autowired
@@ -114,7 +100,6 @@ public class SurveyInformationServiceImpl
     ConstructionRecordsMapper constructionRecordsMapper;
     @Autowired
     BasicGridAcceptanceMapper basicGridAcceptanceMapper;
-
     @Autowired
     SurveyInformationMapper surveyInformationMapper;
     @Autowired
@@ -125,9 +110,16 @@ public class SurveyInformationServiceImpl
     WorkOrderPowerStationMapper workOrderPowerStationMapper;
     @Autowired
     AmosRequestContext requestContext;
-
+    //    @Autowired
+//    WorkflowImpl workflow;
     @Autowired
-    WorkflowImpl workflow;
+    CommonServiceImpl commonService;
+    @Autowired
+    WorkFlowService workFlowService;
+    @Value("${power.station.examine.pageId}")
+    private long pageId;
+    @Value("${power.station.examine.planId}")
+    private String planId;
 
     /**
      * 分页查询
@@ -313,28 +305,50 @@ public class SurveyInformationServiceImpl
         try {
 
             BasicGridAcceptance basicGridAcceptance = new BasicGridAcceptance();
+            List<ProcessTaskDTO> processTaskDTOS = new ArrayList();
             if (ObjectUtils.isNotEmpty(powerStation)) {
                 // 工作流执行一步
                 // taskId = powerStation.getTaskId();
-                StandardDto standardDto = new StandardDto();
-                standardDto.setResult("0");
-                standardDto.setTaskId(powerStation.getFlowTaskId());
-                VariableDto variable = new VariableDto();
-                variable.setApprovalStatus("0");
-                standardDto.setVariable(variable);
-                workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
+//                StandardDto standardDto = new StandardDto();
+//                standardDto.setResult("0");
+//                standardDto.setTaskId(powerStation.getFlowTaskId());
+//                VariableDto variable = new VariableDto();
+//                variable.setApprovalStatus("0");
+//                standardDto.setVariable(variable);
+//                workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
+                //执行流程
+                TaskResultDTO taskResultDTO = new TaskResultDTO();
+                taskResultDTO.setResult("0");
+                taskResultDTO.setTaskId(powerStation.getFlowTaskId());
+                HashMap<String, Object> variableMap = new HashMap<>();
+                variableMap.put("approvalStatus", "0");
+                taskResultDTO.setVariable(variableMap);
+                ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId());
+                processTaskDTOS.add(processTaskDTO);
             } else {
                 // 第一步启动工作流
                 // 发起工作流
                 // 调用工作流执行第一个节点
-                ProcessDto processDto = new ProcessDto();
-                processDto.setBusinessKey(String.valueOf(peasantHousehold.getSequenceNbr()));
-                processDto.setProcessDefinitionKey("hygf_10001");
-                StartProcessDto startProcessDto = new StartProcessDto();
-                List<ProcessDto> process = new ArrayList<>();
-                process.add(processDto);
-                startProcessDto.setProcess(process);
-                workflow.startProcess(basicGridAcceptance, startProcessDto, requestContext.getUserId());
+//                ProcessDto processDto = new ProcessDto();
+//                processDto.setBusinessKey(String.valueOf(peasantHousehold.getSequenceNbr()));
+//                processDto.setProcessDefinitionKey("hygf_10001");
+//                StartProcessDto startProcessDto = new StartProcessDto();
+//                List<ProcessDto> process = new ArrayList<>();
+//                process.add(processDto);
+//                startProcessDto.setProcess(process);
+//                workflow.startProcess(basicGridAcceptance, startProcessDto, requestContext.getUserId());
+
+                //开启工作流 并执行一步
+                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                List<ActWorkflowStartDTO> list = new ArrayList<>();
+                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                dto.setProcessDefinitionKey(BusinessTypeEnum.HYGF_DZ_SH.getCode());
+                dto.setBusinessKey(String.valueOf(peasantHousehold.getSequenceNbr()));
+                dto.setCompleteFirstTask(true);
+                list.add(dto);
+                actWorkflowBatchDTO.setProcess(list);
+                processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
+                basicGridAcceptance = workFlowService.getBasicGridAcceptance(basicGridAcceptance, processTaskDTOS, requestContext.getUserId());
                 powerStation = new PowerStation();
             }
             peasantHousehold.setSurveyOrNot(2);
@@ -366,6 +380,8 @@ public class SurveyInformationServiceImpl
             long idsk = peasantHousehold.getSequenceNbr();
             up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null, up);
+            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_DZ_SH));
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -420,6 +436,7 @@ public class SurveyInformationServiceImpl
 //        }
     }
 
+
     public SurveyInfoAllDto querySurveyInfo(String surveyInformationId, String peasantHouseholdId,
                                             String processInstanceId, AgencyUserModel userInfo) {
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkFlowService.java

@@ -2,10 +2,10 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkFlowFeignService;
-import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.workflow.model.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -39,12 +41,27 @@ public class WorkFlowService {
         return processTasks;
     }
 
+    /***
+     * 开启并执行一步 支持批量
+     *
+     * */
+    public List<ProcessTaskDTO> startBatchNew(String appKey, String product, String token, ActWorkflowBatchDTO params) {
+        List<ProcessTaskDTO> processTasks;
+        try {
+            log.info("开始前请求工作流启动接口:/start/batch,appKey:{},product:{},token:{}请求请求参数：{}", appKey, product, token, JSONObject.toJSONString(params));
+            processTasks = workFlowFeignService.startForBatchNew(appKey, product, token, params).getResult();
+        } catch (Exception e) {
+            log.error("调用工作流批量启动失败", e);
+            throw new RuntimeException("调用工作流批量启动失败");
+        }
+        return processTasks;
+    }
 
     public ProcessInstanceDTO stopProcess(String processInstanceId) {
-        ProcessInstanceDTO processInstanceDTO ;
+        ProcessInstanceDTO processInstanceDTO;
         try {
             log.info("开始前请求工作流停止接口:stopProcess,请求参数：{}", processInstanceId);
-            processInstanceDTO = workFlowFeignService.stopProcess(processInstanceId,null).getResult();
+            processInstanceDTO = workFlowFeignService.stopProcess(processInstanceId, null).getResult();
         } catch (Exception e) {
             log.error("调用工作流批量停止失败", e);
             throw new RuntimeException("调用工作流批量停止失败");
@@ -53,6 +70,18 @@ public class WorkFlowService {
     }
 
 
+    public ProcessTaskDTO standard(BasicGridAcceptance basicGridAcceptance, TaskResultDTO taskResultDTO, String userid) {
+        ProcessTaskDTO processTaskDTO;
+        if (taskResultDTO.getResult() != null) {
+            taskResultDTO.setResultCode("approvalStatus");
+            processTaskDTO = complete(taskResultDTO.getTaskId(), taskResultDTO);
+        } else {
+            processTaskDTO = complete(taskResultDTO.getTaskId(), taskResultDTO);
+        }
+        this.getBasicGridAcceptanceone(basicGridAcceptance, processTaskDTO, userid);
+        return processTaskDTO;
+    }
+
     /***
      * 执行
      *
@@ -70,12 +99,11 @@ public class WorkFlowService {
     }
 
 
-
     public List<WorkflowResultDto> buildWorkFlowInfo(List<ProcessTaskDTO> processTaskDTOS) {
         List<WorkflowResultDto> workflowResultDtoList = new ArrayList<>();
         processTaskDTOS.forEach(item -> {
             WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-            if (null != item.getProcessInstance()){
+            if (null != item.getProcessInstance()) {
                 workflowResultDto.setInstanceId(item.getProcessInstance().getId());
             }
             //   workflowResultDto.setNextExecutorIds(String.join(",", item.getCandidateGroups()));
@@ -92,8 +120,121 @@ public class WorkFlowService {
                 String nextUserIdsString = String.join(",", nextUserIds);
                 workflowResultDto.setNextExecuteUserIds(nextUserIdsString);
             }
+            if (!Objects.isNull(item.getStartUser())) {
+                workflowResultDto.setStartDate(new Date());
+                workflowResultDto.setStartUserId(item.getStartUser().getUserId());
+                workflowResultDto.setStartUser(item.getStartUser().getUserName());
+                List<CompanyModel> companys = item.getStartUser().getCompanys();
+                if (!CollectionUtils.isEmpty(companys) && companys.size() >= 1) {
+                    workflowResultDto.setStartUserCompanyName(companys.get(0).getCompanyName());
+                }
+            }
             workflowResultDtoList.add(workflowResultDto);
         });
         return workflowResultDtoList;
     }
+
+    public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance, List<ProcessTaskDTO> processTaskDTOList, String userid) {
+        ProcessTaskDTO listco = processTaskDTOList.isEmpty() ? null : processTaskDTOList.get(0);
+        if (listco != null) {
+            //	当前节点执行任务id
+            basicGridAcceptance.setPromoter(userid);
+            //流程实例
+            basicGridAcceptance.setInstanceId(listco.getProcessInstance().getId());
+            //	流程下一节点id
+            if (listco.getNextTask() != null && !listco.getNextTask().isEmpty()) {
+                basicGridAcceptance.setNextTaskId(listco.getNextTask().get(0).getId());
+                //下个节点名称
+                basicGridAcceptance.setNextNodeName(listco.getNextTask().get(0).getName());
+                //下个节点key
+                basicGridAcceptance.setNextNodeKey(listco.getNextTask().get(0).getKey());
+            }
+            ///	下一个节点角色权限
+            if (listco.getNextCandidateGroups() != null) {
+                List<String> ld = listco.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId());
+                StringBuffer sbf = new StringBuffer();
+                for (int i = 0; i <= ld.size() - 1; i++) {
+                    if (i < ld.size() - 1) {
+                        sbf.append(ld.get(i) + ",");
+                    } else {
+                        sbf.append(ld.get(i));
+                    }
+                }
+
+                basicGridAcceptance.setNextExecutorIds(sbf.toString());
+            }
+            //下一节点可执行人逗号分割	0	0
+            if (listco.getNextTaskExecutor() != null) {
+
+                List<AgencyUserModel> li = listco.getNextTaskExecutor().get(basicGridAcceptance.getNextTaskId());
+                if (li != null && !li.isEmpty()) {
+
+                    StringBuffer sbf = new StringBuffer();
+                    for (int i = 0; i <= li.size() - 1; i++) {
+                        if (i < li.size() - 1) {
+                            sbf.append(li.get(i).getUserId() + ",");
+                        } else {
+                            sbf.append(li.get(i).getUserId());
+                        }
+                    }
+                    basicGridAcceptance.setNextExecuteUserIds(sbf.toString());
+                }
+            }
+            //工作流发起人id
+            basicGridAcceptance.setCreateUserId(listco.getStartUser().getUserId());
+
+        } else {
+            throw new RuntimeException("工作流异常");
+        }
+        return basicGridAcceptance;
+    }
+
+    public void getBasicGridAcceptanceone(BasicGridAcceptance basicGridAcceptance, ProcessTaskDTO processTaskDTO, String userid) {
+        if (processTaskDTO != null) {
+            //	当前节点执行任务id
+            basicGridAcceptance.setPromoter(userid);
+            //	流程下一节点id
+            if (processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
+                basicGridAcceptance.setNextTaskId(processTaskDTO.getNextTask().get(0).getId());
+                //下个节点名称
+                basicGridAcceptance.setNextNodeName(processTaskDTO.getNextTask().get(0).getName());
+                //下个节点key
+                basicGridAcceptance.setNextNodeKey(processTaskDTO.getNextTask().get(0).getKey());
+            } else {
+                return;
+            }
+            ///	下一个节点角色权限
+            if (processTaskDTO.getNextCandidateGroups() != null) {
+                List<String> ld = processTaskDTO.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId());
+                StringBuffer sbf = new StringBuffer();
+                for (int i = 0; i <= ld.size() - 1; i++) {
+                    if (i < ld.size() - 1) {
+                        sbf.append(ld.get(i) + ",");
+                    } else {
+                        sbf.append(ld.get(i));
+                    }
+                }
+
+                basicGridAcceptance.setNextExecutorIds(sbf.toString());
+            }
+
+            //下一节点可执行人逗号分割	0	0
+            if (processTaskDTO.getNextTaskExecutor() != null) {
+
+                List<AgencyUserModel> li = processTaskDTO.getNextTaskExecutor().get(basicGridAcceptance.getNextTaskId());
+                if (li != null && !li.isEmpty()) {
+
+                    StringBuffer sbf = new StringBuffer();
+                    for (int i = 0; i <= li.size() - 1; i++) {
+                        if (i < li.size() - 1) {
+                            sbf.append(li.get(i).getUserId() + ",");
+                        } else {
+                            sbf.append(li.get(i).getUserId());
+                        }
+                    }
+                    basicGridAcceptance.setNextExecuteUserIds(sbf.toString());
+                }
+            }
+        }
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/urlInfo.json

+[
+  {
+    "type": "AbarbeitungWaitPush",
+    "pageType": "",
+    "name": "推送融资",
+    "url": "/mixuap?appId=1678340647909617665&id=1774627124162859009"
+  },
+  {
+    "type": "WaitAbarbeitung",
+    "pageType": "",
+    "name": "经销商整改",
+    "url": "/mixuap?appId=1678340647909617665&id=1806150815363108865"
+  },
+  {
+    "type": "FinancingAudit",
+    "pageType": "",
+    "name": "融资审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1775075407041662977"
+  },
+  {
+    "type": "AuditPass",
+    "pageType": "",
+    "name": "线下放款",
+    "url": "/mixuap?appId=1678340647909617665&id=1805852764345995265"
+  },
+  {
+    "type": "jxs_03",
+    "pageType": "",
+    "name": "经销商管理员审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1686219644483956738"
+  }
+]
\ No newline at end of file