From aacaa3d2daafbd97ab008908b9f2fe9ed6c1f713 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 四月 2025 17:17:42 +0800
Subject: [PATCH] pdf生成增加失败撤回
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 87 ++-----------------------------------------
1 files changed, 5 insertions(+), 82 deletions(-)
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 7890dfa..682e9a1 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
@@ -284,35 +284,8 @@
@GetMapping("/toPdf/{TjNumber}")
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
- @Transactional
+// @Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
- // AjaxResult error = null;
- // 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
-// System.out.println("----------------------------------oldFun寮�濮�-------------------------------------------------------");
-// error = oldFun(tjNumber);
-// System.out.println("--------------------------------------缁撴潫---------------------------------------------------");
- // 鎾ら攢鎿嶄綔
-// revocationReport(tjNumber);
-// 鏍规嵁鏌愪汉tj鍙蜂互鍙奝roId杩涜鎵撳嵃鍓嶇殑璇锋眰
-// tjCheckController.getTjdetailList(tjNumber,null,1);
-// List<UpdateOrderRemarkVo> updateOrderRemarkVos = new ArrayList<>();
-// UpdateOrderRemarkVo remarkVo = new UpdateOrderRemarkVo();
-// remarkVo.setRemarks("鏈寮傚父");
-// remarkVo.setTjNumber("02132240308102232");
-// remarkVo.setProId("1633660948860522555");
-// updateOrderRemarkVos.add(remarkVo);
-// tjCheckController.checkUpdateOrderRemark(updateOrderRemarkVos);
-// System.out.println("---------------------------------------newFun寮�濮�--------------------------------------------------");
- // 浠ュ墠娴嬭瘯pdf鏂规硶
-// error = newFun(tjNumber);
-// System.out.println("-------------------------------------------缁撴潫----------------------------------------------");
- // 鎾ら攢
-// revocationReport(tjNumber);
-// if (error != null) {
-// return error;
-// }
-// return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
-
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
@@ -333,11 +306,6 @@
wqa.eq(TjReport::getType, "浣撴鎶ュ憡");
Integer count = tjReportService.getSelectCount(wqa);
if (tjOrder.getReportTime() !=null || count != 0 ) {
-// tjOrder.setReportTime(null);
-// tjOrder.setCheckTime(null);
-// tjOrder.setCheckStatus(0);
-// tjOrder.setPrintLastTime(null);
-// tjOrderService.updateById(tjOrder);
return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�");
}
@@ -345,32 +313,6 @@
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-// if (tjOrder.getTjCategory() != null) {
-// //鏌ヨ瀛楀吀
-// LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(SysDictData::getDictType, "dict_tjtype");
-// wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory());
-// SysDictData one = dictDataService.getOne(wqq);
-// if (one != null) {
-// //鏌ヨ瀛楀吀
-// LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>();
-// wqq1.eq(SysDictData::getDictType, "report_template_type");
-// wqq1.eq(SysDictData::getDictLabel, one.getDictLabel());
-// SysDictData one1 = dictDataService.getOne(wqq1);
-// if (one1 != null) {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue());
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
-// }
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
-// }
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
-// reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
-// reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
-// }
Integer checkStatus = tjOrder.getCheckStatus();
if (checkStatus == 1) {
if ("鎶ヨ〃".equals(reportTemplate.getPrint())) {
@@ -384,25 +326,10 @@
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
updateWrapper.set(TjOrder::getReportTime, new Date());
-// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
}
-// String hisRegistrationId = tjOrder.getCardId();
-// Date createTime = tjOrder.getCreateTime();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String ksrq = dateFormat.format(createTime);
-// String jsrq = dateFormat.format(new Date());
-// HashMap<String, Object> params = new HashMap<>();
-// params.put("his_registration_id", hisRegistrationId);
-// params.put("ksbm", "");
-// params.put("pationid", "");
-// params.put("ksrq", ksrq);
-// params.put("jsrq", jsrq);
-// params.put("pagecount", 100);
-// params.put("page", 1);
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -413,15 +340,12 @@
try {
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error(String.valueOf(e));
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
-
- logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -431,16 +355,15 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
AjaxResult ajaxResult = null;
try {
ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- e.printStackTrace();
- log.error(String.valueOf(e));
+ throw new Exception(e);
}
if (!ajaxResult.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
} else {
Long userId = tjCustomer.getCusId();
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
--
Gitblit v1.8.0