From e8740ff335d406b21ba7724714e1d7e951170daa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 三月 2025 15:57:28 +0800
Subject: [PATCH] zjh20250328
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java | 95 +++++++++++++++++++++++------------------------
1 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
index 18c3ed1..1cc25ec 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
@@ -1,19 +1,14 @@
package com.ltkj.hosp.service.impl;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
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.service.impl.ServiceImpl;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.utils.DateUtils;
-import com.ltkj.common.utils.IdUtils;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.idutil.IdUtils;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
import lombok.extern.slf4j.Slf4j;
@@ -169,55 +164,59 @@
}
private AjaxResult mergeCaiYang(List<String> ids,String prefix) {
- if (null != ids && !ids.isEmpty()) {
- if(ids.size()==1) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
- int i = panduanshifoukeyihebing(ids);
- if (i > 1) {
- return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
- }
- int pdsfczhbxm = pdsfczhbxm(ids);
- if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
- if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
-// 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
- String string = getBuKeHebingProName(ids);
- if(null !=string){
- return AjaxResult.error(string + "杩欏嚑涓」鐩笉鍙悎骞�!");
- }
- if (pdsfczhbxm == 0) {
- TjSampling tjSampling = getById(ids.get(0));
- Map<String, Object> map = 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);
- sampling.setJyxh(idUtils.generateLisID(prefix));
- if (save(sampling)) {
- if (updateHeBingXm(ids, sampling.getId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!", sampling.getId());
- }
+ try {
+ if (null != ids && !ids.isEmpty()) {
+ if(ids.size()==1) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
+ int i = panduanshifoukeyihebing(ids);
+ if (i > 1) {
+ return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
}
- return AjaxResult.error("鎿嶄綔澶辫触!");
- } else {
- TjSampling tjSampling = getTjSamplingByHb(ids);
- List<TjSampling> samplingList = getTjSamplingListByHb(ids);
- if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
- List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
- Map<String, Object> map = hebingCaiYangInFo(stringList);
+ int pdsfczhbxm = pdsfczhbxm(ids);
+ if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
+ if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
+ // 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
+ String string = getBuKeHebingProName(ids);
+ if(null !=string){
+ return AjaxResult.error(string + "杩欏嚑涓」鐩笉鍙悎骞�!");
+ }
+ if (pdsfczhbxm == 0) {
+ TjSampling tjSampling = getById(ids.get(0));
+ Map<String, Object> map = hebingCaiYangInFo(ids);
+ TjSampling sampling = new TjSampling();
String proId = map.get("proId").toString();
String proName = map.get("proName").toString();
- tjSampling.setProId(proId);
- tjSampling.setProName(proName);
- if (updateById(tjSampling)) {
- if (updateHeBingXm(stringList, tjSampling.getParentId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!", tjSampling.getId());
+ BeanUtil.copyProperties(tjSampling, sampling, new String[]{"id"});
+ sampling.setProId(proId);
+ sampling.setProName(proName);
+ sampling.setIsMerge(1);
+ sampling.setJyxh(idUtils.generateLisID(prefix));
+ if (save(sampling)) {
+ if (updateHeBingXm(ids, sampling.getId())) {
+ return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!", sampling.getId());
}
}
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ } else {
+ TjSampling tjSampling = getTjSamplingByHb(ids);
+ List<TjSampling> samplingList = getTjSamplingListByHb(ids);
+ if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
+ List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
+ Map<String, Object> map = hebingCaiYangInFo(stringList);
+ String proId = map.get("proId").toString();
+ String proName = map.get("proName").toString();
+ tjSampling.setProId(proId);
+ tjSampling.setProName(proName);
+ if (updateById(tjSampling)) {
+ if (updateHeBingXm(stringList, tjSampling.getParentId())) {
+ return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!", tjSampling.getId());
+ }
+ }
+ }
+ return AjaxResult.error("鎿嶄綔澶辫触!");
}
- return AjaxResult.error("鎿嶄綔澶辫触!");
}
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
}
--
Gitblit v1.8.0