[测评系统]--测评系统核心代码库
zhijie
2021-06-02 f15bdb0b902e3ea45fef229a8620fc6406abd617
SAQ支持邮箱,支持简易版
2个文件已修改
14 ■■■■ 已修改文件
src/main/java/com/ots/common/utils/poi/WordUtil.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -842,9 +842,11 @@
        changeText(document, textMap);
        //更改文本框
        if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
/*        if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
            changeTextBox(document, textMap);
        }
        }*/
        changeTextBox(document, textMap);
        //CAQ更改文本框,wzp测试.2021.4.27
/*        if (Objects.equals(reportType, ReportTypeEnum.CAQ.getCode())) {
src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java
@@ -41,6 +41,8 @@
    private String reportGenerationDate;
    private String userName;
    private ReportTypeEnum reportTypeEnum;
    //邮箱
    private String questionnaireEmail;
    
    private Map otherParams;
    
@@ -115,7 +117,10 @@
        return paramList;
    }
    private List<String> getSimpleMessageCoreIds() {
        return Arrays.asList("LIBSAQ0001", "LIBSAQ0003", "LIBSAQ0005", "LIBSAQ0007", "LIBSAQ0009", "LIBSAQ00011",
        //支持SAQ GS简易版
        return Arrays.asList("LIBSAQGS0001","LIBSAQGS0002","LIBSAQGS0005","LIBSAQGS0008","LIBSAQGS0009",
                "LIBSAQGS0011","LIBSAQGS0017","LIBSAQGS0015","LIBSAQGS8800",
                "LIBSAQ0001", "LIBSAQ0003", "LIBSAQ0005", "LIBSAQ0007", "LIBSAQ0009", "LIBSAQ00011",
                "LIBSAQ0015", "LIBSAQ0017", "LIBSAQ0162", "LIBSAQ0164", "LIBSAQ0020", "LIBSAQ0022",
                "LIBSAQ0024", "LIBSAQ0026", "LIBSAQ0030", "LIBSAQ0035", "LIBSAQ0040", "LIBSAQ0041",
                "LIBSAQ0042", "LIBSAQ0043", "LIBSAQ0050", "LIBSAQ0051", "LIBSAQ0052", "LIBSAQ0053",
@@ -186,6 +191,7 @@
        textMap.put("questionnaireID", getQuestionnaireID());
        textMap.put("reportGenerationDate", getReportGenerationDate());
        textMap.put("userName", getUserName());
        textMap.put("questionnaireEmail", getQuestionnaireEmail());
        
        getParamList(type).stream().forEach(p -> {
            TLibraryCode calculate = p.calculate(thaiCalculationMap, langType);