From 8f8c019d9b4013a5b71ffd5c0c2f88b0d1a386aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 03 六月 2025 16:56:00 +0800
Subject: [PATCH] zjh20250603
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java | 4 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 12 ++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 8 ++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 4 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java | 5 +++++
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java | 2 ++
9 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 85b02f9..232b3b4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1933,4 +1933,12 @@
}
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {
+
+ List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
+ return AjaxResult.success(list);
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index a5ca9fe..1abfb5a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -794,6 +794,10 @@
if(StringUtil.isNotBlank(bz)){
tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
+ for (TjBzPro bzPro : list) {
+ TjProject tjProject = tjProjectService.getById(bzPro.getProId());
+ if(null != tjProject)bzPro.setProName(tjProject.getProName());
+ }
return AjaxResult.success(list);
}else {
List<TjProject> list = tjProjectService.selectTjProjectListByBz();
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 03b1e22..2f874d3 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
@@ -178,7 +178,8 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
- tjReservation.setIsExpire(2);
+// tjReservation.setIsExpire(2);
+ if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
// if(null !=list && list.size()>0){
// for (TjReservation reservation : list) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java
index 90bd2a2..7e77210 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java
@@ -45,4 +45,8 @@
@ApiModelProperty(value = "鐥呯ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long bzId;
+
+
+ @TableField(exist = false)
+ private String proName;
}
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 8284ed0..ed64ac4 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
@@ -436,6 +436,18 @@
private String zhiyeZysszdw;
+ @ApiModelProperty("棰勭害鏃堕棿寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yykssj;
+
+
+ @ApiModelProperty("棰勭害鏃堕棿缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yyjssj;
+
+
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
index 84e7cb9..6544cd3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
@@ -23,4 +23,7 @@
@Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNumber}")
List<TjOrderYcxm> selectListByTjh(String tjNumber);
+
+ @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
+ List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
index 0b89b95..fd64221 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -17,4 +17,6 @@
void delOrderYcXmJyByTjh(String tjh);
List<TjOrderYcxm> selectListByTjh(String tjNumber);
+
+ List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
index 2f96343..39bd671 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -31,4 +31,9 @@
public List<TjOrderYcxm> selectListByTjh(String tjNumber) {
return mapper.selectListByTjh(tjNumber);
}
+
+ @Override
+ public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
+ return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index 44256ba..630c7fa 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -86,7 +86,7 @@
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
<if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId} </if>
- <if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if>
+ <if test="yykssj != null and yyjssj != null ">and reservation_time BETWEEN #{yykssj} and #{yyjssj} </if>
<if test="isExpire != null ">and is_expire = #{isExpire}</if>
<if test="szd != null ">and szd = #{szd}</if>
and deleted = '0'
--
Gitblit v1.8.0