From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index d4fda5e..c4ec1cf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -19,7 +19,9 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,8 +76,8 @@
private IDictCompService compService;
@Resource
private ITjReportTemplateService reportTemplateService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
@@ -84,6 +86,8 @@
private LtkjExamJcbgdService jcbgdService;
@Resource
private LtkjExamJcsqdService jcsqdService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -281,9 +285,13 @@
if (jyjgval.compareTo(min) < 0) {
// jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
jyjg = jyjg + " 鈫�";
+ hybgd.setYcbz("1");
} else if (jyjgval.compareTo(max) > 0) {
// jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
jyjg = jyjg + " 鈫�";
+ hybgd.setYcbz("1");
+ }else {
+ hybgd.setYcbz("0");
}
hybgd.setJyjg(jyjg);
} catch (Exception ignored) {}
@@ -334,7 +342,7 @@
@GetMapping("/getShenGaoTiZhong")
@ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
- Map<String, Object> objectMap = new HashMap<>();
+// Map<String, Object> objectMap = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getCheckStatus, 1);
@@ -343,7 +351,7 @@
return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
}
- List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
+ List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
// if(null !=maps && maps.size()>0){
// for (Map<String, Object> map : maps) {
// if (map.get("") == null) {
@@ -373,7 +381,7 @@
// }
// }
// }
-
+ log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
return AjaxResult.success(maps);
}
@@ -420,7 +428,7 @@
wq1.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = orderService.getOne(wq1);
-
+ String value = configService.selectConfigByKey("path_filePath");
LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = customerService.getOne(wq2);
@@ -437,9 +445,9 @@
final String substring = uuid.toString().substring(0, 5);
// String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
--
Gitblit v1.8.0