Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -12,13 +12,15 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PowerStationNodeEnum {
 
-    经销商确认("经销商确认", "0"),
-    设计审核("设计审核", "1"),
-    投融审核("投融审核", "2"),
-    法务审核("法务审核", "3"),
-    设计上传图纸("设计上传图纸", "4"),
-    经销商上传图纸("经销商上传图纸", "5"),
-    文件审核("文件审核", "6");
+
+    经销商审核("经销商确认", "hygf_02"),
+    设计审核("设计审核", "hygf_03"),
+    投融审核("投融审核", "hygf_05"),
+    法务审核("法务审核", "hygf_07"),
+    设计上传图纸("设计上传图纸", "hygf_09"),
+    经销商上传图纸("经销商上传图纸", "hygf_10"),
+    文件审核("文件审核", "hygf_11");
+
 
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/SupervisionFeignClient.java → amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 
 @FeignClient(name = "${workflow.feign.name:AMOS-API-WORKFLOW}", path = "workflow", configuration = {MultipartSupportConfig.class})
-public interface SupervisionFeignClient {
+public interface WorkflowFeignClient {
 
     /***
      * 根据task_id 获取节点信息

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
+import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     private static final String VERIFY_RESULT_YES="yes";
     private static final String VERIFY_RESULT_NO="no";
 
+    @Autowired
+    WorkflowFeignClient workflowFeignClient;
 
     /**
      * 分页查询
@@ -102,6 +105,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             }
         }
 
+
+
+
+
+
+
+
         // 2. 更新流程状态
         String code = null;
         try{