From 6d6f2f9fe9ee5e0d2b1b63bb7cde575f2a93876b Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 21 五月 2025 16:14:52 +0800
Subject: [PATCH] 变动大幅度版本
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java | 145 ++++++++++++++++++++++++++++--------------------
1 files changed, 84 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
index 1682fd9..ac4a0c2 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
+++ b/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;
@@ -369,8 +370,17 @@
if (queryParam.getExperimentId() != null) {
predicateList.add(criteriaBuilder.equal(root.get("experimentId"), queryParam.getExperimentId()));
}
- Join<RiskAssessPlan, RiskAssessPlanIdentificationUser> identificationUserJoin = root.join("riskAssessPlanIdentificationUsers", JoinType.LEFT);
- Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateUserJoin = root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT);
+// Join<RiskAssessPlan, RiskAssessPlanIdentificationUser> identificationUserJoin = root.join("riskAssessPlanIdentificationUsers", JoinType.LEFT);
+// Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateUserJoin = root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT);
+ Join<RiskAssessPlan, RiskAssessPlanIdentificationUser> identificationJoin =
+ root.join("riskAssessPlanIdentificationUsers", JoinType.LEFT);
+ identificationJoin.on(criteriaBuilder.equal(identificationJoin.get("deleteStatus"), StatusEnum.DELETE_NOT.getCode()));
+
+ // LEFT JOIN riskAssessPlanEvaluateUsers
+ Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateJoin =
+ root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT);
+ evaluateJoin.on(criteriaBuilder.equal(evaluateJoin.get("deleteStatus"), StatusEnum.DELETE_NOT.getCode()));
+
if (roleTag == UserTagEnum.USER_TAG_0.getCode()) {
predicateList.add(criteriaBuilder.equal(root.get("planUserId"), currentUserId));
@@ -382,6 +392,7 @@
// )
// );
}
+
query.groupBy(root.get("id"));
predicateList.add(criteriaBuilder.equal(root.get("deleteStatus"), StatusEnum.DELETE_NOT.getCode()));
return criteriaBuilder.and(predicateList.toArray(new Predicate[0]));
@@ -390,6 +401,11 @@
PageRequest pageParam = PageRequest.of(queryParam.getPageIndex() - 1, queryParam.getPageSize(), Sort.Direction.DESC, "updateTime");
Page<RiskAssessPlan> pageResult = assessPlanRepository.findAll(specification, pageParam);
+
+
+
+ Long countDynamic = assessPlanRepository.countDynamic(queryParam.getAssessPlanName(), queryParam.getExperimentId(), roleTag == UserTagEnum.USER_TAG_0.getCode() ? currentUserId : null, queryParam.getRiskUnitIds());
+
List<RiskAssessPlanQueryDTO> assessPlanQueryDTOS = BeanCopyUtils.copyBeanList(pageResult.getContent(), RiskAssessPlanQueryDTO.class);
@@ -438,7 +454,7 @@
}
searchResult.setData(assessPlanQueryDTOS);
- searchResult.setTotal(pageResult.getTotalElements());
+ searchResult.setTotal(countDynamic);
return searchResult;
}
@@ -739,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(), "风险辨识必须在评估结束时间之前");
}
@@ -1184,6 +1201,7 @@
}
if (planIds.size() > 0) {
predicateList.add(criteriaBuilder.in(root.get("id")).value(planIds));
+ queryParam.setPlanIds(planIds);
}
Join<RiskAssessPlan, RiskAssessPlanIdentificationUser> identificationUserJoin = root.join("riskAssessPlanIdentificationUsers", JoinType.LEFT);
@@ -1192,6 +1210,8 @@
if (roleTag == UserTagEnum.USER_TAG_0.getCode()) {
+ queryParam.setUserTag(UserTagEnum.USER_TAG_0.getCode().byteValue());
+ queryParam.setUserId(currentUserId);
//辨识
if (queryParam.getTag() == 1) {
predicateList.add(criteriaBuilder.equal(identificationUserJoin.get("identificationUserId"), currentUserId));
@@ -1217,6 +1237,9 @@
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);
+
//循环遍历结果集，封装查询结果
List<AssessQueryDTO> assessQueryDTOList = new ArrayList<>();
@@ -1311,7 +1334,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());
@@ -1321,10 +1344,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());
}
}
@@ -1338,7 +1361,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());
@@ -1348,10 +1371,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());
}
}
@@ -1365,7 +1388,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());
@@ -1375,10 +1398,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());
}
}
@@ -1392,7 +1415,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());
@@ -1401,10 +1424,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());
}
}
@@ -1419,7 +1442,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());
@@ -1429,10 +1452,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());
}
}
@@ -1451,7 +1474,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());
@@ -1461,10 +1484,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());
}
}
@@ -1478,7 +1501,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());
@@ -1488,10 +1511,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());
}
}
@@ -1505,7 +1528,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());
@@ -1515,10 +1538,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());
}
}
@@ -1532,7 +1555,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());
@@ -1542,10 +1565,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());
}
}
@@ -1559,7 +1582,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());
@@ -1569,10 +1592,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());
}
}
@@ -1590,7 +1613,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());
@@ -1600,10 +1623,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());
}
}
@@ -1617,7 +1640,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());
@@ -1627,10 +1650,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());
}
}
@@ -1644,7 +1667,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());
@@ -1654,10 +1677,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());
}
}
@@ -1729,7 +1752,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());
@@ -1739,10 +1762,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());
}
}
@@ -1756,7 +1779,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());
@@ -1766,10 +1789,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());
}
}
@@ -1783,7 +1806,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());
@@ -1793,10 +1816,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());
}
}
@@ -1810,7 +1833,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());
@@ -1820,10 +1843,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());
}
}
@@ -1837,7 +1860,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());
@@ -1847,10 +1870,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());
}
}
@@ -1866,7 +1889,7 @@
}
searchResult.setData(assessQueryDTOList);
- searchResult.setTotal(pageResult.getTotalElements());
+ searchResult.setTotal(pageCount);
searchResult.setCount(assessQueryDTOList.size());
return searchResult;
}
--
Gitblit v1.9.2