解决冲突

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -221,6 +222,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                     powerStation.setTaskId(taskIdNew);
                     powerStation.setProcessInstanceId(processInstanceId);
                     powerStation.setFlowTaskId(flowTaskId);
+                    powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
                 }
                 powerStationService.savePowerStation(powerStation);
             }