Merge remote-tracking branch 'origin/master'

吴羡

4 天以前 eaadf887aca9cfc7ae11646179be50f3efc4f44d

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

@@ -1,6 +1,6 @@
package com.ruoyi.process.service.impl;

import cn.hutool.core.bean.BeanUtil;
import  cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -243,6 +243,13 @@
        processMethodVerifyMethodFileService.remove(Wrappers.<ProcessMethodVerifyMethodFile>lambdaQuery()
                .eq(ProcessMethodVerifyMethodFile::getMethodVerifyId, methodVerifyId));

        // 删除所有上岗证
        processMethodVerifyWorkFileService.remove(Wrappers.<ProcessMethodVerifyWorkFile>lambdaQuery()
                .eq(ProcessMethodVerifyWorkFile::getMethodVerifyId, methodVerifyId));

        // 删除所有校准证书
        processMethodVerifyCalibrationsFileService.remove(Wrappers.<ProcessMethodVerifyCalibrationsFile>lambdaQuery()
                .eq(ProcessMethodVerifyCalibrationsFile::getMethodVerifyId, methodVerifyId));

        baseMapper.deleteById(methodVerifyId);

@@ -526,9 +533,24 @@
        }
        // 确认日期
        processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")): null);
        // 评审意见
        processMethodVerifyExportWordDto.setReviewResultStr(buildOpinionCheckBox(processMethodVerify.getReviewResult()));
        processMethodVerifyExportWordDto.setReviewDateStr(processMethodVerify.getReviewDate() != null ? processMethodVerify.getReviewDate().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")): null);
        // 审批意见
        processMethodVerifyExportWordDto.setApprovalResultStr(buildOpinionCheckBox(processMethodVerify.getApprovalResult()));
        processMethodVerifyExportWordDto.setApprovalDateStr(processMethodVerify.getApprovalDate() != null ? processMethodVerify.getApprovalDate().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")): null);
        return processMethodVerifyExportWordDto;
    }

    /**
     * 拼接"同意使用/不能使用/限制使用"勾选项展示串
     */
    private String buildOpinionCheckBox(String result) {
        return ("同意使用".equals(result) ? "☑" : "□") + "同意使用　"
                + ("不能使用".equals(result) ? "☑" : "□") + "不能使用　"
                + ("限制使用".equals(result) ? "☑" : "□") + "限制使用";
    }


    /**
     * 添加上岗证