From 0c0324f7ee99febe9c4aee0e149dc3fe73a9a1e1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 十月 2024 15:35:59 +0800
Subject: [PATCH] zjh20241028
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 110 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 33 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 b8d687d..0665064 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
@@ -12,6 +12,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.redis.RedisCache;
@@ -19,11 +20,12 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
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 lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,6 +46,7 @@
* @author ltkj_璧典匠璞�&鏉庢牸
* @date 2023-04-11
*/
+@Slf4j
@RestController
@RequestMapping("/sampling/sampling")
@Api(tags = "PC绔� 浣撴閲囨牱绠＄悊")
@@ -66,6 +69,8 @@
private LisApiMethod lisApiMethod;
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private ISysConfigService configService;
/**
* 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃
@@ -226,7 +231,7 @@
ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
for (TjSampling tjSampling : list) {
TjCustomer customer = customerService.getById(tjSampling.getCusId());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusName(customer.getCusName());
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(tjSampling.getTjNum());
@@ -247,12 +252,14 @@
*/
@GetMapping("/getCusCyList")
@ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
- public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+ public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId,
+ @RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor) {
if (cusId == null || StrUtil.isBlank(cusId))
return AjaxResult.error("鍙傛暟閿欒,鏈紶鍙傛暟");
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getCusId, cusId);
- wrapper.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1);
+ wrapper.eq(TjSampling::getIsSignFor,isSignFor);
+ wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
@@ -260,8 +267,10 @@
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
for (TjSampling sampling : list) {
-// sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
- sampling.setCusName(sampling.getCusName());
+ TjCustomer customer = customerService.getById(sampling.getCusId());
+ TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null !=order)sampling.setCardId(order.getCardId());
+ sampling.setCustomer(customer);
}
return AjaxResult.success(list);
}
@@ -279,6 +288,11 @@
int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
+// 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
+ String string = tjSamplingService.getBuKeHebingProName(ids);
+ if(null !=string){
+ return AjaxResult.error(string+"杩欏嚑涓」鐩笉鍙悎骞�!");
+ }
if (pdsfczhbxm == 0) {
TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(ids);
@@ -398,38 +412,68 @@
@ApiOperation(value = "纭閲囨牱鎺ュ彛")
@Transactional
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
- if (null == ids || ids.size() == 0) {
+ if (null == ids || ids.isEmpty()) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
}
- for (String id : ids) {
- TjSampling sampling = tjSamplingService.getById(id);
- if (null != sampling) {
- sampling.setIsSignFor("0");
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, sampling.getProId());
- List<TjProject> projectList = projectService.list(wq);
- List<String> collect = new ArrayList<>();
- for (TjProject project : projectList) {
- Long proId = project.getProId();
- collect.add(String.valueOf(proId));
- }
- LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
- wq1.in(TjSampling::getProId, collect);
- List<TjSampling> samplingList = tjSamplingService.list(wq1);
- if (null != samplingList && samplingList.size() > 0) {
- for (TjSampling tjSampling : samplingList) {
- tjSampling.setIsSignFor("0");
- tjSamplingService.updateById(tjSampling);
- }
- }
+ List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
+ if (tjSamplings.isEmpty())
+ return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ String errorMsg = "";
+ for (TjSampling sampling : tjSamplings) {
+ if (sampling.getJyxmdm() == null)
+ errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+ sampling.setIsSignFor("0");
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, sampling.getProId());
+// List<TjProject> projectList = projectService.list(wq);
+// List<String> collect = new ArrayList<>();
+// for (TjProject project : projectList) {
+// Long proId = project.getProId();
+// collect.add(String.valueOf(proId));
+// }
+// LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
+// wq1.in(TjSampling::getProId, collect);
+// List<TjSampling> samplingList = tjSamplingService.list(wq1);
+// if (null != samplingList && samplingList.size() > 0) {
+// for (TjSampling tjSampling : samplingList) {
+// tjSampling.setIsSignFor("0");
+// tjSamplingService.updateById(tjSampling);
+// }
+// }
+ TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null==tjOrder)return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
+ TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
+ boolean updChild;
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ Boolean save;
+ if (null != config && config.equals("Y")) {
+ save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
+ }else {
+ save = true;
}
- if (!tjSamplingService.updateById(sampling)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
+ if (save) {
+ if (sampling.getIsMerge() == 1) {
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getParentId, sampling.getId());
+ List<TjSampling> list = tjSamplingService.list(wrapper);
+ for (TjSampling tjSampling : list) {
+ tjSampling.setIsSignFor("0");
+ }
+ updChild = tjSamplingService.updateBatchById(list);
+ } else {
+ updChild = true;
+ }
+ if (!tjSamplingService.updateById(sampling) && !updChild) {
+// lisApiMethod.cancel(sampling.getJyxh(), tjOrder.getCardId(), PinyinUtil.getFirstLetter(tjCustomer.getCusName(), ""));
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
+ }
+ } else {
+ return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
}
}
-
+ if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0