From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 28 +++++++++++++++++++++++++++-
cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java | 2 +-
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java | 4 ++--
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java | 3 +++
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 4 ++--
5 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index fb79222..d684093 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -60,8 +60,8 @@
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
@GetMapping("/exportProcessReport")
- public Result exportProcessReport(ProcessReportDto processReportDto) {
- return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
+ public Result exportProcessReport() {
+ return Result.success(processReportService.exportProcessReport());
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
index 9324d5d..fe76ddc 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
@@ -79,4 +79,7 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
index 610444e..b885e1d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
@@ -20,5 +20,5 @@
IPage<ProcessReport> pageProcessReport(Page page, ProcessReport processReport);
- String exportProcessReport(List<Integer> ids);
+ String exportProcessReport();
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index 526aa38..733c7b6 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -19,8 +19,10 @@
import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.pojo.InspectionOrder;
import com.ruoyi.process.pojo.InspectionOrderDetail;
+import com.ruoyi.process.pojo.ProcessReport;
import com.ruoyi.process.service.InspectionOrderDetailService;
import com.ruoyi.process.service.InspectionOrderService;
+import com.ruoyi.process.service.ProcessReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,6 +39,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
@@ -61,6 +64,8 @@
private InsReportService insReportService;
@Value("${wordUrl}")
private String wordUrl;
+ @Resource
+ private ProcessReportService processReportService;
/**
@@ -117,7 +122,23 @@
}
inspectionOrderDetailService.saveBatch(inspectionOrder.getOrderDetailList());
}
-
+ //鏂板7.8鎶ュ憡缁撴灉
+ ProcessReport processReport = new ProcessReport();
+ processReport.setInspectionOrderId(inspectionOrder.getInsOrderId());
+ processReport.setInsReportCode(inspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
+ //椤垫暟
+ try {
+ com.aspose.words.Document doc = new com.aspose.words.Document(path);
+ processReport.setPages(doc.getPageCount()+"");
+ } catch (Exception e) {
+ }
+ processReport.setNumber("1");//鍙戦�佷唤鏁伴粯璁�1
+ processReport.setSend(inspectionOrder.getCommissionUnit());//鍙戝線浣曞=濮旀墭鍗曚綅
+ processReport.setMethod(inspectionOrder.getSend()==1?"鑷彇":"鍏朵粬");//鍙戦�佹柟寮�
+ processReport.setSendTime(insReport.getRatifyTime().toLocalDate());//鍙戦�佹棩鏈�
+ processReport.setSendUser(64);//鍙戦�佷汉鍥哄畾
+ processReport.setSignatory(inspectionOrder.getCommissionUser());//绛炬敹浜�=濮旀墭浜�
+ processReportService.save(processReport);
return true;
}
@@ -140,6 +161,11 @@
}
inspectionOrderDetailService.saveBatch(InspectionOrder.getOrderDetailList());
+ //淇敼7.9鎶ュ憡缁撴灉
+ ProcessReport processReport = processReportService.getOne(Wrappers.<ProcessReport>lambdaQuery().eq(ProcessReport::getInspectionOrderId, InspectionOrder.getInspectionOrderId()));
+ processReport.setInsReportCode(InspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
+ processReportService.updateById(processReport);
+
return true;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
index 7a45959..df3defe 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
@@ -74,8 +74,8 @@
}
@Override
- public String exportProcessReport(List<Integer> ids) {
- List<ProcessReport> processReports = processReportMapper.getIds(ids);
+ public String exportProcessReport() {
+ List<ProcessReport> processReports = processReportMapper.selectList(null);
for (ProcessReport processReport : processReports) {
List<String> name = new ArrayList<>();
for (String s : processReport.getSignatory().split(",")) {
--
Gitblit v1.9.3