From 303a933ae58e2057f34693d5813e4128550d1081 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 03 一月 2025 20:58:25 +0800
Subject: [PATCH] zjh20250103
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index f117b58..a790422 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -11,14 +11,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjProject;
-import com.ltkj.hosp.domain.TjSampling;
-import com.ltkj.hosp.domain.TjXdPicture;
-import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.hosp.service.ITjProjectService;
-import com.ltkj.hosp.service.ITjXdPictureService;
-import com.ltkj.hosp.service.TjAsyncService;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,6 +43,14 @@
private ITjCustomerService customerService;
@Autowired
private ISysConfigService configService;
+ @Resource
+ private ITjOrderService orderService;
+ @Resource
+ private ITjOrderDetailService detailService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
+ @Resource
+ private ITjProjectService projectService;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
@@ -74,7 +76,7 @@
wq.orderByDesc(TjXdPicture::getCreateTime);
List<TjXdPicture> list = tjXdPictureService.list(wq);
List<Map<String,Object>> arrayList=new ArrayList<>();
- if(null !=list && list.size()>0){
+ if(null !=list && !list.isEmpty()){
Map<String, List<TjXdPicture>> stringListMap = list.stream().collect(Collectors.groupingBy(TjXdPicture::getCusId));
for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) {
Map<String,Object>map=new HashMap<>();
@@ -91,7 +93,7 @@
}
List<Map<String, Object>> collect =null;
Map<String,Object>map=new HashMap<>();
- if(arrayList.size()>0){
+ if(!arrayList.isEmpty()){
collect = arrayList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
map.put("list",collect);
@@ -141,7 +143,37 @@
@PutMapping
@ApiOperation(value = "淇敼浣撴蹇冪數鍥剧鐞�")
public AjaxResult edit(@RequestBody TjXdPicture tjXdPicture) {
- return toAjax(tjXdPictureService.updateTjXdPicture(tjXdPicture));
+ if (tjXdPictureService.updateById(tjXdPicture)) {
+ TjOrder order = orderService.getOrderByTjNum(tjXdPicture.getTjNum());
+ LambdaQueryWrapper<TjOrderDetail>wq=new LambdaQueryWrapper<>();
+ wq.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ wq.eq(TjOrderDetail::getProId,tjXdPicture.getProId());
+ TjOrderDetail detail = detailService.getOne(wq);
+ detail.setProResult(tjXdPicture.getProResult());
+ detail.setConclusion(tjXdPicture.getConclusion());
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+
+ TjProject tjProject = projectService.getById(tjXdPicture.getProId());
+ TjProject tjProjectp = projectService.getById(tjProject.getProParentId());
+
+ LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ wq1.eq(TjOrderDetail::getProId,tjProjectp.getProId());
+ TjOrderDetail detailp = detailService.getOne(wq);
+ detailp.setTjStatus(1L);
+ detailService.updateById(detailp);
+
+ LambdaQueryWrapper<TjOrderRemark> wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderRemark::getTjNumber,tjXdPicture.getTjNum());
+ wq2.eq(TjOrderRemark::getProId,tjProjectp.getProId());
+ TjOrderRemark remark = remarkService.getOne(wq2);
+ remark.setType(1);
+ remark.setRemark(tjXdPicture.getConclusion());
+ remarkService.updateById(remark);
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
}
/**
--
Gitblit v1.8.0