Changes

jinlin

2023-11-16 0fe6ffac952b2c19bc96e5543ac10672389af508

Changes

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

New file
@@ -0,0 +1,34 @@
package com.zt.life.modules.mainPart.utils;

import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class GetShowDictList {
    @Autowired
    private  SysDictTypeService sysDictTypeService;

    public  String getShowDictList(String values, String DictTYpe) {
        List<DictDto> userDicts = sysDictTypeService.getUserDicts();
        DictDto testType1Dict = userDicts.stream()
                .filter(c -> c.getDictType().equals(DictTYpe))
                .collect(Collectors.toList()).get(0);
        values = "," + values + ",";
        String result = "";
        for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
            String value = dictItemDto.getDictValue();
            String desc = (values.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
            result = result + desc;
        }
        return result;
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java

@@ -222,4 +222,39 @@
    @ApiModelProperty(value = "测试类型2第2列")
    List<HashMap<String, Object>> testType22;

    @TableField(exist = false)
    @ApiModelProperty(value = "关键等级字符串")
    String criticalLevelStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "是否被测件字符串")
    String isMeasuredStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "软件类型字符串")
    String sortwareTypeStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "测试依据字符串")
    String testBasisStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "测试相关标准字符串")
    String testStandardStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "测试级别字符串")
    String testLevelStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "其他要求字符串")
    String otherRequireStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "物品性质字符串")
    String articleNatureStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "样品状态字符串")
    String sampleStatusStr;
}

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

@@ -1,10 +1,12 @@
package com.zt.life.modules.project.service;

import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
@@ -38,7 +40,6 @@
 */
@Service
public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {

    @Autowired
    private ProjectService projectService;
    @Autowired
@@ -54,6 +55,8 @@
    private SysDictTypeService sysDictTypeService;
    @Autowired
    private WordFileService wordFileService;
    @Autowired
    private GetShowDictList getShowDictList;

    /**
     * 分页查询
@@ -138,11 +141,11 @@
        } else {
            Project project = projectService.get(projectId);
            String projectCode = project.getCode();
            List<?> testItemResult = baseDao.dictList("testItem_type",projectCode);
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode);
            List<?> measuredList = testItemResult;
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);

            List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
            List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode);
            List<?> deliverableList = productLibraryResult;
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
        }
@@ -161,7 +164,7 @@
    public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
        try {
            SoftwareTestOrderDto dataObj = this.getDto(null, id);

            //特殊列表生成
            List<DictDto> userDicts = sysDictTypeService.getUserDicts();
            DictDto testType1Dict = userDicts.stream()
                    .filter(c -> c.getDictType().equals("test_type1"))
@@ -172,13 +175,14 @@
            List<HashMap<String, Object>> testType21 = new ArrayList<>();
            List<HashMap<String, Object>> testType22 = new ArrayList<>();


            int i = 0;
            String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ",";
            for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
                String value = dictItemDto.getDictValue();
                String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
                HashMap<String, Object> stateItem = new HashMap<>();
                stateItem.put("item",desc);
                stateItem.put("item", desc);
                if ((i++) % 2 == 0) {
                    testType12.add(stateItem);
                } else {
@@ -192,7 +196,7 @@
                String value = dictItemDto.getDictValue();
                String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
                HashMap<String, Object> stateItem = new HashMap<>();
                stateItem.put("item",desc);
                stateItem.put("item", desc);
                if ((i++) % 2 == 0) {
                    testType22.add(stateItem);
                } else {
@@ -205,9 +209,35 @@
            dataObj.getSoftwareTestOrder().setTestType21(testType21);
            dataObj.getSoftwareTestOrder().setTestType22(testType22);

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


            String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(),"software_type");
            dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);

            String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(),"test_basis");
            dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);

            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(),"test_standard");
            dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);

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

            String otherRequireStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getOtherRequire(),"other_require");
            dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);

            String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(),"article_nature");
            dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);

            String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(),"sample_status");
            dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);

            WordFile wordFile = new WordFile();
            wordFile.setModulePath("测试委托单.docx");
            wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_测试委托单.docx");
            wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_测试委托单.docx");
            wordFileService.exportWordFile(request, dataObj, wordFile, response);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();