From 1e91dc33009cfdc951b2642877f40280b51c3089 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 15:17:01 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 49 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 1295071..297605a 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
@@ -39,6 +39,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
@@ -106,24 +107,29 @@
private IDictHospService dictHospService;
@Autowired
private ITjReportPrintService printService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
- reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
- TjReportTemplate tem = new TjReportTemplate();
- tem.setName("浣撴鎶ュ憡妯℃澘5");
- tem.setRemark("浣撴鎶ュ憡妯℃澘5");
- tem.setTemplate(base64String);
- tem.setFlag("1");
- tem.setOpen("0");
- tem.setCreateTime(DateUtil.date());
- final boolean save = reportTemplateService.save(tem);
- if (save) {
- return AjaxResult.success("淇濆瓨鎴愬姛");
+ if(StringUtil.isNotBlank(base64String)){
+ reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
+ TjReportTemplate tem = new TjReportTemplate();
+ tem.setName("浣撴鎶ュ憡妯℃澘5");
+ tem.setRemark("浣撴鎶ュ憡妯℃澘5");
+ tem.setTemplate(base64String);
+ tem.setFlag("1");
+ tem.setOpen("0");
+ tem.setCreateTime(DateUtil.date());
+ final boolean save = reportTemplateService.save(tem);
+ if (save) {
+ return AjaxResult.success("淇濆瓨鎴愬姛");
+ }
}
+
return AjaxResult.success("淇濆瓨澶辫触");
// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�1.pdf");
// TjReport tem2 = new TjReport();
@@ -383,19 +389,19 @@
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);
+// 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);
@@ -414,7 +420,7 @@
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
- logger.error("鐢熸垚鎶ュ憡寮傚父");
+ logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -1709,7 +1715,7 @@
we.eq(TjReport::getType, "浣撴鎶ュ憡");
TjReport one = tjReportService.getOne(we);
if (one == null) {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡");
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
}
if ("pdf".equals(one.getPrint())) {
res.put("flag", "0");
@@ -1719,7 +1725,7 @@
res.put("url", one.getPath());
return AjaxResult.success(res);
} else {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡");
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
}
}
@@ -2133,20 +2139,8 @@
@GetMapping("/revocationReport/{TjNumber}")
@ApiOperation(value = "鎾ら攢鐢熸垚浣撴鎶ュ憡")
+ @Transactional
public AjaxResult revocationReport(@PathVariable("TjNumber") String tjNumber) {
- //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
- QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
- wq1.select("re_id");
- wq1.eq("tj_number", tjNumber);
- wq1.eq("type", "浣撴鎶ュ憡");
- TjReport tjReport = tjReportService.getOne(wq1);
- if (null != tjReport) {
- // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
- int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
- if (i == 0) {
- return AjaxResult.error("鎾ゅ洖澶辫触锛�");
- }
- }
TjOrder one = tjOrderService.getOrderByTjNum(tjNumber);
if(null !=one){
@@ -2167,10 +2161,25 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
+
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
+ wq1.select("re_id");
+ wq1.eq("tj_number", tjNumber);
+ wq1.eq("type", "浣撴鎶ュ憡");
+ TjReport tjReport = tjReportService.getOne(wq1);
+ if (null != tjReport) {
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
+ if (i == 0) {
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
+ }
+ }
+
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
- return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ return AjaxResult.error("璇ヤ汉鍛樹綋妫�璁板綍涓嶅瓨鍦�,璇锋牳瀹炰汉鍛樹俊鎭�!");
}
@@ -2220,8 +2229,8 @@
LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrder::getFirmId, firmId);
wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
- wq2.eq(TjOrder::getTjType, "1");
- wq2.in(TjOrder::getStatus, 401, 402);
+ wq2.ne(TjOrder::getTjType, "2");
+// wq2.in(TjOrder::getStatus, 401, 402);
final List<TjOrder> list = tjOrderService.list(wq2);
for (TjOrder tjOrder : list) {
@@ -2580,16 +2589,14 @@
@GetMapping("/tuanDuiYiChangBySex")
@ApiOperation(value = "鐢熸垚鍥㈤槦浣撴鎶ュ憡鈥斺�旂敺濂冲紓甯哥粨鏋滅粺璁�")
- public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId) {
+ public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String dwname) {
Map<String, List<Map<String, Object>>> all = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrder::getFirmId, firmId);
- wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
- wq2.eq(TjOrder::getTjType, "1");
- wq2.in(TjOrder::getStatus, 401, 402);
+ wq2.eq(TjOrder::getFirmName,dwname);
+ wq2.ne(TjOrder::getTjType, "2");
+// wq2.in(TjOrder::getStatus, 401, 402);
final List<TjOrder> list = tjOrderService.list(wq2);
List<String> tjNumberList = list.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
--
Gitblit v1.8.0