修改

jinlin

2024-01-31 9025b9cf7ec8610003d445a31d93e35e7bd73c2e

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

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

import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
import com.zt.core.context.User;
import com.zt.core.context.UserContext;
import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
@@ -14,20 +17,24 @@
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.qaAuditReport.model.QaAuditReportIncongruent;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.apache.tomcat.util.bcel.classfile.Constant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

import javax.naming.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@@ -71,11 +78,19 @@
     * @return
     */
    public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
        User user = UserContext.getUser();
        Integer secretClass = user.getSecretClass();
        Long deptId = user.getDeptId();
        queryFilter.getQueryParams().put("secretClass",secretClass);
        queryFilter.getQueryParams().put("deptId",deptId);
        List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
        if (list != null && list.size() > 0) {
            sysOssService.setListOsses(list, "test_order");
        }
        return list;
    }
    public String selectOrderId(Long projectId) {
        return baseDao.selectOrderId(projectId);
    }


@@ -94,12 +109,11 @@
        if (softwareTestOrderId != null)
            baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
        else {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
            String year = sdf.format(new Date());
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "software_test_order");
            map.put("year",year);
            softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
            map.put("projectId",softwareTestOrderDto.getProjectId().toString());
          /*  DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            softwareTestOrderDto.getSoftwareTestOrder().getEntrustSignDate();*/
            softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
            softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -109,7 +123,10 @@
        for (SoftwareTestOrderMeasured softwareTestOrderMeasured : softwareTestOrderDto.getMeasuredList()) {
            softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
            if (softwareTestOrderMeasured.getId() != null) {
                softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
                SoftwareTestOrderMeasured Measured = softwareTestOrderMeasuredService.get(softwareTestOrderMeasured.getId());
                    if (CommonUtils.isActureChangeData(softwareTestOrderMeasured,Measured)) {
                        softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
                    }
            } else {
                softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
                softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
@@ -155,14 +172,12 @@
        } else {
            Project project = projectService.get(projectId);
            String projectCode = project.getCode();
            String softName =project.getSoftwareName();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
            List<?> measuredList = testItemResult;
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
            String softIdentity =project.getSoftwareIdentity();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) testItemResult);

            List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode,null);
            List<?> deliverableList = productLibraryResult;
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) productLibraryResult);
        }

        if (projectId != null) {
@@ -234,6 +249,9 @@
                measured.setIsMeasuredStr(isMeasuredStr);
            }

            String secretClass = getShowDictList.getShowDictList(dataObj.getProject().getSecretClass(), "secret_class", false);
            dataObj.getSoftwareTestOrder().setSecretClassStr(secretClass);

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

@@ -247,7 +265,7 @@
            dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);

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

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