From 7930c05e0d5edfba8de2a5ab60e52532556a643b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 14 八月 2024 17:58:44 +0800
Subject: [PATCH] zjh 2024-08-14
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index ff4a3d5..8df6e9a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1315,12 +1315,12 @@
public AjaxResult addRemark(@ApiParam(value = "浣撴鐖堕」鐩娉ㄩ泦鍚�") @RequestBody List<TjOrderRemark> remarklList) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- if (remarklList == null || remarklList.size() == 0) {
+ if (remarklList == null || remarklList.isEmpty()) {
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -1333,7 +1333,7 @@
List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
final TjCustomer byId1 = customerService.getById(order.getUserId());
- if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) {
+ if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
final TjProject byId = projectService.getById(tjOrderDetail.getProId());
@@ -1378,7 +1378,7 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
// one.setDeptId(orderRemark.getDeptId());
@@ -1764,6 +1764,29 @@
return AjaxResult.success(map);
}
+
+
+
+ @GetMapping("/getAdviceByTjNumAndPro")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+ public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber,tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list =null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if(null !=strings && strings.length>0){
+ list = tjAdviceService.getAdviceStringByIds(strings);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
+
+
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
--
Gitblit v1.8.0