From 14f9208da19b7030a1c65a40897f9f4146a74d44 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 01 十一月 2024 08:37:14 +0800
Subject: [PATCH] 增加申请业务类型
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 138 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 62 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 5a847c7..d5e1209 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
@@ -271,7 +271,7 @@
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
@Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
- AjaxResult error = null;
+ // AjaxResult error = null;
// 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
// System.out.println("----------------------------------oldFun寮�濮�-------------------------------------------------------");
// error = oldFun(tjNumber);
@@ -301,48 +301,54 @@
if (num > 0) {
return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
- //鍒ゆ柇琛ㄤ腑鏈夋病鏈夎浣撴鎶ュ憡 涓嶈兘閲嶅鐢熸垚
- LambdaQueryWrapper<TjReport> wqa = new LambdaQueryWrapper<>();
- wqa.eq(TjReport::getTjNumber, tjNumber);
- wqa.eq(TjReport::getType, "浣撴鎶ュ憡");
- Integer count = tjReportService.getSelectCount(wqa);
- if (count != 0) {
- return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�");
- }
+
// String configByKey = configService.selectConfigByKey("sfkqdyhis");
String configByKey = "Y";
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(queryWrapper);
if (null != tjOrder) {
- LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
- TjReportTemplate reportTemplate = null;
- 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);
+
+ //鍒ゆ柇琛ㄤ腑鏈夋病鏈夎浣撴鎶ュ憡 涓嶈兘閲嶅鐢熸垚
+ LambdaQueryWrapper<TjReport> wqa = new LambdaQueryWrapper<>();
+ wqa.eq(TjReport::getTjNumber, tjNumber);
+ wqa.eq(TjReport::getType, "浣撴鎶ュ憡");
+ Integer count = tjReportService.getSelectCount(wqa);
+
+ if (tjOrder.getReportTime() !=null || count != 0 ) {
+ return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�");
}
+
+ LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ 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())) {
@@ -380,30 +386,7 @@
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
try {
- AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
- if (!ajaxResult.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- } else {
- Long userId = tjCustomer.getCusId();
- String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
- TjReport tjReport = new TjReport();
- tjReport.setTjNumber(String.valueOf(tjNumber));
- tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + "\\";
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
- tjReport.setType("浣撴鎶ュ憡");
- tjReport.setPrint("pdf");
- tjReportService.save(tjReport);
- 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;
+ return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
@@ -419,6 +402,37 @@
return AjaxResult.error();
}
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ if (!ajaxResult.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } else {
+ Long userId = tjCustomer.getCusId();
+ String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(urlValue + outputFileName1);
+ String outputPath1 = value + "\\";
+ String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+ tjReport.setReport(pdfBinary);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
+ tjReportService.save(tjReport);
+ Date date = new Date();
+ // LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+// updateWrapper.set(TjOrder::getReportTime, date);
+// updateWrapper.set(TjOrder::getPrintLastTime, date);
+// updateWrapper.set(TjOrder::getDownloadLastTime,date);
+// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrder.setStatus(TjConstants.TJ_END);
+ tjOrder.setReportTime(date);
+ tjOrder.setPrintLastTime(date);
+ tjOrder.setDownloadLastTime(date);
+ tjOrderService.updateById(tjOrder);
+ }
+ return ajaxResult;
+ }
/**
@@ -1492,7 +1506,7 @@
}
}
printReport.put(entry.getKey(), tjPdfVOS);
- if (tjPdfVOS.size() == 0) {
+ if (tjPdfVOS.isEmpty()) {
toRemoveKeys.add(entry.getKey());
}
}
@@ -1597,7 +1611,7 @@
LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
List<TjStandard> list2 = tjStandardService.list(wq6);
- if (list2.size() == 0) {
+ if (list2.isEmpty()) {
TjStandard s = new TjStandard();
s.setCompany(" ");
s.setTjStandardLtValue(" ");
--
Gitblit v1.8.0