变动大幅度版本

heheng

2025-05-23 761bdc5b3f17df62aae1b424f2d2dabc11e844bc

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java

@@ -44,6 +44,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;


@@ -754,9 +755,10 @@
        if (assessPlanById.getPlanSellStatus() == 1) {
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR.getCode(), "该计划尚未派发，无法辨识");
        }
        if (assessPlanById.getPlanExecStatus() != 2) {
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR.getCode(), "该计划不处在辨识阶段，无法辨识");
        }
        //20250520修改评价阶段也可以进行新增辨识
//        if (assessPlanById.getPlanExecStatus() != 2) {
//            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR.getCode(), "该计划不处在辨识阶段，无法辨识");
//        }
        if (date.isAfter(assessPlanById.getAssessEndTime())) {
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR.getCode(), "风险辨识必须在评估结束时间之前");
        }
@@ -1236,7 +1238,6 @@
        PageRequest pageParam = PageRequest.of(queryParam.getPageIndex() - 1, queryParam.getPageSize(), Sort.Direction.DESC, "updateTime");
        Page<RiskAssessPlan> pageResult = assessPlanRepository.findAll(specification, pageParam);
        long pageCount = riskPlanDataMapper.getPageCount(queryParam);
        System.out.println("pageCountpageCountpageCountpageCountpageCountpageCount:"+pageCount);


        //循环遍历结果集，封装查询结果
