From ec266a0440669bb6b9830991770fa5b0a7568fdf Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 13 十二月 2024 15:44:55 +0800
Subject: [PATCH] 20241213
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 10 ++-
ltkj-admin/pom.xml | 11 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 36 ++++++++---
ltkj-admin/src/test/java/zwxTest.java | 61 ++++++++------------
5 files changed, 75 insertions(+), 53 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 7b29229..52c77da 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -266,6 +266,17 @@
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-jar-plugin</artifactId>-->
+<!-- <version>3.2.0</version>-->
+<!-- <configuration>-->
+<!-- <excludes>-->
+<!-- <!– 鎺掗櫎 Font 鏂囦欢澶� –>-->
+<!-- <exclude>**/Font/**</exclude>-->
+<!-- </excludes>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 77f58aa..c019590 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -856,7 +856,7 @@
return AjaxResult.success();
}
- public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate) throws Exception {
+ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
pdfPage = 0;
DictHosp dictHosp = dictHospService.list().get(0);
String color = sysConfigService.selectConfigByKey("report_title_color");
@@ -1343,15 +1343,23 @@
cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
tableQz.addCell(cell);
+
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
cell.setPaddingTop(10);
cell.setPaddingBottom(10);
- cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
-// cell.setPhrase(new Phrase(tjOrder.getCheckDoctor(), zongJianFont));
- tableQz.addCell(cell);
+ if (zongJianYiShiQianMing == null) {
+ cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
+ tableQz.addCell(cell);
+ }else {
+ byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
+ Image image = Image.getInstance(bytes);
+ image.scaleToFit(100, 100);
+ cell.addElement(image);
+ tableQz.addCell(cell);
+ }
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
@@ -1424,9 +1432,7 @@
// 棣栭〉琛ㄥ崟
String tjNumber = tjOrder.getTjNumber();
String template = tjReportTemplate.getTemplate();
- LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
- DictComp dictComp = dictCompService.getOne(wq111);
+
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
@@ -1461,10 +1467,18 @@
tjtype = "涓汉";
hashMap.put("tjtype", tjtype);
}
- if (dictComp == null) {
- hashMap.put("work", "鏃�");
- } else {
- hashMap.put("work", dictComp.getCnName());
+ if (StrUtil.isNotBlank(customer.getCompName())){
+ hashMap.put("work", customer.getCompName());
+ }else {
+ LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+ wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+ DictComp dictComp = dictCompService.getOne(wq111);
+
+ if (dictComp == null) {
+ hashMap.put("work", "鏃�");
+ } else {
+ hashMap.put("work", dictComp.getCnName());
+ }
}
hashMap.put("sex", sex);
hashMap.put("tjnumber", tjNumber);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 27d2a91..81a60ad 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2599,8 +2599,12 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, byId.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag,"4");
+ wrapper.eq(TjReportTemplate::getOpen,"1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
try {
- shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate);
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate,zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
byId.setReportTime(date);
byId.setPrintLastTime(date);
@@ -2627,10 +2631,10 @@
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
- AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
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 7d02495..fafa724 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
@@ -392,8 +392,12 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag,"4");
+ wrapper.eq(TjReportTemplate::getOpen,"1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
try {
- return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
+ return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error(String.valueOf(e));
@@ -409,13 +413,13 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
AjaxResult ajaxResult = null;
try {
// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
// ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
- ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
+ ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
e.printStackTrace();
log.error(String.valueOf(e));
diff --git a/ltkj-admin/src/test/java/zwxTest.java b/ltkj-admin/src/test/java/zwxTest.java
index 32844d9..006c827 100644
--- a/ltkj-admin/src/test/java/zwxTest.java
+++ b/ltkj-admin/src/test/java/zwxTest.java
@@ -6,6 +6,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.LtkjApplication;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.DictUserInfo;
@@ -72,6 +73,9 @@
return id;
}
+ /**
+ * 淇敼鎶ュ憡
+ */
@Test
public void uploadPdf(){
String base64String = PDFBinaryUtil.getPDFBinary("E:\\鏂囨。\\鎶ュ憡浣撴妯℃澘new - 棣栭〉.pdf");
@@ -82,43 +86,28 @@
reportTemplateService.updateById(template);
}
- /**
- * 璋冪敤鐢熸垚鎶ュ憡
- */
@Test
- public void savePdf(){
- String tjNumber = "8002241205080905";
- LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
- TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-
- LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(queryWrapper);
-
- LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
- TjCustomer tjCustomer = customerService.getOne(wq1);
-
- try {
- hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
- } catch (Exception e) {
- log.error(String.valueOf(e));
- }
+ public void uploadzjysqm() throws IOException {
+ File file = new File("d:\\Users\\w\\Desktop\\鎬绘鍖诲笀绛惧悕\\ysqm.png");
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] bytes = new byte[(int) file.length()];
+ fileInputStream.read(bytes);
+ String string = Base64.getEncoder().encodeToString(bytes);
+ LambdaUpdateWrapper<TjReportTemplate> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.set(TjReportTemplate::getOpen,0);
+ wrapper.eq(TjReportTemplate::getFlag,4);
+ reportTemplateService.update(wrapper);
+ TjReportTemplate template = new TjReportTemplate();
+ template.setReportTemId(IdUtil.getSnowflake().nextId());
+ template.setTemplate(string);
+ template.setCreateTime(new Date());
+ template.setCreateBy("瓒呯骇绠＄悊鍛�");
+ template.setDeleted(0);
+ template.setFlag("4");
+ template.setName("鎬绘鍖诲笀绛惧悕");
+ template.setRemark("鍥剧墖蹇呴』涓篜S涓敾甯冨ぇ灏忎负300*140 PNG閫忔槑鍥�");
+ template.setOpen("1");
+ reportTemplateService.save(template);
}
- public static void main(String[] args) {
- String str = " (1) 鍙岃偩杈撳翱绠¤唨鑳盉瓒咃細\n" +
- " 鑲濊剰銆佽儐鍥娿�佽儼鑵恒�佽劸鑴忓０鍍忓浘鎵�瑙佹湭瑙佹槑鏄惧紓甯竆n" +
- " 鍙岃偩銆佽緭灏跨澹板儚鍥炬湭瑙佹槑鏄惧紓甯竆n" +
- " \n" +
- " \n" +
- " \n" +
- " ";
-
- str = str.replaceAll("[\\n\\r]+$", ""); // 鍘婚櫎鏈熬鐨勬崲琛岀
- str = str.replaceAll("\\s+$", ""); // 鍘婚櫎鏈熬鐨勭┖鏍�
- System.out.println(str);
- }
}
--
Gitblit v1.8.0