From e607595f8a4df7d4d577f64ae577b658bdd98c7e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 16 四月 2025 17:23:28 +0800
Subject: [PATCH] zjh20250416
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 67 ----------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java | 125 +++++++++++++++++++++++-------
4 files changed, 103 insertions(+), 97 deletions(-)
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 82e0ab3..66ee4ab 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
@@ -1674,73 +1674,12 @@
threadPools.shutdown();
}
// TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁 鎵撳嵃瀵艰瘖鍗�
+ Map<String,Object> map=new HashMap<>();
if (!tjNumbers.isEmpty()) {
- /* Map<String, Object> map = null;
- try {
- map = PDFDocumentUtil.getDocument();
- Document document = (Document) map.get("document");
-// for (int i = 0; i < tjNumbers.size(); i++) {
- int i = 0;
- for (String tjNumber : tjNumbers) {
- try {
- List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
- Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
- if(null !=userInfo && null !=djdInfos && !djdInfos.isEmpty()){
- LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
- String time = null;
- if (tjsj != null) {
- time = dateFormat.format(tjsj);
- }
- PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
- , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
- PDFDocumentUtil.makeTjInfo(document, djdInfos);
- // 澶氭潯鍒欐崲椤�
- if (i + 1 < tjNumbers.size()) {
- document.newPage();
- }
- }
-
- } catch (DocumentException | IOException e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
- TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
- tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
- remarkService.deletedOrderRemarkByTjNum(tjNumber);
- tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
-// transitionService.deletedTbTransitionByTjNum(tjNum);
- tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
-
- TjReservation reservation = tjReservationService.getById(order.getReservationId());
- if(null !=reservation){
- reservation.setIsExpire(2);
- tjReservationService.updateById(reservation);
- transitionService.updateTbTransitionByTjNum(tjNumber);
- }
- e.printStackTrace();
- }
- }
-
-// }
- document.close();
- ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
- String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
- return AjaxResult.success().put("file", encodeToString);
- } catch (IOException | DocumentException e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- e.printStackTrace();
- }*/
- Map<String,Object> map=new HashMap<>();
map.put("tjh",tjNumbers);
- return AjaxResult.success("鎿嶄綔鎴愬姛",map);
}
- if (!errTjh.isEmpty()){
- Map<String,Object> map=new HashMap<>();
- map.put("errtjh",errTjh);
- return AjaxResult.success("浠ヤ笂浜哄憳绛惧埌澶辫触",map);
- }
- return AjaxResult.error();
+ map.put("errtjh",errTjh);
+ return AjaxResult.success("鎿嶄綔鎴愬姛",map);
}
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index d45f941..9c3dfca 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -420,6 +420,10 @@
map.put("jcsj",xdtgmdjg.getJcsj());
map.put("jcjl",xdtgmdjg.getJcjl());
return AjaxResult.success(map);
+ }else {
+ TjProject tjProject = projectService.getById(proId);
+ map.put("jcsj","");
+ map.put("jcjl",tjProject.getProDefault()==null ? "":tjProject.getProDefault());
}
return AjaxResult.success(map);
}
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 c0c0e7f..04f742f 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
@@ -39,7 +39,7 @@
"`sqsj`, `jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\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.bg_nr jgbx,'0',sysdate()\n" +
- "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.lx=0 GROUP BY a.xmmc")
void saveLtkjExamJcsqd(String tjh);
@Select("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," +
@@ -64,6 +64,6 @@
"`jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\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.bg_nr jgbx,'1',sysdate()\n" +
- "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.lx=1 GROUP BY a.xmmc")
void saveLtkjExamJcsqdxdt(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
index c77c09b..9ac0d39 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
@@ -2,6 +2,7 @@
import java.io.*;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.List;
@@ -75,6 +76,8 @@
private ITjOrderRemarkService tjOrderRemarkService;
@Resource
private ITjStandardService tjStandardService;
+ @Autowired
+ private ITjReportPrintService printService;
/**
* 鏌ヨ浣撴鎶ュ憡瀛樺偍
@@ -528,40 +531,100 @@
* @param tjNumbers
* @return
*/
+// private AjaxResult sqlGetReportToMake(List<String> tjNumbers) {
+// LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
+// List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);
+// ArrayList<String> base64Pdfs = new ArrayList<>();
+// for (TjReport report : list) {
+// if (report == null || report.getReport() == null) {
+// // 娌℃湁璇ユ姤鍛� 鐩存帴璺宠繃
+// continue;
+// }
+// base64Pdfs.add(report.getReport());
+// }
+// tjNumbers.forEach(tjNumber ->{
+// LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+// tjOrderService.update(updateWrapper);
+// });
+// try {
+// byte[] mergePDF = PDFDocumentUtil.mergePDFs(base64Pdfs);
+// String s = Base64.getEncoder().encodeToString(mergePDF);
+// return AjaxResult.success().put("file",s);
+// // 鏈湴鐢熸垚娴嬭瘯
+//// String PDF_FILE = "d:\\Users\\w\\Desktop\\test.pdf";
+//// BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(PDF_FILE));
+//// outputStream.write(mergePDF);
+//// outputStream.flush();
+//// outputStream.close();
+// } catch (DocumentException | IOException e) {
+// e.printStackTrace();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return AjaxResult.error("鎵归噺鐢熸垚澶辫触");
+// }
+// }
+
private AjaxResult sqlGetReportToMake(List<String> tjNumbers) {
- LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
- List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);
+// LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
+// List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);
ArrayList<String> base64Pdfs = new ArrayList<>();
- for (TjReport report : list) {
- if (report == null || report.getReport() == null) {
- // 娌℃湁璇ユ姤鍛� 鐩存帴璺宠繃
- continue;
+// for (TjReport report : list) {
+// if (report == null || report.getReport() == null) {
+// // 娌℃湁璇ユ姤鍛� 鐩存帴璺宠繃
+// continue;
+// }
+// base64Pdfs.add(report.getReport());
+// }
+
+ //鍖哄煙鐗堜綋妫�娣诲姞闄㈠尯缂栫爜
+// String key = DataSourceContextHolder.getDataSourceKey();
+// key = key.replace("ltkjpeis10_","");
+
+ if(null !=tjNumbers && !tjNumbers.isEmpty()){
+ for (String number : tjNumbers) {
+ TjOrder order = tjOrderService.getOrderByTjNum(number);
+ TjCustomer tjCustomer = tjCustomerService.getById( order.getUserId());
+ String filePath = value + File.separator + File.separator + tjCustomer.getCusId() + order.getTjNumber() + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ try {
+ // 璇诲彇鏂囦欢涓哄瓧鑺傛暟缁�
+ Path path = Paths.get(filePath);
+ byte[] fileBytes = Files.readAllBytes(path);
+ // 灏嗗瓧鑺傛暟缁勮浆鎹负 Base64 瀛楃涓�
+ String base64String = Base64.getEncoder().encodeToString(fileBytes);
+ base64Pdfs.add(base64String);
+
+ //淇濆瓨鎵撳嵃鏁版嵁璁板綍
+ TjReportPrint print=new TjReportPrint();
+ print.setTjNumber(order.getTjNumber());
+ print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
+ print.setPrintTime(new Date());
+ print.setPrintStatus("宸叉墦鍗�");
+ if (printService.save(print)) {
+ order.setPrintLastTime(new Date());
+ order.setStatus(TjConstants.TJ_END);
+ tjOrderService.updateById(order);
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error(String.valueOf(e));
+ }
}
- base64Pdfs.add(report.getReport());
+ try {
+ byte[] mergePDF = PDFDocumentUtil.mergePDFs(base64Pdfs);
+ String s = Base64.getEncoder().encodeToString(mergePDF);
+ return AjaxResult.success().put("file",s);
+ } catch (DocumentException | IOException e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎵归噺鐢熸垚澶辫触");
+ }
}
- tjNumbers.forEach(tjNumber ->{
- LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
- updateWrapper.set(TjOrder::getPrintLastTime, new Date());
- updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
- updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
- tjOrderService.update(updateWrapper);
- });
- try {
- byte[] mergePDF = PDFDocumentUtil.mergePDFs(base64Pdfs);
- String s = Base64.getEncoder().encodeToString(mergePDF);
- return AjaxResult.success().put("file",s);
- // 鏈湴鐢熸垚娴嬭瘯
-// String PDF_FILE = "d:\\Users\\w\\Desktop\\test.pdf";
-// BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(PDF_FILE));
-// outputStream.write(mergePDF);
-// outputStream.flush();
-// outputStream.close();
- } catch (DocumentException | IOException e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎵归噺鐢熸垚澶辫触");
- }
+ return AjaxResult.error("鎵归噺鐢熸垚澶辫触");
}
}
--
Gitblit v1.8.0