完成截止12.25测试出来的问题

zss

2024-12-25 6d493697ae4bf63c0ce72034e1f1b703081b436f

完成截止12.25测试出来的问题

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

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

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

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

 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);
        }
        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å¹´MM月dd日")));
                    put("submitDateEn", monthNames[LocalDate.now().getMonthValue() - 1] + " " + LocalDate.now().getDayOfMonth() + ", " + LocalDate.now().getYear());

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

 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);
        }
        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å¹´MM月dd日")));
                    put("submitDateEn", monthNames[LocalDate.now().getMonthValue() - 1] + " " + LocalDate.now().getDayOfMonth() + ", " + LocalDate.now().getYear());
                    put("ratifyDate", "{{ratifyDate}}");

 cnas-manage/src/main/resources/static/audit-deal.docx

Binary files differ

 cnas-manage/src/main/resources/static/cancel-deal.docx

Binary files differ

 cnas-manage/src/main/resources/static/check-deal.docx

Binary files differ

 cnas-manage/src/main/resources/static/intervals-deal.docx

Binary files differ

 cnas-manage/src/main/resources/static/recycle-deal.docx

Binary files differ

 cnas-manage/src/main/resources/static/verify-deal.docx

Binary files differ

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

 cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessComplain.java

@@ -48,13 +48,8 @@
    private String complainName;

    @ApiModelProperty("外键关联(检测报告id)")
    @ExcelIgnore
    private Integer insReportId;

    @ExcelIgnore
    @TableField(select = false,exist = false)
    //用来新增传参的报告编号
    private String code;
    @ExcelProperty(value = "检测报告编号")
    private String insReport;

    @ApiModelProperty("样品编号")
    @ExcelIgnore

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

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

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

 cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessTotaldealServiceImpl.java

@@ -128,18 +128,7 @@
    //生成样品处理表word
    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);
        }
        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));

 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>

 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>

 cnas-process/src/main/resources/static/sample-deal.docx

Binary files differ

 cnas-process/src/main/resources/static/sample-receive.docx

Binary files differ

 inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper1.java

ÎļþÃû´Ó inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.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> {

}

 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;