From fb2ab400eb0edbc893e38c848f2f0ecac5bc75c4 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 14 九月 2023 17:54:10 +0800
Subject: [PATCH] bgh
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 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 65cb787..b9ed14a 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
@@ -221,27 +221,37 @@
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
// TODO: 2023/3/21 灏嗘ā鏉夸繚瀛樺埌鏁版嵁搴� 涓�娆′娇鐢ㄥ悗娉ㄩ噴
-// String base64String = PDFBinaryUtil.getPDFBinary("E:\\浣撴鎶ュ憡妯℃澘.pdf");
+// String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\10001浣撴鎶ュ憡灏侀潰妯℃澘1.0.pdf");
// System.out.println(base64String);
// TjReportTemplate tem = new TjReportTemplate();
+// tem.setName("浣撴鎶ュ憡妯℃澘3");
+// tem.setRemark("涓搧涓�灞�鐢靛姟鍏徃浣撴涓績");
// tem.setTemplate(base64String);
// tem.setFlag("1");
// tem.setOpen("0");
// reportTemplateService.save(tem);
- // TODO: 2023/3/21 灏嗗績鐢靛浘淇濆瓨鍒版暟鎹簱 涓�娆′娇鐢ㄥ悗娉ㄩ噴 鏆傛椂鐢ㄤ簬娴嬭瘯
-// String base64String = PDFBinaryUtil.getPDFBinary("E:\\蹇冪數鍥�.pdf");
-// System.out.println(base64String);
-// TjReport tem = new TjReport();
-// tem.setTjNumber(tjNumber);
-// tem.setReport(base64String);
-// tem.setType("蹇冪數鍥�");
-// tjReportService.save(tem);
+// // TODO: 2023/3/21 灏嗗績鐢靛浘淇濆瓨鍒版暟鎹簱 涓�娆′娇鐢ㄥ悗娉ㄩ噴 鏆傛椂鐢ㄤ簬娴嬭瘯
+// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�.pdf");
+// System.out.println(base64String2);
+// TjReport tem2 = new TjReport();
+// tem2.setTjNumber(tjNumber);
+// tem2.setReport(base64String2);
+// tem2.setType("蹇冪數鍥�");
+// tjReportService.save(tem2);
+//
+// String base64String1 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\闄勪欢1.pdf");
+// System.out.println(base64String1);
+// TjReport tem1 = new TjReport();
+// tem1.setTjNumber(tjNumber);
+// tem1.setReport(base64String1);
+// tem1.setType("闄勪欢");
+// tjReportService.save(tem1);
int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if(num >0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 2);
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
String template = one1.getTemplate();
@@ -305,20 +315,26 @@
// 濉厖鏁版嵁缁欒〃鏍�
Map<String, Object> data = new HashMap<>();
- data.put("name", tjCustomer.getCusName());
+
//濉厖鎬у埆锛氬垽鏂敺濂�
Long cusSex = tjCustomer.getCusSex();
String sex;
+ String name1;
if (cusSex == 0) {
sex = "鐢�";
+ name1=tjCustomer.getCusName()+"鍏堢敓";
} else {
sex = "濂�";
+ name1=tjCustomer.getCusName()+"濂冲＋";
}
+ data.put("name",tjCustomer.getCusName());
+ data.put("name1",name1);
data.put("sex", sex);
data.put("age", DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
data.put("tjnumber", tjNumber);
data.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
data.put("phone", tjCustomer.getCusPhone());
+ data.put("idcard", MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
if (dictComp == null) {
data.put("work", "鏃�");
} else {
@@ -328,7 +344,13 @@
if (tjOrder.getCheckAdvice() == null) {
data.put("remark", "鏃�");
} else {
- data.put("remark", "鎬绘寤鸿锛�"+tjOrder.getCheckAdvice());
+ data.put("remark", tjOrder.getCheckAdvice());
+ }
+ //灏侀潰椤典笅闈㈢殑鎬绘寤鸿鏄剧ず
+ if (tjOrder.getCheckDoctor() == null) {
+ data.put("docname", "鏃�");
+ } else {
+ data.put("docname", tjOrder.getCheckDoctor());
}
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
@@ -341,6 +363,7 @@
os.close();
reader.close();
+ //====================================浠ヤ笂灏侀潰椤碉紝浠ヤ笅璇︽儏椤�
//鏂囨。瀵硅薄 瀹炵幇A4绾搁〉闈�
Document document = new Document(PageSize.A4);
//document.setMarginMirroring(true);
@@ -493,19 +516,27 @@
pdfWriter.close();
outputStream.close();
- // TODO: 2023/3/29 鏌ヨ闄勪欢pdf 姣斿蹇冪數鍥�
- /*LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
+ // TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
+ LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
+ rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");*/
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+
+ LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
+ rtwq1.eq(TjReport::getType, "闄勪欢");
+ rtwq1.eq(TjReport::getTjNumber, tjNumber);
+ TjReport one11111 = tjReportService.getOne(rtwq1);
+ String report1 = one11111.getReport();
+ PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
//鍚堝苟
- //String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf",value + "\\" + userId + "蹇冪數鍥�.pdf"};
- String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+ String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf",value + "\\" + userId + "蹇冪數鍥�.pdf",value + "\\" + userId + "闄勪欢.pdf"};
+ //String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
String outputPath1 = value + "\\";
- String outputFileName1 = tjNumber +tjCustomer.getCusName()+ "鐨勪綋妫�鎶ュ憡.pdf";
+ String outputFileName1 = userId+tjNumber +tjCustomer.getCusName()+ "_浣撴鎶ュ憡.pdf";
File file1 = new File(outputPath1 + outputFileName1);
List<File> f = new ArrayList<>();
@@ -665,6 +696,16 @@
tjOrderService.update(updateWrapper);
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber,tjNumber);
+ TjOrder tjOrder = tjOrderService.getOne(wq1);
+
+
+ LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq2);
+
+
LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
we.eq(TjReport::getTjNumber, tjNumber);
we.eq(TjReport::getType,"浣撴鎶ュ憡");
@@ -673,9 +714,9 @@
return;
}
String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId+tjNumber + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId+tjNumber +tjCustomer.getCusName()+ "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value+ "\\" + userId+tjNumber + "_浣撴鎶ュ憡.pdf";
+ String filePath = value+ "\\" + userId+tjNumber +tjCustomer.getCusName()+ "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()){
System.out.println("鏂囦欢涓嶅瓨鍦紒");
--
Gitblit v1.8.0