From 75605bab29e6e5db93f4ba1f12d9f2fe9015990c Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期四, 31 十月 2024 10:04:50 +0800
Subject: [PATCH] 采样登记抽出合并以及确认采样接口
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 75 +++++++++----------------------------
1 files changed, 18 insertions(+), 57 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 0665064..0f529eb 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
@@ -68,8 +68,6 @@
@Autowired
private LisApiMethod lisApiMethod;
@Autowired
- private IdUtils idUtils;
- @Autowired
private ISysConfigService configService;
/**
@@ -277,59 +275,8 @@
@PostMapping("/mergeCaiYang")
@ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
- @Transactional
public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
- if (null != ids && !ids.isEmpty()) {
- if(ids.size()==1)return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
- int i = tjSamplingService.panduanshifoukeyihebing(ids);
- if (i > 1) {
- return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
- }
- 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);
- 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());
- if (tjSamplingService.save(sampling)) {
- if (tjSamplingService.updateHeBingXm(ids, sampling.getId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触!");
- } else {
- TjSampling tjSampling = tjSamplingService.getTjSamplingByHb(ids);
- List<TjSampling> samplingList = tjSamplingService.getTjSamplingListByHb(ids);
- if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
- List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
- Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(stringList);
- String proId = map.get("proId").toString();
- String proName = map.get("proName").toString();
- tjSampling.setProId(proId);
- tjSampling.setProName(proName);
- if (tjSamplingService.updateById(tjSampling)) {
- if (tjSamplingService.updateHeBingXm(stringList, tjSampling.getParentId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
- }
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触!");
- }
- }
- return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
+ return tjSamplingService.mergeCaiYangTran(ids);
}
@@ -412,6 +359,21 @@
@ApiOperation(value = "纭閲囨牱鎺ュ彛")
@Transactional
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
+ return confirm(ids,config,mergeRequest);
+ }
+
+ /**
+ * 纭閲囨牱鎺ュ彛
+ */
+ public Boolean confirmSamplingApi(List<String> ids,String sfkqdyhis,String mergeRequest) {
+ AjaxResult confirm = confirm(ids, sfkqdyhis, mergeRequest);
+ log.info("纭閲囨牱杩斿洖 ->{}",confirm);
+ return confirm.get("code").toString().equals("200");
+ }
+
+ private AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
if (null == ids || ids.isEmpty()) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
}
@@ -442,12 +404,11 @@
// }
// }
TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
- if(null==tjOrder)return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
+ 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")) {
+ if (null != config && config.equals("Y") && !mergeRequest.equals("Y")) {
save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
}else {
save = true;
--
Gitblit v1.8.0