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/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/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