Merge remote-tracking branch 'origin/developer' into developer

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

@@ -11,7 +11,7 @@ import lombok.Data;
 public class StandardDto {
     private  String   comment;//审核备注
     private  String   result;//审核状态值
-    private  String   resultCode="approvalStatus";//审核状态key
+    private  String   resultCode;//审核状态key
     private  String   taskId; //工作流任务id
     private  VariableDto   variable;//提交表单值
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfOnGrid.java

@@ -148,5 +148,6 @@ public class HygfOnGrid extends BaseEntity {
     @TableField("grid_connection_time")
     private Date gridConnectionTime;
 
-
+    @TableField(exist = false)
+    private String type;
 }

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

@@ -28,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Slf4j
@@ -85,15 +87,32 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
         BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
         basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
-        // 调用工作流执行第一个节点
-        ProcessDto processDto = new ProcessDto();
-        processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
-        StartProcessDto startProcessDto = new StartProcessDto();
-        List<ProcessDto> process=new ArrayList<>();
-        process.add(processDto);
-        startProcessDto.setProcess(process);
-        BasicGridAcceptance workBasicGridAcceptance = workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
-        BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
+
+       if(grid.getType()!=null&&"1".equals(grid.getType())){
+
+           LocalDateTime now = LocalDateTime.now();
+           DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM-dd");
+           String formattedDate = now.format(formatter);
+           //执行工作流
+           StandardDto standardDto=new StandardDto();
+           standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
+           VariableDto variable=new VariableDto();
+           variable.setOperator("88888");
+           variable.setOperationTime(formattedDate);
+           standardDto.setVariable(variable);
+           workflow.standard(basicGridAcceptance,standardDto,userId);
+
+       }else{
+           // 调用工作流执行第一个节点
+           ProcessDto processDto = new ProcessDto();
+           processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
+           StartProcessDto startProcessDto = new StartProcessDto();
+           List<ProcessDto> process=new ArrayList<>();
+           process.add(processDto);
+           startProcessDto.setProcess(process);
+           workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
+
+       }
         if(grid.getSequenceNbr()!=null){
             onGridMapper.updateById(grid);
         }else{

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.jsf.el.SpringBeanFacesELResolver;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,8 +54,15 @@ public class WorkflowImpl {
      *
      * */
     public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto,String userid){
+        FeignClientResult<ProcessTaskDTO> json=null;
+        if(standardDto.getResult()!=null){
+            standardDto.setResultCode("approvalStatus");
+            json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
+        }else{
+
+            json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
+        }
 
-        FeignClientResult<ProcessTaskDTO> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
 
         basicGridAcceptance= this.getBasicGridAcceptanceone(basicGridAcceptance,json,userid);
         return basicGridAcceptance;
@@ -65,12 +73,13 @@ public class WorkflowImpl {
         if (!ObjectUtils.isEmpty(json)) {
             if (json.getStatus() == 200) {
                 List<ProcessTaskDTO>  lis = json.getResult();
-                ProcessTaskDTO listco= lis.get(0);
+                ProcessTaskDTO listco= lis.isEmpty()?null:lis.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());
@@ -114,6 +123,8 @@ public class WorkflowImpl {
                     //工作流发起人id
                     basicGridAcceptance.setCreateUserId(listco.getStartUser().getUserId());
 
+                }else{
+                    throw new RuntimeException("工作流异常");
                 }
             } else {
                 throw new RuntimeException(json.getMessage());
@@ -128,10 +139,7 @@ public class WorkflowImpl {
             if (json.getStatus() == 200) {
                 ProcessTaskDTO listco = json.getResult();
                 if(listco!=null){
-                    /**
-                     * 工作流实例ID
-                     */
-                    basicGridAcceptance.setInstanceId(listco.getProcessInstance().getId());
+
 
                     //	当前节点执行任务id
                     basicGridAcceptance.setPromoter(userid);
@@ -176,8 +184,6 @@ public class WorkflowImpl {
                             basicGridAcceptance.setNextExecuteUserIds(sbf.toString());
                         }
                     }
-                    //工作流发起人id
-                    basicGridAcceptance.setCreateUserId(listco.getStartUser().getUserId());
 
                 }
             } else {