From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
index 8d421ee..36c5c03 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
@@ -120,6 +120,95 @@
wrapper.eq(TjSampling::getParentId, sampling.getId());
List<TjSampling> list = tjSamplingService.list(wrapper);
for (TjSampling tjSampling : list) {
+ tjSampling.setIsSignFor("1");
+ }
+ 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("鎿嶄綔鎴愬姛");
+ }
+
+ /**
+ * 閲囨牱绠＄悊 纭閲囩爜鎸夐挳璋冪敤
+ * @param ids
+ * @param config
+ * @param mergeRequest
+ * @return
+ */
+ public AjaxResult confirmApi(List<String> ids,String config,String mergeRequest) {
+
+
+
+ // sfkqdshitulianjie
+ if (null == ids || ids.isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ }
+ List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
+ if (tjSamplings.isEmpty())
+ return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ String errorMsg = "";
+ for (TjSampling sampling : tjSamplings) {
+ if (!sysConfigService.selectConfigByKey("sfkqdshitulianjie").toLowerCase().equals("y")) {
+ 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;
+ Boolean save;
+// String is_request_common_his_api = sysConfigService.selectConfigByKey("is_request_common_his_api");
+// if (null != config && config.equals("Y") && !mergeRequest.equals("Y")) {
+// save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
+// } else if (is_request_common_his_api.equals("Y")){
+//// String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+//// String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+//// save = sendLis(sampling,tjOrder,apiUrl,hospbm);
+// save = true;
+// }else {
+// save = true;
+// }
+ save = true;
+ 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);
@@ -234,7 +323,6 @@
entries.putOpt("sfxmid",project.getProId());
entries.putOpt("sfxmname",project.getProName());
- // 鍙杢b琛�
QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
wrapper
.select("sum(now_price) as now_price")
--
Gitblit v1.8.0