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-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
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 46230be..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
@@ -158,13 +158,13 @@
public TableDataInfo list(TjReservation tjReservation) {
startPage();
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
- if(null !=list && list.size()>0){
- for (TjReservation reservation : list) {
- reservation.setName(MatchUtils.hideCusName(reservation.getName()));
- reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
- reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
- }
- }
+// if(null !=list && list.size()>0){
+// for (TjReservation reservation : list) {
+// reservation.setName(MatchUtils.hideCusName(reservation.getName()));
+// reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
+// reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
+// }
+// }
return getDataTable(list);
}
@@ -251,9 +251,15 @@
String idCard = tjReservation.getIdCard();
String phoe = tjReservation.getPhoe();
if (null != idCard && null != phoe) {
- if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+// if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+ if (idCard.isEmpty() || phoe.isEmpty()) {
wrongList.add(tjReservation.getName());
} else {
+ //骞撮緞
+ tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
+ //鍑虹敓鏃ユ湡
+ tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));
+
if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {
tjReservation.setGroupingId(groupingMan.getId());
@@ -450,6 +456,7 @@
*/
@PostMapping("/tjReappoint")
@ApiOperation(value = "浣撴棰勭害淇敼鎺ュ彛")
+ @Transactional
public AjaxResult tjReappoint(@RequestBody TjReservation tjReservation) {
TjReservation reservation = tjReservationService.getById(tjReservation.getId());
@@ -462,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("鎿嶄綔澶辫触");
@@ -539,7 +546,7 @@
reservation.setProIds(Joiner.on(",").join(proIds));
reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
reservation.setCompanyId(dwGrouping.getDwId());
- reservation.setCompany(dwGrouping.getDwName());
+ reservation.setCompany(dwGrouping.getDwDeptName());
reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
reservation.setPacId(dwDept.getId());
// if(dwGrouping.getPayType().equals("1")){
@@ -554,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());
--
Gitblit v1.8.0