修改

jinlin

2024-01-15 1a7af6fff5185bb257c16b0445140c93263a3331

 modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java

@@ -3,6 +3,8 @@
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.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.baselineRelease.dto.BaselineDto;
@@ -22,6 +24,7 @@
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.SysUserService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,9 +72,11 @@
    @Autowired
    private  QaAuditReportIncongruentService incongruentService;


    @Autowired
    private WorkflowService workflowService;

    @Autowired
    private SysUserService sysUserService;
    /**
     * 分页查询
     *
@@ -79,9 +84,12 @@
     * @return
     */
    public List<QaAuditReport> page(QueryFilter queryFilter) {
        User user = UserContext.getUser();
        Integer secretClass = user.getSecretClass();
        queryFilter.getQueryParams().put("secretClass",secretClass);
        List<QaAuditReport> list = baseDao.getList(queryFilter.getQueryParams());
        if (list != null && list.size() > 0) {
            workflowService.getRunFlow(list, "pzbgsh");
            workflowService.getRunFlow(list, "qashbg");
            sysOssService.setListOsses(list, "qa_audit_report");
        }
        return list;
@@ -98,6 +106,11 @@

    public QaAuditReportDto getDto(Long projectId, Long reportId) {
        QaAuditReportDto data = new QaAuditReportDto();
        Map<String, String> map = new HashMap<>();
        map.put("contract", "合同评审阶段");
        map.put("require", "测试需求分析与策划阶段");
        map.put("execute", "测试设计、实现与执行阶段");
        map.put("summary", "测试总结阶段");
        if (reportId != null) {
            data.setId(reportId);
            QaAuditReport auditReport = this.get(reportId);
@@ -112,6 +125,10 @@
            data.setAuditReport(auditReport);
            List<QaAuditReportIncongruent> incongruentList = incongruentService.createList(projectId);
            data.setIncongruentList(incongruentList);
        }
        for (QaAuditReportIncongruent incongruent : data.getIncongruentList()) {
            String type = map.get(incongruent.getDiscoveryPhase());
            incongruent.setDiscoveryPhase(type);
        }
        if (projectId != null) {
            data.setProjectId(projectId);
@@ -164,6 +181,12 @@
        try {
            QaAuditReportDto dataObj = this.getDto(null, id);

            String projectLeaderId=dataObj.getProject().getProjectLeader();
            String projectConfigerId=dataObj.getProject().getProjectTesters();
            String projectTestersId=dataObj.getProject().getProjectConfiger();
            dataObj.getProject().setProjectLeader(sysUserService.getNames(projectLeaderId));
            dataObj.getProject().setProjectTesters(sysUserService.getNames(projectTestersId));
            dataObj.getProject().setProjectConfiger(sysUserService.getNames(projectConfigerId));
            String CheckerPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getCheckerId()));
            dataObj.getAuditReport().setChecker(CheckerPath);
            String SupervisorPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getSupervisorId()));