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/TjOrderController.java | 67 +--------------------------------
1 files changed, 3 insertions(+), 64 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();
--
Gitblit v1.8.0