From e8c5fd71396e1e30d2b99e66b67e6e815ac677fd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 23 五月 2025 17:03:03 +0800
Subject: [PATCH] zjh20250523
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 4 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictComp.java | 8 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 49 ++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java | 8 ++++
8 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
index 4e42584..6c008c6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
@@ -52,6 +52,14 @@
return AjaxResult.success(dictCompService.list());
}
+ @GetMapping("/getZybCompList")
+ @ApiOperation(value = "鑾峰彇鑱屼笟鐥呭崟浣嶄俊鎭泦鍚堟帴鍙�")
+ public AjaxResult getZybCompList() {
+ LambdaQueryWrapper<DictComp> wq = new LambdaQueryWrapper<>();
+ wq.eq(DictComp::getDwlx,"1");
+ return AjaxResult.success(dictCompService.list(wq));
+ }
+
/**
* 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
*/
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 b83e6c2..672f962 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
@@ -713,4 +713,53 @@
+
+
+
+ @GetMapping("/getProListByBwwh")
+ @ApiOperation(value = "鏌ヨ閮ㄤ綅瀵瑰簲椤圭洰鎴栨湭瀵瑰簲閮ㄤ綅鐨勯」鐩�")
+ public AjaxResult getProListByBwwh(@ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false) String bw) {
+ try {
+ List<TjProject> projectList =tjProjectService.getProListByBwwh(bw);
+ return AjaxResult.success(projectList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @GetMapping("/delProByBbwwh")
+ @ApiOperation(value = "鍒犻櫎椤圭洰瀵瑰簲閮ㄤ綅")
+ @Transactional
+ public AjaxResult delProByBbwwh(@ApiParam(value = "椤圭洰ID")@RequestParam(required = false) String proId) {
+ try {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setCheckBw(null);
+ tjProjectService.updateById(tjProject);
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PostMapping("/updateProByBwwh")
+ @ApiOperation(value = "淇敼鎵�閫夐」鐩殑閮ㄤ綅")
+ @Transactional
+ public AjaxResult updateProByBwwh(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+ @ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false)String bw) {
+ try {
+ if(null != proIds && !proIds.isEmpty()){
+ for (String proId : proIds) {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setCheckBw(bw);
+ tjProjectService.updateById(tjProject);
+ }
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictComp.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictComp.java
index 72161d2..6ac136f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictComp.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictComp.java
@@ -226,6 +226,14 @@
@Excel(name = "浜旂瑪绠�鐮�")
private String wbm;
+ private String dwlx;
+ private String ssdq;
+ private String lsgx;
+ private String jjlx;
+ private String qygm;
+ private String hyfl;
+ private String fxpg;
+
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index 96ea156..1d1d966 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -235,6 +235,7 @@
private String specimenType;
@ApiModelProperty(value = "妫�鏌ラ儴浣�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String checkBw;
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 15fa84b..8284ed0 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
@@ -81,8 +81,8 @@
* 鍑虹敓鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ExcelExport(value = "鍑虹敓鏃ユ湡",sort =6)
- @ExcelImport("鍑虹敓鏃ユ湡")
+// @ExcelExport(value = "鍑虹敓鏃ユ湡",sort =6)
+// @ExcelImport("鍑虹敓鏃ユ湡")
@Excel(name = "鍑虹敓鏃ユ湡",sort = 6,dateFormat = "yyyy/MM/dd")
@ApiModelProperty("鍑虹敓鏃ユ湡")
private Date birthday;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 6543088..6720d5a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -203,4 +203,8 @@
@Select("call getProListByBblx(#{bblx,mode=IN}) ")
List<TjProject> getProListByBblx(@Param(value ="bblx")String bblx);
+
+ @Select("call getProListByBwwh(#{bw,mode=IN}) ")
+ List<TjProject> getProListByBwwh(String bw);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 3748692..bde7d45 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -144,4 +144,6 @@
void zdysqlxg(String sql);
List<TjProject> getProListByBblx(String bblx);
+
+ List<TjProject> getProListByBwwh(String bw);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index f2a1502..2660873 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -352,4 +352,9 @@
return tjProjectMapper.getProListByBblx(bblx);
}
+ @Override
+ public List<TjProject> getProListByBwwh(String bw) {
+ return tjProjectMapper.getProListByBwwh(bw);
+ }
+
}
--
Gitblit v1.8.0