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

zss

2024-12-26 0e96251ba40dec171d92f99a2ec482f692bdf1ab

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

@@ -303,6 +303,9 @@
            // 将人员签名对象添加到集合中
            pictureRenderDataList.add(finalUserSignatureUrl);
        }
        while (pictureRenderDataList.size() < 5) {
            pictureRenderDataList.add(null);
        }

        // 获取设备信息
        List<ProcessMethodVerifyMachineAttachment> processMethodVerifyMachineAttachmentList = processMethodVerifyMachineAttachmentService.list(Wrappers.<ProcessMethodVerifyMachineAttachment>lambdaQuery()
@@ -317,6 +320,11 @@
                new HashMap<String, Object>() {{
                    put("processMethodVerify", exportWordTemplate);
                    put("processMethodVerifyMachineAttachmentList", processMethodVerifyMachineAttachmentList);
                    put("affirmUserUrl1",pictureRenderDataList.get(0));
                    put("affirmUserUrl2",pictureRenderDataList.get(1));
                    put("affirmUserUrl3",pictureRenderDataList.get(2));
                    put("affirmUserUrl4",pictureRenderDataList.get(3));
                    put("affirmUserUrl5",pictureRenderDataList.get(4));
                }});

        // 处理换行问题
@@ -347,7 +355,7 @@
        // （料）是否满足
        processMethodVerifyExportWordDto.setMaterialIsSatisfiedStr(processMethodVerify.getMaterialIsSatisfied() == 1 ? "√" : "×");
        // （法）是否满足
        processMethodVerifyExportWordDto.setMethodIsSatisfiedStr(processMethodVerify.getMethodIsSatisfied() == 1? "√" : "×");
        processMethodVerifyExportWordDto.setMethodIsSatisfiedStr(processMethodVerify.getMethodIsSatisfied() == 1 ? "√" : "×");
        // （环）是否满足
        processMethodVerifyExportWordDto.setEnvironmentIsSatisfiedStr(processMethodVerify.getEnvironmentIsSatisfied() == 1 ? "√" : "×");
        // （测量溯源性）是否满足
@@ -357,7 +365,7 @@
        // （其他）是否满足
        processMethodVerifyExportWordDto.setOtherIsSatisfiedStr(processMethodVerify.getOtherIsSatisfied() == 1 ? "√" : "×");
        // 确认日期
        processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")): null);
        processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) : null);
        return processMethodVerifyExportWordDto;
    }