diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java index a1f2d5e..d318b11 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java @@ -493,9 +493,35 @@ public class QuotJsqrController extends BaseController { String currentUser = getLoginUser().getUser().getNickName(); String type = info.getType(); + String quotJsqrId = info.getQuotJsqrId(); String quotJsqrCode = info.getQuotJsqrCode(); String remark = info.getRemark(); + QuotJsqr quotJsqr = quotJsqrService.selectQuotJsqrByQuotJsqrId(quotJsqrId); + if(quotJsqr!=null){ + //操作状态如果是已完成则不进行下面操作 + if("TL".equals(type)){ + if("2".equals(quotJsqr.getQuotJsqrTlOperateState())){ + return success(); + } + } + if("DY".equals(type)){ + if("2".equals(quotJsqr.getQuotJsqrDyOperateState())){ + return success(); + } + } + if("ZY".equals(type)){ + if("2".equals(quotJsqr.getQuotJsqrZyOperateState())){ + return success(); + } + } + if("QT".equals(type)){ + if("2".equals(quotJsqr.getQuotJsqrQtOperateState())){ + return success(); + } + } + } + if(StringUtils.isNotBlank(remark)){ // 判断 redis 中有无 quotJsqrXzRemark key Boolean lock = redisLock.getLock(quotJsqrCode+"_"+type, 10,currentUser); diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzRemark.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzRemark.java index 86eb8e4..ddb75fc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzRemark.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzRemark.java @@ -2,6 +2,7 @@ package com.ruoyi.technicalConfirm.domain; public class QuotJsqrXzRemark { private String type; + private String quotJsqrId; private String quotJsqrCode; private String remark; @@ -13,6 +14,10 @@ public class QuotJsqrXzRemark { this.type = type; } + public String getQuotJsqrId() { return quotJsqrId; } + + public void setQuotJsqrId(String quotJsqrId) { this.quotJsqrId = quotJsqrId; } + public String getQuotJsqrCode() { return quotJsqrCode; } diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue index 28fbbcd..e9e662e 100644 --- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue @@ -1476,6 +1476,7 @@ // 监听协助说明,有数据输入则加入redis 'form.quotJsqrTlRemark':function(newValue, oldValue) { let param = {} + param.quotJsqrId = this.form.quotJsqrId; param.quotJsqrCode = this.form.quotJsqrCode; param.type = "TL";// DY ZY TL QT param.remark = this.form.quotJsqrTlRemark; @@ -1486,6 +1487,7 @@ }, 'form.quotJsqrDyRemark':function(newValue, oldValue) { let param = {} + param.quotJsqrId = this.form.quotJsqrId; param.quotJsqrCode = this.form.quotJsqrCode; param.type = "DY";// DY ZY TL QT param.remark = this.form.quotJsqrDyRemark; @@ -1496,6 +1498,7 @@ }, 'form.quotJsqrZyRemark':function(newValue, oldValue) { let param = {} + param.quotJsqrId = this.form.quotJsqrId; param.quotJsqrCode = this.form.quotJsqrCode; param.type = "ZY";// DY ZY TL QT param.remark = this.form.quotJsqrZyRemark; @@ -1506,6 +1509,7 @@ }, 'form.quotJsqrQtRemark':function(newValue, oldValue) { let param = {} + param.quotJsqrId = this.form.quotJsqrId; param.quotJsqrCode = this.form.quotJsqrCode; param.type = "QT";// DY ZY TL QT param.remark = this.form.quotJsqrQtRemark;