From 2a0f3165362a84111717855cfed257d7baf81cc8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 28 二月 2023 16:48:42 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/BOMFeedbakService.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/BOMFeedbakService.java b/src/main/java/com/whyc/service/BOMFeedbakService.java
index 8ff8f6f..83ecf3e 100644
--- a/src/main/java/com/whyc/service/BOMFeedbakService.java
+++ b/src/main/java/com/whyc/service/BOMFeedbakService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileDirPath;
@@ -88,23 +89,38 @@
PageInfo pageInfo = new PageInfo(list);
return new Response().setII(1,list.size()>0,pageInfo,"鎺ユ敹鑰呭弽棣�");
}
- //鎺ユ敹鑰呯‘璁ゅ弽棣�
- public Response setconfirmFk(int id) {
+
+ /**
+ * 鎺ユ敹鑰呯‘璁ゅ弽棣�
+ *
+ * @param feedback
+ * @return
+ */
+ public Response confirmFeedback(BOMFeedback feedback) {
String msg="";
boolean bl=true;
+ int id = feedback.getId();
+ Integer confirmStatus = feedback.getConfirmStatus();
+ String replyContent = feedback.getReplyContent();
+ Date now = new Date();
+ if(confirmStatus == 1){ //涓庢垜鏃犲叧
+ feedback.setReplyContent("绯荤粺榛樿鐢熸垚鍥炲:涓庢垜鏃犲叧");
+ }
//1.纭鍓嶅厛鍒ゆ柇鍙嶉鏄惁琚‘璁�
- QueryWrapper qwrapper=new QueryWrapper();
- qwrapper.eq("id",id);
- qwrapper.eq("confirm_status",1);
- List list=mapper.selectList(qwrapper);
+ QueryWrapper<BOMFeedback> queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("id",id);
+ queryWrapper.ne("confirm_status",0);
+ List list=mapper.selectList(queryWrapper);
if(list!=null&&list.size()>0){
msg="璇ュ弽棣堝凡琚‘璁�";
bl=false;
}else{
//2.纭鍙嶉
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.set("confirm_status",1);
+ UpdateWrapper<BOMFeedback> wrapper=new UpdateWrapper<>();
+ wrapper.set("confirm_status",confirmStatus);
wrapper.set("confirm_user_name",ActionUtil.getUser().getName());
+ wrapper.set("reply_content",replyContent);
+ wrapper.set("reply_time",now);
wrapper.eq("id",id);
int count=mapper.update(null,wrapper);
bl=count>0;
@@ -214,4 +230,11 @@
e.printStackTrace();
}
}
+
+ public Response updateEcrNumber(int id, String ecrNumber) {
+ UpdateWrapper<BOMFeedback> update = Wrappers.update();
+ update.set("ecr_number",ecrNumber).set("confirm_status",3).eq("id",id);
+ mapper.update(null, update);
+ return new Response().set(1,true,"涓婁紶瀹屾垚");
+ }
}
--
Gitblit v1.9.1