-申请单

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

@@ -18,7 +18,6 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.apply.domain.TApplyLock;
 import com.ruoyi.project.apply.domain.TApplyOfflinevalve;
-import com.ruoyi.project.apply.domain.TApplySafetychange;
 import com.ruoyi.project.apply.service.ITApplyLockService;
 import com.ruoyi.project.apply.service.ITApplyOfflinevalveService;
 import com.ruoyi.project.approve.damain.DevTask;
@@ -231,7 +230,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setConfirmerName(getNickName());
                 if (StringUtils.isNotEmpty(form.getLockNo())) {
                     for (String lockNo : form.getLockNo().split(",")) {
-                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo);
+                        TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
                         if (tApplyLock != null && (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2)) {
                             return AjaxResult.error("该锁不可用。");
                         }
@@ -268,7 +267,7 @@ public class TApplyOfflinevalveController extends BaseController {
                     //修改锁状态
                     if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockNo())) {
                         for (String lockNo : tApplyOfflinevalve.getLockNo().split(",")) {
-                            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo);
+                            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
                             if (tApplyLock != null) {
                                 if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
                                     return AjaxResult.error("该锁已被使用。");

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

@@ -131,7 +131,7 @@ 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);
+            TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(s.substring(0,s.indexOf("(")));
             if (tApplyLock.getStatus()==1||tApplyLock.getStatus()==2){
                 return AjaxResult.error("该锁不可用。");
             }
@@ -280,7 +280,7 @@ public class TApplySafetychangeController extends BaseController {
                 form.setChangeExecutorTime(new Date());
                 //修改锁状态
                 for (String lockNo : tApplySafetychange.getLockNo().split(",")) {
-                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo);
+                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
                     if (tApplyLock != null) {
                         if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
                             return AjaxResult.error("该锁已被使用。");
@@ -314,7 +314,7 @@ public class TApplySafetychangeController extends BaseController {
                 form.setStatus(1L);
                 //修改锁状态
                 for (String lockNo : tApplySafetychange.getLockNo().split(",")) {
-                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo);
+                    TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo.substring(0,lockNo.indexOf("(")));
                     if (tApplyLock != null) {
                         tApplyLock.setStatus(0L);//将锁状态改为已拆锁
                         tApplyLockService.updateTApplyLock(tApplyLock);

ui/src/views/apply/safetychange/index.vue

@@ -592,6 +592,12 @@ export default {
   created() {
     this.queryParams.lockNo = this.$route.query.lockNo;
     listAllLock({status: 0}).then(res => {
+      res.data.forEach(item=>{
+        let riskLevel = '风险等级: ';
+        if (item.riskLevel)
+          riskLevel='风险等级:'+item.riskLevel.substring(item.riskLevel.indexOf('=')+1,item.riskLevel.length)
+        item.lockCode=item.lockCode+'('+riskLevel+'；'+'初始状态:'+item.valveStatus+')'
+      })
       this.lockList = res.data;
     })
     //设置表格高度对应屏幕高度

ui/src/views/approve/approveDetail/offlinevalve-detail.vue

@@ -415,6 +415,12 @@ export default {
     },
     getLocks(devNo) {
       listAllLock({position: devNo, status: 0}).then(res => {
+        res.data.forEach(item=>{
+          let riskLevel = '风险等级: ';
+          if (item.riskLevel)
+            riskLevel='风险等级:'+item.riskLevel.substring(item.riskLevel.indexOf('=')+1,item.riskLevel.length)
+          item.lockCode=item.lockCode+'('+riskLevel+'；'+'初始状态:'+item.valveStatus+')'
+        })
         this.lockList = res.data;
       })
     },