From 228af2c61a61c9ff32271ecd533cabf52fd1bb1a Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 29 二月 2024 11:37:10 +0800
Subject: [PATCH] 报告打印和预览判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 47 +++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReportTemplate.java | 18 ++------
ltkj-hosp/src/main/resources/mapper/hosp/TjReportMapper.xml | 6 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReport.java | 3 +
ltkj-hosp/src/main/resources/mapper/hosp/TjReportTemplateMapper.xml | 10 ++++
5 files changed, 69 insertions(+), 15 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 39a1433..5c90bd6 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
@@ -297,6 +297,9 @@
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
}
+
+
+
String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
@@ -315,6 +318,25 @@
Integer checkStatus = tjOrder.getCheckStatus();
if (checkStatus == 1) {
+ //鍒ゆ柇鎶ュ憡鐢熸垚 淇濆瓨绫诲瀷 2024/2/29
+ if ("鎶ヨ〃".equals(reportTemplate.getPrint())){
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(reportTemplate.getUrl()+"?tjNum="+tjNumber);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("鎶ヨ〃");
+ tjReportService.save(tjReport);
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ 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("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
+ }
+
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -678,6 +700,7 @@
String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
tjReportService.save(tjReport);
//FileUtil.del(value + "\\" + tjNumber + "浣撴鎶ュ憡.pdf");
@@ -878,6 +901,29 @@
}
+ @GetMapping("/isPdfOrJimu")
+ @ApiOperation(value = "鍒ゆ柇鎶ュ憡鎵撳紑绫诲瀷")
+ public AjaxResult isPdfOrJimu(String tjNumber) {
+ Map<String,String> res=new HashMap<>();
+ LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
+ we.eq(TjReport::getTjNumber, tjNumber);
+ we.eq(TjReport::getType, "浣撴鎶ュ憡");
+ TjReport one = tjReportService.getOne(we);
+ if ("pdf".equals(one.getPrint())){
+ res.put("flag","0");
+ return AjaxResult.success(res);
+ }else if ("鎶ヨ〃".equals(one.getPrint())){
+ res.put("flag","1");
+ res.put("url",one.getPath());
+ return AjaxResult.success(res);
+ }else {
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡");
+ }
+
+ }
+
+
+
@GetMapping("/preview/{flag}/{TjNumber}")
@ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
@@ -907,6 +953,7 @@
if (one == null) {
return;
}
+
String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReport.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReport.java
index 9867053..1804444 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReport.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReport.java
@@ -59,6 +59,9 @@
private String type;
+ private String print;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReportTemplate.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReportTemplate.java
index 9a31ed7..f2b4dda 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReportTemplate.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReportTemplate.java
@@ -63,17 +63,9 @@
private String open;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("reportTemId", getReportTemId())
- .append("template", getTemplate())
- .append("createTime", getCreateTime())
- .append("createBy", getCreateBy())
- .append("updateTime", getUpdateTime())
- .append("updateBy", getUpdateBy())
- .append("deleted", getDeleted())
- .append("path", getFlag())
- .toString();
- }
+
+ private String print;
+ private String url;
+
+
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReportMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReportMapper.xml
index 180514a..0c18083 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReportMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReportMapper.xml
@@ -9,6 +9,7 @@
<result property="report" column="report"/>
<result property="tjNumber" column="tj_number"/>
<result property="path" column="path"/>
+ <result property="print" column="print"/>
</resultMap>
<sql id="selectTjReportVo">
@@ -35,11 +36,13 @@
<if test="report != null">report,</if>
<if test="tjNumber != null">tj_number,</if>
<if test="path != null">path,</if>
+ <if test="print != null">print,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="report != null">#{report},</if>
<if test="tjNumber != null">#{tjNumber},</if>
<if test="path != null">#{path},</if>
+ <if test="print != null">#{print},</if>
</trim>
</insert>
@@ -49,6 +52,7 @@
<if test="report != null">report = #{report},</if>
<if test="tjNumber != null">tj_number = #{tjNumber},</if>
<if test="path != null">path = #{path},</if>
+ <if test="print != null">print = #{print},</if>
</trim>
where re_id = #{reId}
</update>
@@ -65,4 +69,4 @@
#{reId}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReportTemplateMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReportTemplateMapper.xml
index b4508ff..fea8bb8 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReportTemplateMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReportTemplateMapper.xml
@@ -16,6 +16,8 @@
<result property="name" column="name"/>
<result property="remark" column="remark"/>
<result property="open" column="open"/>
+ <result property="print" column="print"/>
+ <result property="url" column="url"/>
</resultMap>
<sql id="selectTjReportTemplateVo">
@@ -29,7 +31,7 @@
flag,
name,
remark,
- open
+ open,print,url
from tj_report_template
</sql>
@@ -59,6 +61,8 @@
<if test="name != null">name,</if>
<if test="remark != null">remark,</if>
<if test="open != null">open,</if>
+ <if test="print != null">print,</if>
+ <if test="url != null">url,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="reportTemId != null">#{reportTemId},</if>
@@ -72,6 +76,8 @@
<if test="name != null">#{name},</if>
<if test="remark != null">#{remark},</if>
<if test="open != null">#{open},</if>
+ <if test="print != null">#{print},</if>
+ <if test="url != null">#{url},</if>
</trim>
</insert>
@@ -88,6 +94,8 @@
<if test="name != null">name = #{name},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="open != null">open = #{open},</if>
+ <if test="print != null">print = #{print},</if>
+ <if test="url != null">url = #{url},</if>
</trim>
where report_tem_id = #{reportTemId}
</update>
--
Gitblit v1.8.0