From 35bf4a558e23d5016bccaa2145c4bed20aed920f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 02 十二月 2024 00:18:13 +0800
Subject: [PATCH] zjh20241202-1
---
ltkj-admin/src/test/java/zjhTest.java | 11 +++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 10 +++++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 9dc05e7..1144249 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -997,10 +997,18 @@
}
// TODO 鍜岀鍒扮櫥璁颁竴鏍� 鍙湁閰嶇疆涓殑浠ュ強鏀惰垂绫诲瀷涓轰綋妫�绁ㄦ椂鎵嶅鍔犲埌閲囨牱绠＄悊琛�
- if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
+ if(config.equals("Y")){
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
+ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
+ addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
+ }
+ }else {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(order.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
}
+
}
// Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index b3886f5..8298b15 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -59,8 +59,8 @@
//
// @Autowired
// private ITjGroupingProService groupingProService;
-// @Autowired
-// private ITjProjectService projectService;
+ @Autowired
+ private ITjProjectService projectService;
// @Resource
// private ITjCustomerService tjCustomerService;
// @Resource
@@ -86,6 +86,13 @@
private String secret;
@Test
public void test() {
+
+
+ List<TjProject> list = projectService.list();
+ for (TjProject project : list) {
+ project.setProEngName(PinyinUtil.getFirstLetter(project.getProName(),""));
+ projectService.updateById(project);
+ }
/*
// 鐢熸垚鎸囧畾url瀵瑰簲鐨勪簩缁寸爜鍒版枃浠讹紝瀹藉拰楂橀兘鏄�300鍍忕礌
--
Gitblit v1.8.0