编号

zzw

2023-11-20 a59e33b38560655b279cebfe85e3b62a6b8b0514

编号

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java

@@ -17,22 +17,25 @@
    @Autowired
    private SysDictTypeService sysDictTypeService;

    public String getShowDictList(String values, String DictTYpe, Boolean enter) {
        List<DictDto> userDicts = sysDictTypeService.getUserDicts();
        DictDto testType1Dict = userDicts.stream()
                .filter(c -> c.getDictType().equals(DictTYpe))
                .collect(Collectors.toList()).get(0);
        values = "," + values + ",";
    public String getShowDictList(Object paramValues, String DictTYpe, Boolean enter) {
        String result = "";
        int i = 0;
        for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
            String value = dictItemDto.getDictValue();
            String desc = (values.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
            i++;
            if (enter && i < ((DictLeafDto) testType1Dict).getDataList().size()) {
                desc = desc + "\r\n";
        if (paramValues != null) {
            List<DictDto> userDicts = sysDictTypeService.getUserDicts();
            DictDto testType1Dict = userDicts.stream()
                    .filter(c -> c.getDictType().equals(DictTYpe))
                    .collect(Collectors.toList()).get(0);

            String values = "," + paramValues.toString() + ",";
            int i = 0;
            for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
                String value = dictItemDto.getDictValue();
                String desc = (values.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
                i++;
                if (enter && i < ((DictLeafDto) testType1Dict).getDataList().size()) {
                    desc = desc + "\r\n";
                }
                result = result + desc;
            }
            result = result + desc;
        }
        return result;
    }

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java

@@ -223,7 +223,7 @@
            dataObj.getSoftwareTestOrder().setTestType22(testType22);

            //通用字典列表字符串生成
            String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level", false);
            String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel(), "critical_level", false);
            dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);

            for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
@@ -241,7 +241,7 @@
            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
            dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);

            String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level", false);
            String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel(), "test_level", false);
            dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);

            String test = dataObj.getSoftwareTestOrder().getOtherRequire();