From d8ba960d180c0ad08b7dfb5a17e7ad351ca2eb62 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 30 十月 2024 11:00:36 +0800
Subject: [PATCH] 报告转pdf格式错误异常解决
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 1 -
cnas-server/src/main/resources/mapper/CertificationMapper.xml | 17 +++++++++--------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 18 ------------------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 5 +++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 4 ++--
user-server/src/main/resources/mapper/UserMapper.xml | 1 -
6 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/CertificationMapper.xml b/cnas-server/src/main/resources/mapper/CertificationMapper.xml
index a532113..3fe21bb 100644
--- a/cnas-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/cnas-server/src/main/resources/mapper/CertificationMapper.xml
@@ -3,17 +3,18 @@
<mapper namespace="com.yuanchu.mom.mapper.CertificationMapper">
<select id="getCertificationDetail" resultType="com.yuanchu.mom.pojo.Certification">
select b.*
- from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
- (SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
- MAX(date_of_issuance) AS latest_issuance_date,
- c.`code`,c.organization,c.explanation
- FROM
- certification c
+ from ( select a.`name`,
+ a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
+ (SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
+ MAX(date_of_issuance) AS latest_issuance_date,
+ c.`code`,c.organization,c.explanation
+ FROM
+ certification c
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- GROUP BY
- name) a left join certification c on a.id=c.id
+ GROUP BY
+ name) a left join certification c on a.id=c.id
) b
</select>
</mapper>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 4eceab2..697c993 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1113,7 +1113,7 @@
info.setJumpPath("b1-inspect-order-plan");
informationNotificationService.addInformationNotification(info);
//todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
- /* HashMap<String, Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
String account = userMapper.selectById(userId).getAccount();
map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
map.put("toparty", "");//鎺ユ敹閮ㄩ棬id
@@ -1126,7 +1126,7 @@
map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
- qywxApi.send(map);*/
+ qywxApi.send(map);
// }
//澶嶆牳浜�--妫�楠屽崟鐩稿叧璐熻矗浜�
InsSampleUser insSampleUser = new InsSampleUser();
@@ -1138,6 +1138,7 @@
/*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ //todo 鐢佃矾绔欑偣鎶ュ憡 姝ｅ紡搴撻儴缃叉斁寮�
// try {
// wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
// } catch (Exception e) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index e3c51c2..ab6fc59 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -330,7 +330,7 @@
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
insOrder.setSendTime(LocalDateTime.now());
/*todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss*/
- /*if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
+ if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
String account = userMapper.selectById(order.getIssueUser()).getAccount();
HashMap<String, Object> map = new HashMap<>();
map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
@@ -343,7 +343,7 @@
map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
qywxApi.send(map);
- }*/
+ }
}
return insOrderMapper.updateById(insOrder);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index bbbfaaf..6bb76f0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -101,9 +101,6 @@
private InsOrderMapper insOrderMapper;
@Resource
- private StandardMethodListMapper standardMethodListMapper;
-
- @Resource
private InsOrderStateMapper insOrderStateMapper;
@Resource
@@ -491,25 +488,10 @@
os = new FileOutputStream(file);
//瑕佽浆鎹㈢殑word鏂囦欢
com.aspose.words.Document doc = new com.aspose.words.Document(wordPath);
- TableCollection tables = doc.getFirstSection().getBody().getTables();
- for (Table table : tables) {
- RowCollection rows = table.getRows();
- table.setAllowAutoFit(false);
- for (Row row : rows) {
- CellCollection cells = row.getCells();
- for (Cell cell : cells) {
- CellFormat cellFormat = cell.getCellFormat();
- cellFormat.setFitText(false); //璁剧疆鑷�傚簲鍏抽棴
- cellFormat.setWrapText(true); // 璁剧疆鑷姩鎹㈣
- }
- }
- }
- doc.updateFields();
doc.save(os, SaveFormat.PDF);
//娣诲姞楠戠紳绔�
stamperCheckMarkPDF(pdfPath.replace(".pdf", "-1.pdf"), pdfPath, imgUrl + "/" + sealUrl);
-
} catch (Exception e) {
e.printStackTrace();
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 598498c..e2323bb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -3745,7 +3745,6 @@
} else {
table.getRow(row).getCell(i).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.CONTINUE);
}
-
}
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 2dee8aa..d2da4a7 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -46,7 +46,6 @@
</select>
<select id="getUser" resultType="com.yuanchu.mom.pojo.User">
select * from user where state = 1
- # where depart_lims_id=FIND_IN_SET(depart_lims_id, (select GROUP_CONCAT(id SEPARATOR ',') from department_lims where department_lims.name like '%瀹為獙瀹�'))
</select>
<select id="selectDepartLims" resultType="java.lang.String">
select name from department_lims
--
Gitblit v1.9.3