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

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

@@ -13,7 +13,25 @@ public enum FlowKeyTodoEnum {
     JXSZG(1002, "待整改", "WaitAbarbeitung", "经销商整改"),
     RZSH(1003, "待审核", "FinancingAudit", "融资审核"),
     XXFK(1004, "待放款", "AuditPass", "线下放款"),
-    JXSGLYSH(1005, "待经销商管理员审核", "jxs_03", "经销商管理员审核"),
+    JXSGLYSH(1005, "待经销商管理员审核", "hygf_02", "经销商确认"),
+    SJSH(1006, "待设计审核", "hygf_03", "设计审核"),
+    TRSH(1007, "待投融审核", "hygf_05", "投融审核"),
+    FWSH(1008, "待法务审核", "hygf_07", "法务审核"),
+    SJSCDXTK(1009, "待设计上传典型图库", "hygf_09", "设计上传典型图库"),
+    JXSSJRYSC(1010, "待经销商设计人员上传设计图", "hygf_10", "经销商设计人员上传设计图"),
+    SJTZSH(1011, "待设计图纸审核", "hygf_11", "设计图纸审核"),
+    BWDJTJ(1012, "待并网登记提交", "hygf_bw1", "并网登记提交"),
+    BWGLDGCSH(1013, "待并网管理端工程审核", "hygf_bw2", "并网管理端工程审核"),
+    JXSGCTJYS(1014, "待经销商工程提交验收", "hygf_ys1", "经销商工程提交验收"),
+    GLDTRSH(1015, "待管理端投融审核", "hygf_ys2", "管理端投融审核"),
+    ZGD(1016, "待整改单", "hygf_zg_tr", "整改单"),
+    GLDFWSH(1017, "待管理端法务审核", "hygf_ys3", "管理端法务审核"),
+    ZGD_FW(1018, "待整改单", "hygf_zg_fw", "整改单"),
+    GLDGCSH(1019, "待管理端工程审核", "hygf_ys4", "管理端工程审核"),
+    ZGD_GC(1020, "待整改单", "hygf_zg_gc", "整改单"),
+    GLDGCYX(1021, "待管理端工程是否线下", "hygf_ys5", "管理端工程是否线下"),
+    GLDGCXY(1022, "待管理端工程线下验", "hygf_ys6", "管理端工程线下验"),
+    ZGD_XX(1023, "待整改单", "hygf_zg_xx", "整改单"),
     ;
 
     private final int code;

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -18,11 +20,12 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -33,6 +36,10 @@ import java.util.stream.Collectors;
 @Service
 public class AcceptanceServiceImpl implements IAcceptanceService {
 
+    //    @Autowired
+//    WorkflowImpl workflow;
+    @Autowired
+    WorkFlowService workFlowService;
     @Autowired
     private AcceptanceMapper acceptanceMapper;
     @Autowired
@@ -42,7 +49,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     @Autowired
     private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
     @Autowired
-    WorkflowImpl workflow;
+    private CommonServiceImpl commonService;
+
     /**
      * 分页查询验收列表数据
      *
@@ -51,7 +59,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
      * @return 分页结果
      */
     @Override
-    public Page<AcceptanceDto> page(Integer current, Integer size,  AcceptanceDto acceptanceDto) {
+    public Page<AcceptanceDto> page(Integer current, Integer size, AcceptanceDto acceptanceDto) {
         if (Objects.nonNull(acceptanceDto)) {
 
             // 处理提交日期
@@ -65,7 +73,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
             }
         }
 
-        PageHelper.startPage(current,  size);
+        PageHelper.startPage(current, size);
         List<AcceptanceDto> resultPage = acceptanceMapper.page(acceptanceDto);
         PageInfo<AcceptanceDto> page = new PageInfo(resultPage);
         Page<AcceptanceDto> pagenew = new Page<AcceptanceDto>();
@@ -100,7 +108,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     }
 
     @Override
-     public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item, Long sequenceNbr) {
+    public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item, Long sequenceNbr) {
         BasicGridAcceptance acceptance = basicGridAcceptanceMapper.selectById(sequenceNbr);
         Assert.notNull(acceptance, "未查询到相关电站信息！");
         item.setWorkOrderId(acceptance.getWorkOrderId());
@@ -109,25 +117,46 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         acceptanceCheckItemMapper.insert(item);
         return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
     }
+
     @Override
     @GlobalTransactional
-    public void  checkAccept( Long  basicGridAcceptanceId   ,String userId){
-        BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
+    public void checkAccept(Long basicGridAcceptanceId, String userId) {
+        BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
         basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
         basicGridAcceptanc.setAcceptanceRecDate(new Date());
         //执行工作流
-        StandardDto standardDto=new StandardDto();
-        standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
-        workflow.standard(basicGridAcceptanc,standardDto,userId);
+//        StandardDto standardDto=new StandardDto();
+//        standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
+//        workflow.standard(basicGridAcceptanc,standardDto,userId);
+        //执行工作流
+        TaskResultDTO taskResultDTO = new TaskResultDTO();
+        taskResultDTO.setTaskId(basicGridAcceptanc.getNextTaskId());
+        ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId);
+        //发起待办
+        WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+        workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+        updateAcceptanceTask(basicGridAcceptanc, workflowResultDto);
         basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 
         //线上验收
-        LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
         up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线上验收.getCode());
-        long idsk= basicGridAcceptanc.getPeasantHouseholdId();
-        up.eq(PeasantHousehold::getSequenceNbr,idsk);
-        peasantHouseholdMapper.update(null,up);
+        long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+        up.eq(PeasantHousehold::getSequenceNbr, idsk);
+        peasantHouseholdMapper.update(null, up);
+
+    }
 