@@ -1332,7 +1333,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(pha.getUpdateTime());
                            for (LecQueryDTO lec : lecList) {
                                if (lec.getIdentificationId() == pha.getId()) {
                                if (Objects.equals(lec.getIdentificationId(), pha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lecMatchPha(pha, lec);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1342,10 +1343,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1359,7 +1360,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(jha.getUpdateTime());
                            for (LecQueryDTO lec : lecList) {
                                if (lec.getIdentificationId() == jha.getId()) {
                                if (Objects.equals(lec.getIdentificationId(), jha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lecMatchJha(jha, lec);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1369,10 +1370,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1386,7 +1387,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(scl.getUpdateTime());
                            for (LecQueryDTO lec : lecList) {
                                if (lec.getIdentificationId() == scl.getId()) {
                                if (Objects.equals(lec.getIdentificationId(), scl.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lecMatchScl(scl, lec);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1396,10 +1397,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1413,7 +1414,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(hazop.getUpdateTime());
                            for (LecQueryDTO lec : lecList) {
                                if (lec.getIdentificationId() == hazop.getId()) {
                                if (Objects.equals(lec.getIdentificationId(), hazop.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lecMatchHazop(hazop, lec);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1422,10 +1423,10 @@
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                                }
                                for (UserInfoDomainDTO user : userList) {
                                    if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                    if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                        assessQueryDTO.setCreateByUserName(user.getRealName());
                                    }
                                    if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                    if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                        assessQueryDTO.setUpdateByUserName(user.getRealName());
                                    }
                                }
@@ -1440,7 +1441,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(analogy.getUpdateTime());
                            for (LecQueryDTO lec : lecList) {
                                if (lec.getIdentificationId() == analogy.getId()) {
                                if (Objects.equals(lec.getIdentificationId(), analogy.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lecMatchAnalogy(analogy, lec);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1450,10 +1451,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1472,7 +1473,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(pha.getUpdateTime());
                            for (LsQueryDTO ls : lsList) {
                                if (ls.getIdentificationId() == pha.getId()) {
                                if (Objects.equals(ls.getIdentificationId(), pha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lsMatchPha(pha, ls);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1482,10 +1483,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1499,7 +1500,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(jha.getUpdateTime());
                            for (LsQueryDTO ls : lsList) {
                                if (ls.getIdentificationId() == jha.getId()) {
                                if (Objects.equals(ls.getIdentificationId(), jha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lsMatchJha(jha, ls);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1509,10 +1510,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1526,7 +1527,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(scl.getUpdateTime());
                            for (LsQueryDTO ls : lsList) {
                                if (ls.getIdentificationId() == scl.getId()) {
                                if (Objects.equals(ls.getIdentificationId(), scl.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lsMatchScl(scl, ls);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1536,10 +1537,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1553,7 +1554,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(hazop.getUpdateTime());
                            for (LsQueryDTO ls : lsList) {
                                if (ls.getIdentificationId() == hazop.getId()) {
                                if (Objects.equals(ls.getIdentificationId(), hazop.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lsMatchHazop(hazop, ls);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1563,10 +1564,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1580,7 +1581,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(analogy.getUpdateTime());
                            for (LsQueryDTO ls : lsList) {
                                if (ls.getIdentificationId() == analogy.getId()) {
                                if (Objects.equals(ls.getIdentificationId(), analogy.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.lsMatchAnalogy(analogy, ls);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1590,10 +1591,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1611,7 +1612,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(pha.getUpdateTime());
                            for (MesQueryDTO mes : mesList) {
                                if (mes.getIdentificationId() == pha.getId()) {
                                if (Objects.equals(mes.getIdentificationId(), pha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.mesMatchPha(pha, mes);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1621,10 +1622,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1638,7 +1639,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(jha.getUpdateTime());
                            for (MesQueryDTO mes : mesList) {
                                if (mes.getIdentificationId() == jha.getId()) {
                                if (Objects.equals(mes.getIdentificationId(), jha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.mesMatchJha(jha, mes);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1648,10 +1649,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1665,7 +1666,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(scl.getUpdateTime());
                            for (MesQueryDTO mes : mesList) {
                                if (mes.getIdentificationId() == scl.getId()) {
                                if (Objects.equals(mes.getIdentificationId(), scl.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.mesMatchScl(scl, mes);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1675,10 +1676,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1750,7 +1751,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(pha.getUpdateTime());
                            for (RsQueryDTO rs : rsList) {
                                if (rs.getIdentificationId() == pha.getId()) {
                                if (Objects.equals(rs.getIdentificationId(), pha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.rsMatchPha(pha, rs);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1760,10 +1761,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1777,7 +1778,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(jha.getUpdateTime());
                            for (RsQueryDTO rs : rsList) {
                                if (rs.getIdentificationId() == jha.getId()) {
                                if (Objects.equals(rs.getIdentificationId(), jha.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.rsMatchJha(jha, rs);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1787,10 +1788,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1804,7 +1805,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(scl.getUpdateTime());
                            for (RsQueryDTO rs : rsList) {
                                if (rs.getIdentificationId() == scl.getId()) {
                                if (Objects.equals(rs.getIdentificationId(), scl.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.rsMatchScl(scl, rs);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1814,10 +1815,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1831,7 +1832,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(hazop.getUpdateTime());
                            for (RsQueryDTO rs : rsList) {
                                if (rs.getIdentificationId() == hazop.getId()) {
                                if (Objects.equals(rs.getIdentificationId(), hazop.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.rsMatchHazop(hazop, rs);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1841,10 +1842,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }
@@ -1858,7 +1859,7 @@
                            factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
                            factorQueryDTO.setItemIdentificationTime(analogy.getUpdateTime());
                            for (RsQueryDTO rs : rsList) {
                                if (rs.getIdentificationId() == analogy.getId()) {
                                if (Objects.equals(rs.getIdentificationId(), analogy.getId())) {
                                    EvaluateAndIdentificationUtils evaluateAndIdentificationUtils = new EvaluateAndIdentificationUtils();
                                    factorQueryDTO = evaluateAndIdentificationUtils.rsMatchAnalogy(analogy, rs);
                                    factorQueryDTO.setEvaluateMethod(riskAssessPlan.getEvaluateMethod());
@@ -1868,10 +1869,10 @@
                                }
                            }
                            for (UserInfoDomainDTO user : userList) {
                                if (user.getId() == assessQueryDTO.getCreateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getCreateByUserId())) {
                                    assessQueryDTO.setCreateByUserName(user.getRealName());
                                }
                                if (user.getId() == assessQueryDTO.getUpdateByUserId()) {
                                if (Objects.equals(user.getId(), assessQueryDTO.getUpdateByUserId())) {
                                    assessQueryDTO.setUpdateByUserName(user.getRealName());
                                }
                            }