解决冲突

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

@@ -12,6 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PowerStationNodeEnum {
 
+
     经销商审核("经销商确认", "hygf_02"),
     设计审核("设计审核", "hygf_03"),
     投融审核("投融审核", "hygf_05"),
@@ -20,6 +21,7 @@ public enum PowerStationNodeEnum {
     经销商上传图纸("经销商上传图纸", "hygf_10"),
     文件审核("文件审核", "hygf_11");
 
+
     /**
      * 名称，描述
      */

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

@@ -64,7 +64,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     @Override
     public PowerStation getObjByNhId(String id, String state) {
         LambdaQueryWrapper<PowerStation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PowerStation::getProcessStatus, state);
+        wrapper.ne(PowerStation::getProcessStatus, state);
         wrapper.eq(PowerStation::getPeasantHouseholdId, id);
         return this.baseMapper.selectOne(wrapper);
     }

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

@@ -185,7 +185,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     }
 
     private void submitExamine(PeasantHousehold peasantHousehold) {
-        PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.进行中.getCode());
+        PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());
 
         String taskId = null;
         Map<String, Object> objectMap = new HashMap<>();
@@ -210,7 +210,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 powerStation.setOwnersName(peasantHousehold.getOwnersName());
                 powerStation.setProjectAddress(peasantHousehold.getProjectAddressName());
                 powerStation.setPeasantHouseholdId(String.valueOf(peasantHousehold.getSequenceNbr()));
-                powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getCode());
+                powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
                 log.info("流程执行成功：{}", code);
                 // 获取流程信息
                 FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);