From 3194e189b44e22cf293c6cd88d9af854a287077d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 14 九月 2023 16:29:12 +0800
Subject: [PATCH] zjh 2023/09/14---3
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 +-------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 6 +++---
4 files changed, 11 insertions(+), 11 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 338ecb8..1cd9cdd 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
@@ -1551,17 +1551,12 @@
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
long l = System.currentTimeMillis();
-
-
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
-
tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠�
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),discount);
-
//娣诲姞remark琛ㄦ暟鎹�
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
-
//鍒ゆ柇鏄惁浜ら挶
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
@@ -1573,8 +1568,7 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
-
- System.out.println("杩欐浠ｇ爜鏃堕棿"+( l - (System.currentTimeMillis()) ));
+ System.out.println("杩欐浠ｇ爜鏃堕棿"+(System.currentTimeMillis()-l));
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 657b289..410ba0b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -491,9 +491,14 @@
@PostMapping("/tjReappoint")
@ApiOperation(value = "浣撴棰勭害淇敼鎺ュ彛")
public AjaxResult tjReappoint(@RequestBody TjReservation tjReservation) {
+ TjReservation reservation = tjReservationService.getById(tjReservation.getId());
+
if (tjReservation.getIsExpire() == 1) {
return AjaxResult.error("棰勭害宸茶繃鏈熶笉鍙慨鏀�");
}
+ tjReservation.setIdCard(reservation.getIdCard());
+ tjReservation.setPhoe(reservation.getPhoe());
+ tjReservation.setName(reservation.getName());
if (tjReservationService.updateById(tjReservation)) {
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 6da9278..33ed2b9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -38,7 +38,8 @@
*/
@ApiModelProperty(value = "浣撴璇︽儏id")
@TableId(type = IdType.ASSIGN_ID)
- private String orderDetailId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orderDetailId;
/**
* 浣撴璁板綍ID锛堝叧鑱斾綋妫�璁板綍琛級
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index f71e330..30a3f17 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -107,7 +107,7 @@
@Insert("\tINSERT INTO tj_order_detail(\n" +
- "\torder_detail_id,\n" +
+// "\torder_detail_id,\n" +
" order_id,\n" +
" pro_id,\n" +
" pro_result,\n" +
@@ -118,11 +118,11 @@
" create_id,\n" +
" pro_type) \n" +
" \n" +
- " SELECT a.id,#{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
+ " SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
"\t\t\n" +
"\tUNION\n" +
" \n" +
- "\tSELECT DISTINCT a.parent_pro_id,#{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId}")
+ "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId}")
boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
--
Gitblit v1.8.0