修改电站审核工作流

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

@@ -285,9 +285,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 
                 //执行工作流
-                BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+            StandardDto standardDto = new StandardDto();
+            if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
 
-                StandardDto standardDto = new StandardDto();
                 standardDto.setComment(String.valueOf(kv.get("approveInfo")));
                 standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
                 standardDto.setTaskId(powerStation.getFlowTaskId());
@@ -297,6 +298,21 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                 variable.setOperationTime(String.valueOf(kv.get("approveDate")));
                 variable.setOperator(String.valueOf(kv.get("approveName")));
                 standardDto.setVariable(variable);
+
+
+            }else{
+                standardDto.setComment(String.valueOf(kv.get("approveInfo")));
+                standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
+                standardDto.setTaskId(powerStation.getFlowTaskId());
+                VariableDto variable = new VariableDto();
+                variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
+                variable.setComment(String.valueOf(kv.get("approveInfo")));
+                variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+                variable.setOperator(String.valueOf(kv.get("approveName")));
+                standardDto.setVariable(variable);
+            }
+
+
                 BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
                 powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());