+    private void updateAcceptanceTask(BasicGridAcceptance basicGridAcceptance, 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", basicGridAcceptance);
+        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
+        commonService.updateTaskModel(updateTaskParam);
+        commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
     }
 
 

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

@@ -107,6 +107,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
             task.setTaskId(basicGridAcceptance.getNextTaskId());
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, task, userId);
             processTaskDTOS.add(processTaskDTO);
+            updateBasicGridAcceptanceTaskByInstanceId(basicGridAcceptance,basicGridAcceptance.getInstanceId());
         } else {
             // 调用工作流执行第一个节点
 //            ProcessDto processDto = new ProcessDto();
@@ -144,11 +145,24 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         basicGridAcceptanceMapper.updateById(basicGridAcceptance);
         //发起待办
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-        commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_BWYS));
+        WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+        workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
+        commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS));
 
         return grid;
     }
 
+    private void updateBasicGridAcceptanceTaskByInstanceId(BasicGridAcceptance basicGridAcceptance, String instanceId) {
+        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", basicGridAcceptance);
+        updateTaskParam.put("relationId", instanceId);
+        commonService.updateTaskModel(updateTaskParam);
+    }
+
 
     public HygfOnGrid modifyEntity(HygfOnGrid grid) {
         onGridMapper.updateById(grid);
@@ -295,14 +309,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
      * @param workflowResultDto
      */
     private void updateBasicGridAcceptanceTask(BasicGridAcceptance basicGridAcceptance, 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", basicGridAcceptance);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
+       updateBasicGridAcceptanceTaskByInstanceId(basicGridAcceptance,workflowResultDto.getInstanceId());
         commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
     }
 }

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

@@ -292,6 +292,17 @@ public class SurveyInformationServiceImpl
         return code;
     }
 
+    private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
+        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", powerStation);
+        updateTaskParam.put("relationId", instanceId);
+        commonService.updateTaskModel(updateTaskParam);
+    }
+
     private void submitExamine(PeasantHousehold peasantHousehold) {
 
         PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()),
@@ -324,6 +335,9 @@ public class SurveyInformationServiceImpl
                 variableMap.put("approvalStatus", "0");
                 taskResultDTO.setVariable(variableMap);
                 ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId());
+
+                basicGridAcceptance.setInstanceId(powerStation.getProcessInstanceId());
+                updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
                 processTaskDTOS.add(processTaskDTO);
             } else {
                 // 第一步启动工作流

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

@@ -28,5 +28,119 @@
     "pageType": "",
     "name": "经销商管理员审核",
     "url": "/mixuap?appId=1678340647909617665&id=1686219644483956738"
+  },
+  {
+    "type": "hygf_02",
+    "pageType": "",
+    "name": "经销商确认",
+    "url": "/mixuap?appId=1677158789557547009&id=1677158800043307009"
+  },
+  {
+    "type": "hygf_03",
+    "pageType": "",
+    "name": "设计审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_05",
+    "pageType": "",
+    "name": "投融审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_07",
+    "pageType": "",
+    "name": "法务审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_09",
+    "pageType": "",
+    "name": "设计上传典型图库",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_10",
+    "pageType": "",
+    "name": "经销商设计人员上传设计图",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_11",
+    "pageType": "",
+    "name": "设计图纸审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_bw1",
+    "pageType": "",
+    "name": "并网登记提交",
+    "url": "/mixuap?appId=1677158789557547009&id=1747156510238076929"
+  },
+  {
+    "type": "hygf_bw2",
+    "pageType": "",
+    "name": "并网管理端工程审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+  },
+  {
+    "type": "hygf_ys1",
+    "pageType": "",
+    "name": "经销商工程提交验收",
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "hygf_ys2",
+    "pageType": "",
+    "name": "管理端投融审核",
+    "url": ""
+  },
+  {
+    "type": "hygf_zg_tr",
+    "pageType": "",
+    "name": "整改单",
+    "url": ""
+  },
+  {
+    "type": "hygf_ys3",
+    "pageType": "",
+    "name": "管理端法务审核",
+    "url": ""
+  },
+  {
+    "type": "hygf_zg_fw",
+    "pageType": "",
+    "name": "整改单",
+    "url": ""
+  },
+  {
+    "type": "hygf_ys4",
+    "pageType": "",
+    "name": "管理端工程审核",
+    "url": ""
+  },
+  {
+    "type": "hygf_zg_gc",
+    "pageType": "",
+    "name": "整改单",
+    "url": ""
+  },
+  {
+    "type": "hygf_ys5",
+    "pageType": "",
+    "name": "管理端工程是否线下",
+    "url": ""
+  },
+  {
+    "type": "hygf_ys6",
+    "pageType": "",
+    "name": "管理端工程线下验",
+    "url": ""
+  },
+  {
+    "type": "hygf_zg_xx",
+    "pageType": "",
+    "name": "整改单",
+    "url": ""
   }
 ]
\ No newline at end of file