From 63333d13194c8ec8fedb13db1c2b84734d8ead46 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 17 四月 2025 14:31:51 +0800 Subject: [PATCH] 7.8报告结果完成 --- cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) 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; } -- Gitblit v1.9.3