From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120
---
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
index a824950..c202786 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -79,6 +79,9 @@
@Deprecated
public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){
if (detailList != null && !detailList.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
@@ -94,7 +97,7 @@
LtkjJyxmzd jyxmzd = getJyxmzd(project);
if (jyxmzd != null) {
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
- String jyxh = idUtils.generateLisID();
+ String jyxh = idUtils.generateLisID(lis_tmh_prefix);
lisSaveSqdxxDto.setJyxh(jyxh);
lisSaveSqdxxDto.setBah(tjOrder.getCardId());
lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -112,8 +115,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -193,6 +196,8 @@
}
public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
AtomicInteger xh = new AtomicInteger();
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
// String jyxh = idUtils.generateLisID();
@@ -213,8 +218,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -326,6 +331,9 @@
// List<TjProject> projects = projectService.list(wq);
if (projects != null && !projects.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
// 鏍规嵁project琛ㄧ殑his_xmbm鏌ョ粍鍚堝叧鑱旇〃 ltkj_jfzhgljyxmzd 鏍规嵁瀛楁`zhxmdm`
// - 鏌ュ埌 浣跨敤瀛楁`jyxmdm`鏌ユ楠岄」鐩瓧鍏歌〃 ltkj_jyxmzd 鏍规嵁瀛楁`jyxmdm`
// - 鏈煡鍒� 鏌ラ」鐩叧鑱旇〃ltkj_jfxmgljyxmzd 鏍规嵁瀛楁`xmdm`
@@ -336,7 +344,7 @@
LtkjJyxmzd jyxmzd = getJyxmzd(project);
if (jyxmzd != null) {
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
- String jyxh = idUtils.generateLisID();
+ String jyxh = idUtils.generateLisID(lis_tmh_prefix);
lisSaveSqdxxDto.setJyxh(jyxh);
lisSaveSqdxxDto.setBah(tjOrder.getCardId());
lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -354,8 +362,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
--
Gitblit v1.8.0