From 6d493697ae4bf63c0ce72034e1f1b703081b436f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 25 十二月 2024 12:08:36 +0800
Subject: [PATCH] 完成截止12.25测试出来的问题
---
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 20 ++--
inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper1.java | 2
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotalSampleServiceImpl.java | 3
cnas-process/src/main/resources/static/sample-receive.docx | 0
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java | 18 ----
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordAuditServiceImpl.java | 18 ----
cnas-manage/src/main/resources/static/cancel-deal.docx | 0
cnas-manage/src/main/resources/static/recycle-deal.docx | 0
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java | 18 ----
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java | 3
cnas-manage/src/main/resources/static/audit-deal.docx | 0
cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java | 9 -
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessComplainServiceImpl.java | 6 -
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsTotalServiceImpl.java | 18 ----
cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml | 4
cnas-manage/src/main/resources/static/check-deal.docx | 0
cnas-manage/src/main/resources/static/intervals-deal.docx | 0
cnas-manage/src/main/resources/static/verify-deal.docx | 0
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCheckServiceImpl.java | 18 ----
cnas-process/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 5
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java | 17 ---
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsServiceImpl.java | 18 ----
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCancelServiceImpl.java | 18 ----
cnas-process/src/main/resources/static/sample-deal.docx | 0
25 files changed, 36 insertions(+), 162 deletions(-)
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordAuditServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordAuditServiceImpl.java
index 78432bf..2a93c4f 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordAuditServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordAuditServiceImpl.java
@@ -150,18 +150,7 @@
record.setCreateUserDepart(limsName);
}
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/audit-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/audit-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -530,15 +519,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("audit", tableRenderData);
- table.put("index1", index1);
auditList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("cancelList", auditList);
}});
String name = UUID.randomUUID() + "_鏂囦欢淇琛�" + ".docx";
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCancelServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCancelServiceImpl.java
index fe5b50e..ec8e2d9 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCancelServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCancelServiceImpl.java
@@ -85,18 +85,7 @@
public String exportOutManageRecordCancel(ManageRecordCancel manageRecordCancel, HttpServletResponse response) {
List<ManageRecordCancel> manageRecordCancelList = manageRecordCancelMapper.pageManageRecordCancel(new Page(-1, -1), QueryWrappers.queryWrappers(manageRecordCancel)).getRecords();
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/cancel-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/cancel-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -360,15 +349,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("cancel", tableRenderData);
- table.put("index1", index1);
cancelList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("cancelList", cancelList);
}});
String name = UUID.randomUUID() + "_鏂囦欢閿�姣佺敵璇疯〃" + ".docx";
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCheckServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCheckServiceImpl.java
index dd370a3..f2c1a6c 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordCheckServiceImpl.java
@@ -94,18 +94,7 @@
public String exportOutManageRecordCheck(ManageRecordCheck manageRecordCheck, HttpServletResponse response) {
List<ManageRecordCheck> manageRecordCheckList = manageRecordCheckMapper.pageManageRecordCheck(new Page(-1, -1), QueryWrappers.queryWrappers(manageRecordCheck)).getRecords();
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/check-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/check-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -349,15 +338,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("check", tableRenderData);
- table.put("index1", index1);
checkList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("checkList", checkList);
}});
String name = UUID.randomUUID() + "_鏂囦欢瀹℃壒璁板綍" + ".docx";
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsServiceImpl.java
index 70ea942..d1ac683 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsServiceImpl.java
@@ -68,18 +68,7 @@
public String exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response) {
List<ManageRecordIntervals> manageRecordIntervalsList = manageRecordIntervalsMapper.pageManageRecordIntervals(new Page(-1, -1), QueryWrappers.queryWrappers(manageRecordIntervals)).getRecords();
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/intervals-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/intervals-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -295,15 +284,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("intervals", tableRenderData);
- table.put("index1", index1);
intervalsList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("intervalsList", intervalsList);
}});
String name = UUID.randomUUID() + "_鏂囦欢瀹氭湡瀹℃煡璁板綍琛�" + ".docx";
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsTotalServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsTotalServiceImpl.java
index f287332..0e0bf2f 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIntervalsTotalServiceImpl.java
@@ -121,18 +121,7 @@
List<ManageRecordIntervals> manageRecordIntervalsList = manageRecordIntervalsMapper.selectList(Wrappers.<ManageRecordIntervals>lambdaQuery().eq(ManageRecordIntervals::getRecordIntervalsTotalId,id));
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/intervals-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/intervals-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -348,15 +337,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("intervals", tableRenderData);
- table.put("index1", index1);
intervalsList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("intervalsList", intervalsList);
put("submitDate", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("submitDateEn", monthNames[LocalDate.now().getMonthValue() - 1] + " " + LocalDate.now().getDayOfMonth() + ", " + LocalDate.now().getYear());
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
index 741324f..9cbf7d4 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
@@ -467,15 +467,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("recycle", tableRenderData);
- table.put("index1", index1);
recycleList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("recycleList", recycleList);
}});
String name = UUID.randomUUID() + "_鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�" + ".docx";
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
index 70756d1..5b3fafb 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
@@ -123,18 +123,7 @@
private String recordTotaldeal(Integer id,String signatureUrl){
List<ManageRecordVerify> manageRecordVerifies = manageRecordVerifyMapper.selectList(Wrappers.<ManageRecordVerify>lambdaQuery().eq(ManageRecordVerify::getManageRecordTotalId,id));
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/verify-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/verify-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
@@ -366,16 +355,13 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("verify", tableRenderData);
- table.put("index1", index1);
verifyList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("verifyList", verifyList);
- put("size", finalIndex);
put("submitDate", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("submitDateEn", monthNames[LocalDate.now().getMonthValue() - 1] + " " + LocalDate.now().getDayOfMonth() + ", " + LocalDate.now().getYear());
put("ratifyDate", "{{ratifyDate}}");
diff --git a/cnas-manage/src/main/resources/static/audit-deal.docx b/cnas-manage/src/main/resources/static/audit-deal.docx
index 5f10163..f63c83f 100644
--- a/cnas-manage/src/main/resources/static/audit-deal.docx
+++ b/cnas-manage/src/main/resources/static/audit-deal.docx
Binary files differ
diff --git a/cnas-manage/src/main/resources/static/cancel-deal.docx b/cnas-manage/src/main/resources/static/cancel-deal.docx
index fee34ad..4cdd219 100644
--- a/cnas-manage/src/main/resources/static/cancel-deal.docx
+++ b/cnas-manage/src/main/resources/static/cancel-deal.docx
Binary files differ
diff --git a/cnas-manage/src/main/resources/static/check-deal.docx b/cnas-manage/src/main/resources/static/check-deal.docx
index 20a6735..d6453b1 100644
--- a/cnas-manage/src/main/resources/static/check-deal.docx
+++ b/cnas-manage/src/main/resources/static/check-deal.docx
Binary files differ
diff --git a/cnas-manage/src/main/resources/static/intervals-deal.docx b/cnas-manage/src/main/resources/static/intervals-deal.docx
index 4cb9c58..659c6e5 100644
--- a/cnas-manage/src/main/resources/static/intervals-deal.docx
+++ b/cnas-manage/src/main/resources/static/intervals-deal.docx
Binary files differ
diff --git a/cnas-manage/src/main/resources/static/recycle-deal.docx b/cnas-manage/src/main/resources/static/recycle-deal.docx
index bc57eb3..c7e9ed1 100644
--- a/cnas-manage/src/main/resources/static/recycle-deal.docx
+++ b/cnas-manage/src/main/resources/static/recycle-deal.docx
Binary files differ
diff --git a/cnas-manage/src/main/resources/static/verify-deal.docx b/cnas-manage/src/main/resources/static/verify-deal.docx
index f7929c2..3048699 100644
--- a/cnas-manage/src/main/resources/static/verify-deal.docx
+++ b/cnas-manage/src/main/resources/static/verify-deal.docx
Binary files differ
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java b/cnas-process/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
index 43352c6..43be703 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.ProcessReport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -21,5 +22,5 @@
IPage<ProcessReport> pageProcessReport(Page page, @Param("ew") QueryWrapper<ProcessReport> queryWrappers);
- List<ProcessReport> getIds(List<Integer> ids);
+ List<ProcessReport> getIds(@Param("ids") List<Integer> ids);
}
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java b/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java
index 4e1cff8..2721630 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java
@@ -48,13 +48,8 @@
private String complainName;
@ApiModelProperty("澶栭敭鍏宠仈(妫�娴嬫姤鍛奿d)")
- @ExcelIgnore
- private Integer insReportId;
-
- @ExcelIgnore
- @TableField(select = false,exist = false)
- //鐢ㄦ潵鏂板浼犲弬鐨勬姤鍛婄紪鍙�
- private String code;
+ @ExcelProperty(value = "妫�娴嬫姤鍛婄紪鍙�")
+ private String insReport;
@ApiModelProperty("鏍峰搧缂栧彿")
@ExcelIgnore
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessComplainServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessComplainServiceImpl.java
index b2a3387..8d7ace9 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessComplainServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessComplainServiceImpl.java
@@ -73,12 +73,6 @@
@Override
public int addProcessComplain(ProcessComplain processComplain) {
- //鍒ゆ柇鎶ュ憡缂栧彿鍜屾牱鍝佺紪鍙锋槸鍚﹀瓨鍦�
- InsReport insReport = insReportMapper.selectOne(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getCode, processComplain.getCode()));
- if (ObjectUtils.isEmpty(insReport)) throw new ErrorException("鎶ュ憡缂栧彿杈撳叆鏈夎");
- processComplain.setInsReportId(insReport.getId());
- InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, processComplain.getSampleCode()));
- if (ObjectUtils.isEmpty(insSample)) throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
//鎶曡瘔缂栧彿鐢熸垚
String giveCode = this.giveCode.giveCode("JCZX-", "cnas_process_complain", "", "yyMMdd");
processComplain.setComplainNo(giveCode);
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
index be47fbe..cb7b12c 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
@@ -94,18 +94,7 @@
processReport.setSignatoryName(signatoryName);
}
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -377,13 +366,11 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("report", tableRenderData);
- table.put("index1", index1);
reportList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("reportList", reportList);
}});
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotalSampleServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotalSampleServiceImpl.java
index b8d278f..fc51874 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotalSampleServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotalSampleServiceImpl.java
@@ -371,16 +371,13 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("sample", tableRenderData);
- table.put("index1", index1);
sampleList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("sampleList", sampleList);
- put("size", finalIndex);
put("examineUrl", null);
put("ratifyUrl", null);
put("writeUrl", new FilePictureRenderData(100,50,imgUrl + "/" + signatureUrl));
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java
index e346c64..474425c 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java
@@ -128,18 +128,7 @@
//鐢熸垚鏍峰搧澶勭悊琛╳ord
private String processTotaldeal(Integer id,String signatureUrl){
List<ProcessDeal> processDeals = processDealMapper.selectList(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getTotaldealId,id));
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -351,16 +340,13 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("sample", tableRenderData);
- table.put("index1", index1);
sampleList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("sampleList", sampleList);
- put("size", finalIndex);
put("examineUrl", null);
put("ratifyUrl", null);
put("writeUrl", new FilePictureRenderData(100,50,imgUrl + "/" + signatureUrl));
diff --git a/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml b/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
index 2906809..2456122 100644
--- a/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
@@ -6,7 +6,7 @@
<id column="id" property="id"/>
<result column="complain_no" property="complainNo"/>
<result column="complain_name" property="complainName"/>
- <result column="ins_report_id" property="insReportId"/>
+ <result column="ins_report" property="insReport"/>
<result column="sample_code" property="sampleCode"/>
<result column="create_user" property="createUser"/>
<result column="complainant" property="complainant"/>
@@ -40,7 +40,6 @@
</select>
<select id="getProcessComplain" resultType="com.yuanchu.mom.dto.ProcessComplainDto">
select cpc.*,
- ir.code,
u1.name complainant,
u1.phone,
u1.email,
@@ -56,7 +55,6 @@
left join user u4 on cpc.cause_analysis_user = u4.id
left join user u5 on cpc.corrective_action_user = u5.id
left join user u6 on cpc.corrective_action_confirmation_user = u6.id
- left join ins_report ir on cpc.ins_report_id = ir.id
where cpc.id=#{id}
</select>
</mapper>
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 3209130..9a09a28 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -18,15 +18,7 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
</resultMap>
- <select id="pageProcessReport" resultType="com.yuanchu.mom.pojo.ProcessReport">
- select * from (select cpr.* ,
- u1.name sendUserName
- from cnas_process_report cpr
- left join user u1 on send_user=u1.id )A
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
+
<select id="getIds" resultType="com.yuanchu.mom.pojo.ProcessReport">
select cpr.* ,
u1.name sendUserName
@@ -38,4 +30,14 @@
#{id}
</foreach>
</select>
+
+ <select id="pageProcessReport" resultType="com.yuanchu.mom.pojo.ProcessReport">
+ select * from (select cpr.* ,
+ u1.name sendUserName
+ from cnas_process_report cpr
+ left join user u1 on send_user=u1.id )A
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
</mapper>
diff --git a/cnas-process/src/main/resources/static/sample-deal.docx b/cnas-process/src/main/resources/static/sample-deal.docx
index 9021b0a..dbe32c8 100644
--- a/cnas-process/src/main/resources/static/sample-deal.docx
+++ b/cnas-process/src/main/resources/static/sample-deal.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/sample-receive.docx b/cnas-process/src/main/resources/static/sample-receive.docx
index 1035f1c..9bd2c1a 100644
--- a/cnas-process/src/main/resources/static/sample-receive.docx
+++ b/cnas-process/src/main/resources/static/sample-receive.docx
Binary files differ
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper1.java
similarity index 79%
rename from inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
rename to inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper1.java
index c797907..64a99d9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper1.java
@@ -11,6 +11,6 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-05 08:58:39
*/
-public interface ProcessReportMapper extends BaseMapper<ProcessReport> {
+public interface ProcessReportMapper1 extends BaseMapper<ProcessReport> {
}
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 dbb5e93..ca5212b 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
@@ -41,6 +41,7 @@
import org.apache.logging.log4j.util.Strings;
import org.apache.poi.xwpf.usermodel.*;
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
@@ -85,8 +86,8 @@
@Resource
private InsReportMapper insReportMapper;
- @Resource
- ProcessReportMapper processReportMapper;
+ @Autowired
+ ProcessReportMapper1 processReportMapper;
@Value("${wordUrl}")
private String wordUrl;
--
Gitblit v1.9.3