From 7dcc5427cfafc4d2ba346e05c340c598fc386009 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 02 八月 2024 18:13:39 +0800
Subject: [PATCH] zjh 2024/08/02-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 3 +++
ltkj-admin/src/test/java/zjhTest.java | 30 +++---------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java | 6 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 6 ++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 4 +++-
ltkj-admin/src/main/resources/application.yml | 2 +-
7 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 7d4b702..5f7a8fb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -4,6 +4,7 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -215,7 +216,8 @@
// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
// }
- if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+ if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),
+ tjReservation.getYxts())).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
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 48cd280..95a5bac 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
@@ -905,7 +905,7 @@
// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
// }
- if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+ if (DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),tjReservation.getYxts())).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
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 2f1cd87..9309e20 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
@@ -456,6 +456,7 @@
*/
@PostMapping("/tjReappoint")
@ApiOperation(value = "浣撴棰勭害淇敼鎺ュ彛")
+ @Transactional
public AjaxResult tjReappoint(@RequestBody TjReservation tjReservation) {
TjReservation reservation = tjReservationService.getById(tjReservation.getId());
@@ -468,7 +469,7 @@
if (tjReservationService.updateById(tjReservation)) {
taskService.removeTask(new TjReservationTask(tjReservation.getId()));
taskService.addTask(new TjReservationTask(tjReservation.getId(),
- DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
+ DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),reservation.getYxts())), DateUnit.MS)));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -560,8 +561,9 @@
tramNum+=1;
reservation.setTjType(String.valueOf(1));
reservation.setTeamNo(teamNo);
+ reservation.setYxts(dto.getYxts());
tjReservationService.save(reservation);
- taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(reservation.getReservationTime()), DateUnit.MS)));
+ taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(),dto.getYxts())), DateUnit.MS)));
}
LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjCompPay::getCompId, dwDept.getDwId());
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 074b323..f095d43 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 8d4ac01..46c9e15 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -122,33 +122,9 @@
public static void main(String[] args) {
- // 鍒濆鏁版嵁搴撻厤缃�
- String initialUrl = "jdbc:mysql://initial_host:3306/initial_db";
- String username = "user";
- String password = "pass";
-
- // 鏂版暟鎹簱閰嶇疆
- String newUrl = "jdbc:mysql://new_host:3306/new_db";
-
- // 鏇存敼杩炴帴URL
- String urlToUse = initialUrl; // 鍙互鏍规嵁闇�瑕佸垏鎹㈠埌newUrl
-
- // 鍒涘缓鏁版嵁搴撹繛鎺ュ睘鎬�
- Properties props = new Properties();
- props.setProperty("user", username);
- props.setProperty("password", password);
-
- try {
- // 杩炴帴鍒版暟鎹簱
- Connection conn = DriverManager.getConnection(urlToUse, props);
-
- // 浣跨敤conn杩涜鏁版嵁搴撴搷浣�...
-
- // 鍏抽棴杩炴帴
- conn.close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
+// System.out.println(DateUtil.date());
+// System.out.println(DateUtil.offsetDay(DateUtil.date(),1));
+// System.out.println(DateUtil.offsetDay(DateUtil.date(),0));
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 35c64a7..1de6113 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -330,6 +330,9 @@
@ApiModelProperty("绱㈠紩鍗″彿")
private String indexCard;
+ @ApiModelProperty("鏈夋晥澶╂暟")
+ private Integer yxts;
+
@Override
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java
index f0dc9ce..e13286c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java
@@ -57,4 +57,10 @@
*/
@ApiModelProperty(value = "鏀粯鏂瑰紡 0鑷垂1鍏徃浠樻")
private Integer payType;
+
+ /**
+ * 鏈夋晥澶╂暟
+ */
+ @ApiModelProperty(value = "鏈夋晥澶╂暟")
+ private Integer yxts;
}
--
Gitblit v1.8.0