修改申请单锁状态变更时间

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -230,9 +230,14 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setConfirmerName(getNickName());
                 if (StringUtils.isNotEmpty(form.getLockNo())) {
                     for (String lockNo : form.getLockNo().split(",")) {
-                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
-                        if (tApplyLock != null && (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2)) {
-                            return AjaxResult.error("该锁不可用。");
+                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0, lockNo.indexOf("(")));
+                        if (tApplyLock != null) {
+                            if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
+                                return AjaxResult.error("该锁不可用。");
+                            }
+                            //修改锁状态
+                            tApplyLock.setStatus(1L);//将锁状态改为已拆锁
+                            tApplyLockService.updateTApplyLock(tApplyLock);
                         }
                     }
                 }
@@ -264,19 +269,6 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setApproveTime(new Date());
                 if ("1".equals(devTask.getCondition())) {//只有通过时审批状态才会变为已通过
                     form.setApproveStatus("2");
-                    //修改锁状态
-                    if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockNo())) {
-                        for (String lockNo : tApplyOfflinevalve.getLockNo().split(",")) {
-                            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
-                            if (tApplyLock != null) {
-                                if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
-                                    return AjaxResult.error("该锁已被使用。");
-                                }
-                                tApplyLock.setStatus(1L);//将锁状态改为已拆锁
-                                tApplyLockService.updateTApplyLock(tApplyLock);
-                            }
-                        }
-                    }
                 }
                 break;
             case "信息确认人":
@@ -307,7 +299,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 //修改锁状态
                 if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockNo())) {
                     for (String lockNo : tApplyOfflinevalve.getLockNo().split(",")) {
-                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
+                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0, lockNo.indexOf("(")));
                         if (tApplyLock != null) {
                             tApplyLock.setStatus(0L);//将锁状态改为挂锁
                             tApplyLockService.updateTApplyLock(tApplyLock);

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -131,9 +131,14 @@ public class TApplySafetychangeController extends BaseController {
     public AjaxResult add(@RequestBody TApplySafetychange tApplySafetychange) {
         String userId = getUserId().toString();
         for (String s : tApplySafetychange.getLockNo().split(",")) {
-            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(s.substring(0,s.indexOf("(")));
-            if (tApplyLock.getStatus()==1||tApplyLock.getStatus()==2){
-                return AjaxResult.error("该锁不可用。");
+            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(s.substring(0, s.indexOf("(")));
+            if (tApplyLock!=null) {
+                if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
+                    return AjaxResult.error("该锁不可用。");
+                }
+                //修改锁状态
+                tApplyLock.setStatus(1L);
+                tApplyLockService.updateTApplyLock(tApplyLock);
             }
         }
         tApplySafetychange.setApplicant(userId);
@@ -278,17 +283,6 @@ public class TApplySafetychangeController extends BaseController {
                 form.setChangeExecutor(getUserId().toString());
                 form.setChangeExecutorName(getNickName());
                 form.setChangeExecutorTime(new Date());
-                //修改锁状态
-                for (String lockNo : tApplySafetychange.getLockNo().split(",")) {
-                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
-                    if (tApplyLock != null) {
-                        if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
-                            return AjaxResult.error("该锁已被使用。");
-                        }
-                        tApplyLock.setStatus(1L);//将锁状态改为已拆锁
-                        tApplyLockService.updateTApplyLock(tApplyLock);
-                    }
-                }
                 break;
             case "安全评估人2":
                 TStaffmgr tStaffmgr = new TStaffmgr();
@@ -314,7 +308,7 @@ public class TApplySafetychangeController extends BaseController {
                 form.setStatus(1L);
                 //修改锁状态
                 for (String lockNo : tApplySafetychange.getLockNo().split(",")) {
-                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
+                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0, lockNo.indexOf("(")));
                     if (tApplyLock != null) {
                         tApplyLock.setStatus(0L);//将锁状态改为已拆锁
                         tApplyLockService.updateTApplyLock(tApplyLock);