From 52b3796bfe8d797e038a3af5f447d4832f9745e8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 17 十月 2024 11:28:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 7172769..e271b30 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -6,9 +6,11 @@
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.servlet.ServletSecurityElement;
import javax.servlet.http.HttpServletResponse;
import javax.swing.plaf.basic.BasicScrollPaneUI;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,10 +19,12 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.web.controller.lis.LisApiMethod;
+import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.aspectj.weaver.AjAttribute;
+import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -41,7 +45,7 @@
*/
@RestController
@RequestMapping("/sampling/sampling")
-@Api(tags = "浣撴閲囨牱绠＄悊")
+@Api(tags = "PC绔� 浣撴閲囨牱绠＄悊")
public class TjSamplingController extends BaseController {
@Resource
private ITjSamplingService tjSamplingService;
@@ -194,6 +198,7 @@
* @return
*/
@GetMapping("/getCusList")
+ @ApiOperation(value = "鑾峰彇閲囨牱瀹㈡埛鍒楄〃")
public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor,
@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
@RequestParam(required = false) @ApiParam(value = "瀹㈡埛濮撳悕") String name,
@@ -236,28 +241,57 @@
* @return
*/
@GetMapping("/getCusCyList")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId){
if (cusId == null || StrUtil.isBlank(cusId))
return AjaxResult.error("鍙傛暟閿欒");
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getCusId,cusId);
+ wrapper.isNull(TjSampling::getParentId);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty())
return AjaxResult.error("鍙傛暟閿欒");
- List<TjSampling> projectList = new ArrayList<>();
for (TjSampling sampling : list) {
sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
- TjProject project = projectService.getById(sampling.getProId());
- if (null != project && project.getProParentId() == 0) {
- projectList.add(sampling);
- }
}
- return AjaxResult.success(projectList);
+ return AjaxResult.success(list);
}
- @PostMapping("/mergeCaiYang")
- public AjaxResult mergeCaiYang(@RequestBody List<String> ids){
- return AjaxResult.success();
+ @GetMapping("/mergeCaiYang")
+ @ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
+ public AjaxResult mergeCaiYang(@RequestParam List<String> ids){
+ if(null !=ids && !ids.isEmpty()){
+ int i = tjSamplingService.panduanshifoukeyihebing(ids);
+ if(i>1){
+ return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
+ }
+
+ TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
+
+
+ //todo 鍔犱竴鏉″垽鏂槸鍚﹀瓨鍦ㄥ悎骞堕」鐩殑鏌ヨsql
+ //todo 鍒ゆ柇浼犲叆鐨勯」鐩槸鍚﹀瓨鍦ㄥ悎骞堕」鐩� 涓嶅瓨鍦ㄨ蛋鍘熼�昏緫 瀛樺湪璧癳lse
+
+
+ Map<String,Object> map= tjSamplingService.hebingCaiYangInFo(ids);
+ TjSampling sampling=new TjSampling();
+ String proId = map.get("proId").toString();
+ String proName = map.get("proName").toString();
+ BeanUtil.copyProperties(tjSampling,sampling,new String[]{"id"});
+ sampling.setProId(proId);
+ sampling.setProName(proName);
+ sampling.setIsMerge(1);
+ if (tjSamplingService.save(sampling)) {
+ for (String id : ids) {
+ TjSampling service = tjSamplingService.getById(id);
+ service.setParentId(sampling.getId());
+ service.setIsMerge(1);
+ tjSamplingService.updateById(service);
+ }
+ return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
+ }
+ }
+ return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
}
/**
@@ -327,12 +361,9 @@
if (null == ids || ids.size() == 0) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
}
- String tjNumber = "";
- ArrayList<TjProject> projects = new ArrayList<>();
for (String id : ids) {
TjSampling sampling = tjSamplingService.getById(id);
if (null != sampling) {
- tjNumber = sampling.getTjNum();
sampling.setIsSignFor("0");
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -341,7 +372,6 @@
for (TjProject project : projectList) {
Long proId = project.getProId();
collect.add(String.valueOf(proId));
- projects.add(project);
}
LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
@@ -357,15 +387,6 @@
if (!tjSamplingService.updateById(sampling)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
- }
- }
- if (StrUtil.isNotBlank(tjNumber)){
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- TjCustomer customer = customerService.getById(order.getUserId());
- List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(String.valueOf(customer.getCusId()),order.getCardId());
- Boolean save = lisApiMethod.save(order, customer, projects, detailList);
- if (!save){
-
}
}
--
Gitblit v1.8.0