fix bug 20235 、20255、20232、20340、20228

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

@@ -72,4 +72,15 @@ public enum AcceptanceStatusEnum {
         }
         return acceptanceStatusEnum.getCode();
     }
+
+    public static AcceptanceStatusEnum getAcceptanceStatusByKey(String Key, String state) {
+        AcceptanceStatusEnum acceptanceStatusEnum = null;
+        for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
+            if (type.getKey().contains(Key) && type.getState().equals(state)) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
 }

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

@@ -114,7 +114,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         String lockName = String.format("LockName:updateAndDriveWorkflow:%s", entity.getSequenceNbr());
         Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
         if (BooleanUtils.isNotTrue(isLocked)) {
-            throw new BadRequest("其他用户正在操作，请稍后再试！");
+            throw new BadRequest("其他用户正在操作，请刷新后再试！");
         }
         try {
 

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

@@ -120,12 +120,12 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         String lockName = String.format("LockName:checkAccept:%s", basicGridAcceptanceId);
         Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
         if (BooleanUtils.isNotTrue(isLocked)) {
-            throw new BadRequest("其他用户正在操作，请稍后再试！");
+            throw new BadRequest("其他用户正在操作，请刷新后再试！");
         }
         try {
             BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
             if (AcceptanceStatusEnum.待投融验收.getCode().equals(basicGridAcceptanc.getAcceptanceStatus())) {
-                throw new BadRequest("待投融验收，请稍后再试！");
+                throw new BadRequest("验收状态已变更为待投融验收，请稍后再试！");
             }
             basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
             basicGridAcceptanc.setAcceptanceRecDate(new Date());

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

@@ -210,12 +210,18 @@ public class BasicGridAcceptanceServiceImpl
 		String lockName = String.format("LockName:executeWorkflow:%s", dto.getBasicGridAcceptanceId());
 		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
 		if (BooleanUtils.isNotTrue(isLocked)) {
-			throw new BadRequest("其他用户正在操作，请稍后再试！");
+			throw new BadRequest("其他用户正在操作，请刷新后再试！");
 		}
 		try {
 			// 查询并网审批信息
 			BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
+			String beforeAcceptanceStatus = basicGridAcceptanc.getAcceptanceStatus();
 			String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
+			AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+			if (acceptanceStatus == null) {
+				// 说明工作流节点状态执行错误
+				throw new BadRequest("其他用户正在操作，请刷新后再试！");
+			}
 			if (OK.equals(dto.getApprovalStatus())) {
 				if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
 					basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
@@ -273,6 +279,12 @@ public class BasicGridAcceptanceServiceImpl
 				}
 			}
 
+			if (AcceptanceStatusEnum.线下验收不通过.getCode().equals(basicGridAcceptanc.getAcceptanceStatus())) {
+				if (AcceptanceStatusEnum.线下验收完成.getCode().equals(beforeAcceptanceStatus)) {
+					throw new BadRequest("验收状态已更改为线下验收不通过，请刷新后再试！");
+				}
+			}
+
 			if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
 				dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
 				dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());

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

@@ -246,7 +246,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		String lockName = String.format("LockName:powerStationExamine:%s", stationId);
 		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
 		if (BooleanUtils.isNotTrue(isLocked)) {
-			throw new com.yeejoin.amos.component.robot.BadRequest("其他用户正在操作，请稍后再试！");
+			throw new com.yeejoin.amos.component.robot.BadRequest("其他用户正在操作，请刷新后再试！");
 		}
 		String meg = "";
 		// 1. 业务相关数据落表

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

@@ -162,7 +162,7 @@ public class SurveyInformationServiceImpl
             lockName = String.format("LockName:saveSurveyInfo:%s", surveyInformation.getSequenceNbr());
             Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
             if (BooleanUtils.isNotTrue(isLocked)) {
-                throw new BadRequest("其他用户正在操作，请稍后再试！");
+                throw new BadRequest("其他用户正在操作，请刷新后再试！");
             }
 
             QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();