From 6cd2d32a724d7c3414e00a0866acf45ade2e5bfe Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 29 七月 2025 17:40:49 +0800
Subject: [PATCH] zjh20250729-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 0adee6c..532caae 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1395,10 +1395,10 @@
if (null != jzh && null != jzh.toString()) {
hisApiMethod.ZfHisApiMethod(jzh.toString());
}
- log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
+ log.error("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
throw new IllegalStateException("鎸傚彿澶辫触!" + result.get("msg").toString());
}
- log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
+ log.error("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
try {
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
@@ -1408,27 +1408,31 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
if (!ajaxResult.get("code").toString().equals("200")) {
+ log.error("鍥綋鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
throw new IllegalStateException("鍥綋鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
-// return ajaxResult;
}
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
-// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
-// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+
log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
} else {
- log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳鏀惰垂:" + tjOrder.getTjNumber());
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
- if (isUseMx.equalsIgnoreCase("Y"))
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
- else
- hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ try {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳鏀惰垂:" + tjOrder.getTjNumber());
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else
+ hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ } catch (Exception e) {
+ log.error("鐢宠鍗曞彂閫佸け璐� ->{}" + String.valueOf(e), e.getMessage());
+ throw new IllegalStateException("鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
+ }
}
} catch (Exception e) {
log.error("鍙戠敓閿欒 ->{}" + String.valueOf(e), e.getMessage());
@@ -2949,10 +2953,12 @@
for (TbTransition tbTransition : list) {
if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
JSONObject obj = JSONUtil.createObj();
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, tbTransition.getParentProId().toString());
obj.putOpt("index", index++);
obj.putOpt("parent_pro_name", tbTransition.getParentProName());
obj.putOpt("price", tbTransition.getOrdPrice());
obj.putOpt("ks", dept.getDeptName());
+ if(null !=remark) obj.putOpt("sfzt", remark.getSfbz());
huiZong.add(obj);
}
}
@@ -3033,6 +3039,7 @@
xdPictureService.saveBatch(xdPictureList);
}
} catch (Exception e) {
+ log.error(e.toString());
throw new RuntimeException(e);
}
}
--
Gitblit v1.8.0