From 5d26355c3c630ffc26be575f5ed52b1b2cae46e4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 三月 2025 19:42:07 +0800
Subject: [PATCH] zjh20250307
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 23 +++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 ++--
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 16 ++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2
10 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 4c04cea..d714603 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2989,6 +2989,8 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
&& !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+
+ TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2999,11 +3001,17 @@
tjPdfVO.setCompany("/");
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
+// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
+// wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+// .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()));
+// wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
- wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
- .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getHisXmbm()));
- wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+ wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId())
+ .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+ .or()
+ .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj);
+
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
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 5e976cf..adb4e5d 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
@@ -209,6 +209,7 @@
@ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
@ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
@ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "濂楅鍚�)") @RequestParam (required = false) String tcm,
@ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
@ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
@@ -294,7 +295,8 @@
if (name == null) name = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
+ if (tcm == null) tcm = "";
+ return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tcm));
}
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 8f32342..5d7bf70 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
@@ -550,7 +550,7 @@
wq.isNull(TjOrder::getPrintLastTime);
}
if (zt == 6) {
- //宸插嚭鎶ュ憡
+ //宸叉墦鍗�
wq.isNotNull(TjOrder::getPrintLastTime);
wq.eq(TjOrder::getHeshouStatus, 1);
wq.isNotNull(TjOrder::getPrintLastTime);
@@ -609,7 +609,7 @@
order.setZt("鎶ュ憡鏍告敹");
}
if (zt == 6) {
- order.setZt("宸插嚭鎶ュ憡");
+ order.setZt("宸叉墦鍗�");
}
} else {
if (czwj == 0) {
@@ -637,8 +637,8 @@
order.setZt("鎶ュ憡鏍告敹");
}
if (null != lastTime) {
- //宸插嚭鎶ュ憡6
- order.setZt("宸插嚭鎶ュ憡");
+ //宸叉墦鍗�6
+ order.setZt("宸叉墦鍗�");
}
}
}
@@ -3818,7 +3818,7 @@
a = 5;
}
if (null != lastTime) {
- //宸插嚭鎶ュ憡
+ //宸叉墦鍗�
a = 6;
}
map.put("tjNUm", tjNUm);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 297605a..dc8cccb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1910,6 +1910,29 @@
}
}
+
+ @GetMapping("/xiugaidayinzhuangtai")
+ @ApiOperation(value = "淇敼鎵撳嵃鐘舵�佹帴鍙�")
+ @Transactional
+ public AjaxResult xiugaidayinzhuangtai(@RequestParam String tjNumber) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ if(null !=order){
+ Date date=new Date();
+ TjReportPrint print=new TjReportPrint();
+ print.setTjNumber(tjNumber);
+ print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
+ print.setPrintTime(date);
+ print.setPrintStatus("宸叉墦鍗�");
+ if (printService.save(print)) {
+ order.setPrintLastTime(date);
+ order.setStatus(TjConstants.TJ_END);
+ tjOrderService.updateById(order);
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
/**
* 閫氳繃sql 閲嶆暣鏁版嵁妯℃澘 鍏ㄩ儴閲嶆柊鐢熸垚
*
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 b658599..86f5ca9 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
@@ -958,7 +958,7 @@
}
- reservation.setPacId(dwDept.getId());
+ reservation.setPacId(dwGrouping.getId());
compPay = compPay.add(dwGrouping.getYsPrice());
// reservation.setTjType(String.valueOf(1));
reservation.setTeamNo(teamNo);
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index c9a7b42..7e8b40d 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -110,7 +110,7 @@
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
.antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
"/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
- "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc").permitAll()
+ "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc","/system/report/xiugaidayinzhuangtai").permitAll()
.antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
.antMatchers("/check/dataSynchronizationApi","/reservation/reservation/linkage").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 2317308..e3c2e55 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -34,7 +34,7 @@
@Insert("INSERT INTO ltkj_exam_jcsqd \n" +
"SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
- "a.yxzd jgzt,a.yxbx jgbx,sysdate()\n" +
+ "a.yxzd jgzt,a.bg_nr jgbx,sysdate()\n" +
"FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
void saveLtkjExamJcsqd(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 6d78e52..4074d4c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -130,7 +130,7 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
- Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
+ Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tcm);
public int selectTjOrderByCardId(String cardId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 04bc44d..192e96a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -246,7 +246,8 @@
}
@Override
- public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus, String compId, String beginTime, String endTime, String tjname) {
+ public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize,
+ Integer checkStatus, String compId, String beginTime, String endTime, String tjname,String tcm) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
map.put("page",page);
@@ -254,6 +255,7 @@
map.put("tjNumber",tjNumber);
map.put("compId",compId);
map.put("tjname",tjname);
+ map.put("tcm",tcm);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map);
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index ec8e0e3..ff5cba0 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -351,6 +351,7 @@
#{tjname,mode=IN,jdbcType=VARCHAR},
#{beginTime,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=VARCHAR},
+ #{tcm,mode=IN,jdbcType=VARCHAR},
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
--
Gitblit v1.8.0