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 58516de..f1b84c2 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 @@ -123,6 +123,7 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrTlOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrTlOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrTlOperateState(state); + quotJsqr.setQuotJsqrTlRemark(info.getQuotJsqrTlRemark()); String quotJsqrTlRemark = info.getQuotJsqrTlRemark(); if("3".equals(state)){//驳回 @@ -131,7 +132,7 @@ public class QuotJsqrController extends BaseController } quotJsqr.setQuotJsqrTlApprovalStatus("3");//特缆协助状态 设置为 驳回 }else if("2".equals(state)){ - if("0".equals(fileNum)&&"".equals(quotJsqrTlRemark)){ + if("0".equals(fileNum)&&StringUtils.isEmpty(quotJsqrTlRemark)){ return error("特缆反馈附件 或 特缆协助说明 至少填写一项"); } } @@ -140,8 +141,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrTlCheckUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrTlCheckTime(DateUtils.getTime()); quotJsqr.setQuotJsqrTlCheckState(state); + quotJsqr.setQuotJsqrTlCheckRemark(info.getQuotJsqrTlCheckRemark()); + + String quotJsqrTlCheckRemark = info.getQuotJsqrTlCheckRemark(); if("3".equals(state)){//驳回 - String quotJsqrTlCheckRemark = info.getQuotJsqrTlCheckRemark(); if(StringUtils.isEmpty(quotJsqrTlCheckRemark)){ return error("特缆审核意见不能为空"); } @@ -152,8 +155,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrTlLeaderUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrTlLeaderTime(DateUtils.getTime()); quotJsqr.setQuotJsqrTlLeaderState(state); + quotJsqr.setQuotJsqrTlLeaderRemark(info.getQuotJsqrTlLeaderRemark()); + + String quotJsqrTlLeaderRemark = info.getQuotJsqrTlLeaderRemark(); if("3".equals(state)){//驳回 - String quotJsqrTlLeaderRemark = info.getQuotJsqrTlLeaderRemark(); if(StringUtils.isEmpty(quotJsqrTlLeaderRemark)){ return error("特缆组长确认意见不能为空"); } @@ -168,6 +173,7 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrDyOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrDyOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrDyOperateState(state); + quotJsqr.setQuotJsqrDyRemark(info.getQuotJsqrDyRemark()); String quotJsqrDyRemark = info.getQuotJsqrDyRemark(); if("3".equals(state)){//驳回 @@ -176,7 +182,7 @@ public class QuotJsqrController extends BaseController } quotJsqr.setQuotJsqrDyApprovalStatus("3");//低压协助状态 设置为 驳回 }else if("2".equals(state)){ - if("0".equals(fileNum)&&"".equals(quotJsqrDyRemark)){ + if("0".equals(fileNum)&&StringUtils.isEmpty(quotJsqrDyRemark)){ return error("低压反馈附件 或 低压协助说明 至少填写一项"); } } @@ -185,8 +191,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrDyCheckUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrDyCheckTime(DateUtils.getTime()); quotJsqr.setQuotJsqrDyCheckState(state); + quotJsqr.setQuotJsqrDyCheckRemark(info.getQuotJsqrDyCheckRemark()); + + String quotJsqrDyCheckRemark = info.getQuotJsqrDyCheckRemark(); if("3".equals(state)){//驳回 - String quotJsqrDyCheckRemark = info.getQuotJsqrDyCheckRemark(); if(StringUtils.isEmpty(quotJsqrDyCheckRemark)){ return error("低压审核意见不能为空"); } @@ -197,8 +205,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrDyLeaderUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrDyLeaderTime(DateUtils.getTime()); quotJsqr.setQuotJsqrDyLeaderState(state); + quotJsqr.setQuotJsqrDyLeaderRemark(info.getQuotJsqrDyLeaderRemark()); + + String quotJsqrDyLeaderRemark = info.getQuotJsqrDyLeaderRemark(); if("3".equals(state)){//驳回 - String quotJsqrDyLeaderRemark = info.getQuotJsqrDyLeaderRemark(); if(StringUtils.isEmpty(quotJsqrDyLeaderRemark)){ return error("低压组长确认意见不能为空"); } @@ -213,6 +223,7 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrZyOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrZyOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrZyOperateState(state); + quotJsqr.setQuotJsqrZyRemark(info.getQuotJsqrZyRemark()); String quotJsqrZyRemark = info.getQuotJsqrZyRemark(); if("3".equals(state)){//驳回 @@ -221,7 +232,7 @@ public class QuotJsqrController extends BaseController } quotJsqr.setQuotJsqrZyApprovalStatus("3");//中压协助状态 设置为 驳回 }else if("2".equals(state)){ - if("0".equals(fileNum)&&"".equals(quotJsqrZyRemark)){ + if("0".equals(fileNum)&&StringUtils.isEmpty(quotJsqrZyRemark)){ return error("中压反馈附件 或 低压协助说明 至少填写一项"); } } @@ -230,8 +241,11 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrZyCheckUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrZyCheckTime(DateUtils.getTime()); quotJsqr.setQuotJsqrZyCheckState(state); + quotJsqr.setQuotJsqrZyCheckRemark(info.getQuotJsqrZyCheckRemark()); + + String quotJsqrZyCheckRemark = info.getQuotJsqrZyCheckRemark(); if("3".equals(state)){//驳回 - String quotJsqrZyCheckRemark = info.getQuotJsqrZyCheckRemark(); + if(StringUtils.isEmpty(quotJsqrZyCheckRemark)){ return error("中压审核意见不能为空"); } @@ -242,8 +256,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrZyLeaderUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrZyLeaderTime(DateUtils.getTime()); quotJsqr.setQuotJsqrZyLeaderState(state); + quotJsqr.setQuotJsqrZyLeaderRemark(info.getQuotJsqrZyLeaderRemark()); + + String quotJsqrZyLeaderRemark = info.getQuotJsqrZyLeaderRemark(); if("3".equals(state)){//驳回 - String quotJsqrZyLeaderRemark = info.getQuotJsqrZyLeaderRemark(); if(StringUtils.isEmpty(quotJsqrZyLeaderRemark)){ return error("中压组长确认意见不能为空"); } @@ -258,6 +274,7 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrQtOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrQtOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrQtOperateState(state); + quotJsqr.setQuotJsqrQtRemark(info.getQuotJsqrQtRemark()); String quotJsqrQtRemark = info.getQuotJsqrQtRemark(); if("3".equals(state)){//驳回 @@ -266,7 +283,7 @@ public class QuotJsqrController extends BaseController } quotJsqr.setQuotJsqrQtApprovalStatus("3");//其他协助状态 设置为 驳回 }else if("2".equals(state)){ - if("0".equals(fileNum)&&"".equals(quotJsqrQtRemark)){ + if("0".equals(fileNum)&&StringUtils.isEmpty(quotJsqrQtRemark)){ return error("其他反馈附件 或 其他协助说明 至少填写一项"); } } @@ -275,8 +292,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrQtCheckUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrQtCheckTime(DateUtils.getTime()); quotJsqr.setQuotJsqrQtCheckState(state); + quotJsqr.setQuotJsqrQtCheckRemark(info.getQuotJsqrQtCheckRemark()); + + String quotJsqrQtCheckRemark = info.getQuotJsqrQtCheckRemark(); if("3".equals(state)){//驳回 - String quotJsqrQtCheckRemark = info.getQuotJsqrQtCheckRemark(); if(StringUtils.isEmpty(quotJsqrQtCheckRemark)){ return error("其他审核意见不能为空"); } @@ -287,8 +306,10 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrQtLeaderUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrQtLeaderTime(DateUtils.getTime()); quotJsqr.setQuotJsqrQtLeaderState(state); + quotJsqr.setQuotJsqrQtLeaderRemark(info.getQuotJsqrQtLeaderRemark()); + + String quotJsqrQtLeaderRemark = info.getQuotJsqrQtLeaderRemark(); if("3".equals(state)){//驳回 - String quotJsqrQtLeaderRemark = info.getQuotJsqrQtLeaderRemark(); if(StringUtils.isEmpty(quotJsqrQtLeaderRemark)){ return error("其他确认意见不能为空"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java index c3cd5ff..eee44cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java @@ -538,6 +538,9 @@ public class QuotJsqr extends BaseEntity /** 报价单信息 */ + /** 报价单号Id */ + private String quotId; + /** 报价单号 */ private String quotCode; @@ -566,6 +569,9 @@ public class QuotJsqr extends BaseEntity /** 技术协助-技术要求 */ private String quotJsxzTechnicalRequirement; + public String getQuotId() { return quotId; } + public void setQuotId(String quotId) { this.quotId = quotId; } + public String getQuotCode() { return quotCode; } public void setQuotCode(String quotCode) { this.quotCode = quotCode; } diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml index 86380da..4277e2b 100644 --- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml @@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -98,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_jsqr_qt_operate_time, a.quot_jsqr_qt_remark, a.quot_jsqr_qt_check_user_name, a.quot_jsqr_qt_check_state, a.quot_jsqr_qt_check_time, a.quot_jsqr_qt_check_remark, a.quot_jsqr_qt_leader_user_name, a.quot_jsqr_qt_leader_state, a.quot_jsqr_qt_leader_time, a.quot_jsqr_qt_leader_remark, a.create_by, a.create_time, a.update_by, a.update_time, - u.nick_name create_name,q.quot_code,q.quot_salesman_name,q.quot_customer_name,q.quot_project, + u.nick_name create_name,q.quot_id,q.quot_code,q.quot_salesman_name,q.quot_customer_name,q.quot_project, q.quot_jsxz_approval_status,q.quot_jsxz_group_values,q.quot_jsxz_standard,q.quot_jsxz_chapter,q.quot_jsxz_technical_requirement from quot_jsqr a diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 7d06d7a..89d335c 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -103,8 +103,17 @@ - + + + + + +