Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-17 f67aa8b146f0fa901ce4ae183be511d8615cde77

Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

 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());
    }

}

 cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java

@@ -79,4 +79,7 @@

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("委托单id")
    private Integer inspectionOrderId;
}

 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();
}

 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;
    }


 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(",")) {