变动大幅度版本

heheng

2025-05-21 6d6f2f9fe9ee5e0d2b1b63bb7cde575f2a93876b

变动大幅度版本

 src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/ReportRiskAssessInfoController.java

@@ -58,7 +58,7 @@
        result.setCode(ResultCode.OK);
        result.setMsg("生成报告基本信息成功");

        int insertResult = reportAppService.insertRiskReport(getCurrentUserId(), jsonObject.getLong("id"));
        int insertResult = reportAppService.insertRiskReport(getCurrentUserId(), jsonObject.getLong("id"),  jsonObject.getStr("reSubmit"));

        if (insertResult < 1){
            result.setCode(ResultCode.NOT_OK);

 src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/RiskAssessPlanController.java

@@ -215,7 +215,7 @@
        result.setCode(ResultCode.OK);
        result.setMsg("辨识成功");

        FactorQueryDTO identification = riskAccessAppService.identification(getCurrentUserId(), identificationReqBO);
        FactorQueryDTO identification = riskAccessAppService.identification(getCurrentUserId(),identificationReqBO);

        result.setData(identification);
        return result;

 src/main/java/com/gkhy/labRiskManage/application/riskReport/service/ReportAppService.java

@@ -16,7 +16,7 @@
    /**
     * 风险评估报告 - 生成报告信息
     */
    int insertRiskReport(Long currentUserId, Long id);
    int insertRiskReport(Long currentUserId, Long id,String reSubmit);
    /**
     * 风险评估报告 - 填写信息
     */

 src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/ReportAppServiceImpl.java

@@ -70,9 +70,9 @@
     * 风险评估报告 - 生成报告信息
     */
    @Override
    public int insertRiskReport(Long currentUserId, Long id) {
    public int insertRiskReport(Long currentUserId, Long id,String reSubmit) {

        ReportInsertDTO insertResult = reportInfoService.insertRiskReport(currentUserId, id);
        ReportInsertDTO insertResult = reportInfoService.insertRiskReport(currentUserId, id, reSubmit);

        if (ObjectUtils.isEmpty(insertResult)){
            return StatusEnum.FAIL.getCode();

 src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java

@@ -184,6 +184,11 @@
        if (currentUserId < 0){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户无效，请重新登录");
        }
        UserInfoDomainDTO userInfoById = userDomainService.getUserInfoById(currentUserId);
        if (userInfoById == null){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户无效，请重新登录");
        }
        String realName = userInfoById.getRealName();

        RiskAssessPlanAppIdentificationBO identificationParam = BeanCopyUtils.copyBean(identificationReqBO, RiskAssessPlanAppIdentificationBO.class);
        int tag = 1;
@@ -198,6 +203,8 @@
        if (identificationParam.getIdentificationMethod() == 1){
            RiskAssessPlanIdentificationPha pha = BeanCopyUtils.copyBean(identificationParam, RiskAssessPlanIdentificationPha.class);
            pha.setAssessPlanId(identificationParam.getId());
            pha.setCreateByUser(realName);
            pha.setCreateByUserId(currentUserId.intValue());
            phaInsertDTO = phaService.insertPha(currentUserId, pha);
            if (ObjectUtils.isEmpty(phaInsertDTO)){
                tag = 0;
@@ -208,6 +215,8 @@
        }else if (identificationParam.getIdentificationMethod() == 2){
            RiskAssessPlanIdentificationJha jha = BeanCopyUtils.copyBean(identificationParam, RiskAssessPlanIdentificationJha.class);
            jha.setAssessPlanId(identificationParam.getId());
            jha.setCreateByUser(realName);
            jha.setCreateByUserId(currentUserId.intValue());
            jhaInsertDTO = jhaService.insertJha(currentUserId, jha);
            if (ObjectUtils.isEmpty(jhaInsertDTO)){
                tag = 0;
@@ -218,6 +227,8 @@
        }else if (identificationParam.getIdentificationMethod() == 3){
            RiskAssessPlanIdentificationScl scl = BeanCopyUtils.copyBean(identificationParam, RiskAssessPlanIdentificationScl.class);
            scl.setAssessPlanId(identificationParam.getId());
            scl.setCreateByUser(realName);
            scl.setCreateByUserId(currentUserId.intValue());
            sclInsertDTO = sclService.insertScl(currentUserId, scl);
            if (ObjectUtils.isEmpty(sclInsertDTO)){
                tag = 0;
@@ -228,6 +239,9 @@
        }else if (identificationParam.getIdentificationMethod() == 4){
            RiskAssessPlanIdentificationHazop hazop = BeanCopyUtils.copyBean(identificationParam, RiskAssessPlanIdentificationHazop.class);
            hazop.setAssessPlanId(identificationParam.getId());
            hazop.setCreateByUser(realName);
            hazop.setCreateByUserId(currentUserId.intValue());

            hazopInsertDTO = hazopService.insertHazop(currentUserId, hazop);
            if (ObjectUtils.isEmpty(hazopInsertDTO)){
                tag = 0;
@@ -238,6 +252,8 @@
        }else if (identificationParam.getIdentificationMethod() == 5){
            RiskAssessPlanIdentificationAnalogy analogy = BeanCopyUtils.copyBean(identificationParam, RiskAssessPlanIdentificationAnalogy.class);
            analogy.setAssessPlanId(identificationParam.getId());
            analogy.setCreateByUser(realName);
            analogy.setCreateByUserId(currentUserId.intValue());
            analogyInsertDTO = analogyService.insertAnalogy(currentUserId, analogy);
            if (ObjectUtils.isEmpty(analogyInsertDTO)){
                tag = 0;
@@ -267,7 +283,11 @@
        if (currentUserId < 0){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户无效，请重新登录");
        }

        UserInfoDomainDTO userInfoById = userDomainService.getUserInfoById(currentUserId);
        if (userInfoById == null){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户无效，请重新登录");
        }
        String realName = userInfoById.getRealName();
        RiskAssessPlanIdentificationAppUpdateBO updateParam = BeanCopyUtils.copyBean(updateReqBO, RiskAssessPlanIdentificationAppUpdateBO.class);
        int tag = 1;
        FactorQueryDTO factorQueryDTO = new FactorQueryDTO();
@@ -277,6 +297,8 @@
            RiskAssessPlanIdentificationPha pha = BeanCopyUtils.copyBean(updateParam, RiskAssessPlanIdentificationPha.class);
            pha.setAssessPlanId(updateParam.getId());
            pha.setId(updateParam.getPhaId());
            pha.setUpdateByUser(realName);
            pha.setUpdateByUserId(currentUserId.intValue());
            PhaInsertDTO phaInsertDTO = phaService.updatePha(currentUserId, pha);
            if (ObjectUtils.isEmpty(phaInsertDTO)){
                tag = 0;
@@ -288,6 +310,8 @@
            RiskAssessPlanIdentificationJha jha = BeanCopyUtils.copyBean(updateParam, RiskAssessPlanIdentificationJha.class);
            jha.setAssessPlanId(updateParam.getId());
            jha.setId(updateParam.getJhaId());
            jha.setUpdateByUser(realName);
            jha.setUpdateByUserId(currentUserId.intValue());
            JhaInsertDTO jhaInsertDTO = jhaService.updateJha(currentUserId, jha);
            if (ObjectUtils.isEmpty(jhaInsertDTO)){
                tag = 0;
@@ -299,6 +323,8 @@
            RiskAssessPlanIdentificationScl scl = BeanCopyUtils.copyBean(updateParam, RiskAssessPlanIdentificationScl.class);
            scl.setAssessPlanId(updateParam.getId());
            scl.setId(updateParam.getSclId());
            scl.setUpdateByUser(realName);
            scl.setUpdateByUserId(currentUserId.intValue());
            SclInsertDTO sclInsertDTO = sclService.updateScl(currentUserId, scl);
            if (ObjectUtils.isEmpty(sclInsertDTO)){
                tag = 0;
@@ -310,6 +336,8 @@
            RiskAssessPlanIdentificationHazop hazop = BeanCopyUtils.copyBean(updateParam, RiskAssessPlanIdentificationHazop.class);
            hazop.setAssessPlanId(updateParam.getId());
            hazop.setId(updateParam.getHazopId());
            hazop.setUpdateByUser(realName);
            hazop.setUpdateByUserId(currentUserId.intValue());
            HazopInsertDTO hazopInsertDTO = hazopService.updateHazop(currentUserId, hazop);
            if (ObjectUtils.isEmpty(hazopInsertDTO)){
                tag = 0;
@@ -321,6 +349,8 @@
            RiskAssessPlanIdentificationAnalogy analogy = BeanCopyUtils.copyBean(updateParam, RiskAssessPlanIdentificationAnalogy.class);
            analogy.setAssessPlanId(updateParam.getId());
            analogy.setId(updateParam.getAnalogyId());
            analogy.setUpdateByUser(realName);
            analogy.setUpdateByUserId(currentUserId.intValue());
            AnalogyInsertDTO analogyInsertDTO = analogyService.updateAnalogy(currentUserId, analogy);
            if (ObjectUtils.isEmpty(analogyInsertDTO)){
                tag = 0;
@@ -564,8 +594,6 @@
        if (currentUserId < 0){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户无效，请重新登录");
        }
        //todo   需要评价人员都评价完成才可以


        //提交评价结果
        AssessPlanUpdateDTO evaluateSubmitResult= assessPlanService.evaluateSubmit(currentUserId, id);

 src/main/java/com/gkhy/labRiskManage/commons/enums/StatusEnum.java

@@ -70,6 +70,11 @@
    REPORT_APPROVED_LEAD(4,"领导审核通过"),

    RECTIFY(1,"退回整改"),

    REPORT_LEVEL_1(1,"重大风险"),
    REPORT_LEVEL_2(2,"较大风险"),
    REPORT_LEVEL_3(3,"一般风险"),
    REPORT_LEVEL_4(4,"低风险"),
    ;



 src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java

@@ -78,6 +78,11 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -212,5 +217,37 @@
    public void setFileData(String fileData) {
        this.fileData = fileData;
    }

    public Integer getUpdateByUserId() {
        return updateByUserId;
    }

    public void setUpdateByUserId(Integer updateByUserId) {
        this.updateByUserId = updateByUserId;
    }

    public Integer getCreateByUserId() {
        return createByUserId;
    }

    public void setCreateByUserId(Integer createByUserId) {
        this.createByUserId = createByUserId;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java

@@ -90,6 +90,11 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -247,5 +252,37 @@
    public void setFileData(String fileData) {
        this.fileData = fileData;
    }

    public Integer getUpdateByUserId() {
        return updateByUserId;
    }

    public void setUpdateByUserId(Integer updateByUserId) {
        this.updateByUserId = updateByUserId;
    }

    public Integer getCreateByUserId() {
        return createByUserId;
    }

    public void setCreateByUserId(Integer createByUserId) {
        this.createByUserId = createByUserId;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java

@@ -74,6 +74,11 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -199,5 +204,37 @@
    public void setFileData(String fileData) {
        this.fileData = fileData;
    }

    public Integer getUpdateByUserId() {
        return updateByUserId;
    }

    public void setUpdateByUserId(Integer updateByUserId) {
        this.updateByUserId = updateByUserId;
    }

    public Integer getCreateByUserId() {
        return createByUserId;
    }

    public void setCreateByUserId(Integer createByUserId) {
        this.createByUserId = createByUserId;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java

@@ -74,6 +74,11 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -199,5 +204,37 @@
    public void setFileData(String fileData) {
        this.fileData = fileData;
    }

    public Integer getUpdateByUserId() {
        return updateByUserId;
    }

    public void setUpdateByUserId(Integer updateByUserId) {
        this.updateByUserId = updateByUserId;
    }

    public Integer getCreateByUserId() {
        return createByUserId;
    }

    public void setCreateByUserId(Integer createByUserId) {
        this.createByUserId = createByUserId;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java

@@ -78,6 +78,11 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -212,5 +217,37 @@
    public void setFileData(String fileData) {
        this.fileData = fileData;
    }

    public Integer getUpdateByUserId() {
        return updateByUserId;
    }

    public void setUpdateByUserId(Integer updateByUserId) {
        this.updateByUserId = updateByUserId;
    }

    public Integer getCreateByUserId() {
        return createByUserId;
    }

    public void setCreateByUserId(Integer createByUserId) {
        this.createByUserId = createByUserId;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyInsertDTO.java

@@ -52,6 +52,9 @@
     */
    private String identificationDesc;

    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -153,4 +156,20 @@
    public void setAnalogyReference(String analogyReference) {
        this.analogyReference = analogyReference;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java

@@ -47,4 +47,8 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java

@@ -328,4 +328,7 @@
    private String safeRiskAnalysis;

    private String fileData;

    private String createByUser;
    private String updateByUser;
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopInsertDTO.java

@@ -68,6 +68,9 @@
     */
    private String identificationDesc;

    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -193,5 +196,20 @@
        this.hazopResult = hazopResult;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java

@@ -64,6 +64,9 @@

    private String fileData;


    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaInsertDTO.java

@@ -48,6 +48,9 @@
     */
    private String identificationDesc;

    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -141,4 +144,20 @@
    public void setJhaResult(String jhaResult) {
        this.jhaResult = jhaResult;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java

@@ -41,4 +41,9 @@
     */
    private LocalDateTime updateTime;
    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaInsertDTO.java

@@ -51,6 +51,9 @@
     */
    private String identificationDesc;

    private String createByUser;
    private String updateByUser;

    public String getIdentificationDesc() {
        return identificationDesc;
    }
@@ -145,5 +148,20 @@
        this.phaResult = phaResult;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java

@@ -45,5 +45,10 @@
    private LocalDateTime updateTime;

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclInsertDTO.java

@@ -51,6 +51,9 @@
     * 辨识专家意见
     */
    private String identificationDesc;
    private String createByUser;
    private String updateByUser;


    public String getIdentificationDesc() {
        return identificationDesc;
@@ -153,4 +156,20 @@
    public void setSclCheckResult(String sclCheckResult) {
        this.sclCheckResult = sclCheckResult;
    }

    public String getCreateByUser() {
        return createByUser;
    }

    public void setCreateByUser(String createByUser) {
        this.createByUser = createByUser;
    }

    public String getUpdateByUser() {
        return updateByUser;
    }

    public void setUpdateByUser(String updateByUser) {
        this.updateByUser = updateByUser;
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java

@@ -48,4 +48,9 @@

    private String fileData;

    private Integer updateByUserId;
    private Integer createByUserId;
    private String createByUser;
    private String updateByUser;

}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/ReportExperimentRiskSourceTypeRepository.java

@@ -4,6 +4,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;

@@ -23,5 +24,9 @@

    @Query(value = "select t from ReportExperimentRiskSourceType t where t.reportId = :id and t.deleteStatus = 0")
    List<ReportExperimentRiskSourceType> getSourceTypeByReportId(Long id);

    @Query(value = "update ReportExperimentRiskSourceType set deleteStatus = 1 where reportId = :reportId")
    @Modifying
    Integer delReportData(Long reportId);
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/ReportExperimentSiteRepository.java

@@ -3,6 +3,7 @@
import com.gkhy.labRiskManage.domain.riskReport.entity.ReportExperimentSite;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;

@@ -13,4 +14,9 @@

    @Query(value = "select t from ReportExperimentSite t where t.reportId = :id and t.deleteStatus = 0")
    List<ReportExperimentSite> getSiteByReportId(Long id);

    @Query(value = "update ReportExperimentSite set deleteStatus = 1 where reportId = :reportId")
    @Modifying
    Integer delReportData(Long reportId);

}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/ReportRiskAssessInfoRepository.java

@@ -2,9 +2,11 @@

import com.gkhy.labRiskManage.domain.riskReport.entity.ReportRiskAssessInfo;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.ReportDTO;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;

@@ -37,5 +39,9 @@

    @Query(value = "select t from ReportRiskAssessInfo t where t.assessLevel = :assessLevel and t.deleteStatus = 0")
    List<ReportRiskAssessInfo> getByLevel(Byte assessLevel);

    @Query(value = "update ReportRiskAssessInfo a set a.deleteStatus = 1 , a.updateByUserId =:updateByUserId  where a.id = :reportId")
    @Modifying
    Integer delReport(Long updateByUserId,  Long reportId);
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/ReportExperimentRiskSourceTypeService.java

@@ -29,4 +29,5 @@
    List<ReportSourceTypeQueryRespDTO> getSourceTypeByReportId(Long id);

    List<ReportExperimentRiskSourceType>  insertAllReportSource(List<ReportExperimentRiskSourceType> riskSourceTypeList);
    void delReportData(Long reportId);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/ReportExperimentSiteService.java

@@ -8,4 +8,5 @@
    List<ReportExperimentSite>  insertAll(List<ReportExperimentSite> reportSiteList);

    List<ReportExperimentSite> getSiteByReportId(Long id);
    void delReportData(Long reportId);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/ReportRiskAssessInfoService.java

@@ -24,7 +24,7 @@
    /**
     * 风险评估报告 - 生成报告信息
     */
    ReportInsertDTO insertRiskReport(Long currentUserId,Long id);
    ReportInsertDTO insertRiskReport(Long currentUserId,Long id,String reSubmit);
    /**
     * 风险评估报告 - 填报信息
     */

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

@@ -161,4 +161,9 @@
        List<ReportExperimentRiskSourceType> sourceTypes = sourceTypeRepository.saveAll(riskSourceTypeList);
        return sourceTypes;
    }

    @Override
    public void delReportData(Long reportId) {
        sourceTypeRepository.delReportData(reportId);
    }
}

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

@@ -26,4 +26,9 @@
        List<ReportExperimentSite> siteByReportId = repository.getSiteByReportId(id);
        return siteByReportId;
    }

    @Override
    public void delReportData(Long reportId) {
        repository.delReportData(reportId);
    }
}

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

@@ -284,7 +284,7 @@
     */
    @Transactional
    @Override
    public ReportInsertDTO insertRiskReport(Long currentUserId, Long id) {
    public ReportInsertDTO insertRiskReport(Long currentUserId, Long id,String reSubmit) {

        if (currentUserId < 0){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无效，请重新登陆");
@@ -305,9 +305,20 @@
        if (roleTag == 0){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"不是管理员，无权生成报告");
        }
        if (experimentById.getStage() == StatusEnum.EXPERIMENT_STATUS_REPORT.getCode().byteValue()){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"该实验已经生成报告，无需重复操作");
        if (!ObjectUtils.isEmpty(reSubmit) && "1".equals(reSubmit) && experimentById.getStage() >= StatusEnum.EXPERIMENT_STATUS_REPORT.getCode().byteValue()){
            //删除已生成的报告数据
            delReportData(id,currentUserId);
        }else {
            if (experimentById.getStage() == StatusEnum.EXPERIMENT_STATUS_REPORT.getCode().byteValue()){
                throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"该实验已经生成报告，无需重复操作");
            }
        }

        ReportRiskAssessInfo byExperimentId = reportRepository.getByExperimentId(id);
        if (!ObjectUtils.isEmpty(byExperimentId)){
            throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"该实验已经生成报告，请勿重复操作");
        }

        //定义初始风险等级0级
        Byte level = 0;
        //获取该实验的所有计划信息
@@ -327,11 +338,11 @@
        if (tag == 1){
            throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR.getCode() ,"该实验有未完成的评估计划" + info);
        }

        UserInfoDomainDTO liabilityUser = userDomainService.getUserInfoById(experimentById.getLiabilityUserId());
        if (ObjectUtils.isEmpty(liabilityUser)){
            throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR.getCode() ,"实验责任人信息不存在");
        }
//20250520实验责任人去掉验证
//        UserInfoDomainDTO liabilityUser = userDomainService.getUserInfoById(experimentById.getLiabilityUserId());
//        if (ObjectUtils.isEmpty(liabilityUser)){
//            throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR.getCode() ,"实验责任人信息不存在");
//        }


        //检查该实验所有的评价结果,遍历评价结果等级
@@ -405,9 +416,11 @@
        reportInfo.setSafeRiskAnalysis(analysis.toString());

        reportInfo.setAssessPerson(null);
        reportInfo.setAssessLevel(null);
        reportInfo.setDepId(null); //todo 不确定是否需要部门
        reportInfo.setSafeRiskAnalysis(null); //todo 安全风险分析，暂时不知道数据来源，先设空
        reportInfo.setAssessLevel(StatusEnum.REPORT_LEVEL_1.getCode().byteValue());
        //todo 不确定是否需要部门
        reportInfo.setDepId(null);
//       reportInfo.setSafeRiskAnalysis(null);



        //修改实验  4 生成报告，
@@ -492,6 +505,16 @@

    }

    private void delReportData(Long id,Long userId){
        ReportRiskAssessInfo byExperimentId = reportRepository.getByExperimentId(id);
        if (!ObjectUtils.isEmpty(byExperimentId)){
            reportRepository.delReport(userId, byExperimentId.getId());
            reportExperimentSiteService.delReportData(byExperimentId.getId());
            reportSourceTypeService.delReportData(byExperimentId.getId());

        }
    }

    /**
     * 风险评估报告 - 填报信息
     */

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

@@ -110,6 +110,8 @@
        analogyById.setAnalogyResult(analogy.getAnalogyResult());
        analogyById.setAnalogyRiskFactor(analogy.getAnalogyRiskFactor());
        analogyById.setFileData(analogy.getFileData());
        analogyById.setUpdateByUser(analogy.getUpdateByUser());
        analogyById.setUpdateByUserId(analogy.getUpdateByUserId());
//        analogyById.setEducationMeasure(analogy.getEducationMeasure());
//        analogyById.setManageMeasure(analogy.getManageMeasure());
//        analogyById.setEmergencyMeasure(analogy.getEmergencyMeasure());

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

@@ -131,6 +131,8 @@
        hazopById.setHazopPossibleCauses(hazop.getHazopPossibleCauses());
        hazopById.setHazopParamDesc(hazop.getHazopParamDesc());
        hazopById.setFileData(hazop.getFileData());
        hazopById.setUpdateByUserId(hazop.getUpdateByUserId());
        hazopById.setUpdateByUser(hazop.getUpdateByUser());
//        hazopById.setEducationMeasure(hazop.getEducationMeasure());
//        hazopById.setManageMeasure(hazop.getManageMeasure());
//        hazopById.setEmergencyMeasure(hazop.getEmergencyMeasure());

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

@@ -103,6 +103,8 @@
        jhaById.setJhaRiskFactor(jha.getJhaRiskFactor());
        jhaById.setJhaCheckItem(jha.getJhaCheckItem());
        jhaById.setFileData(jha.getFileData());
        jhaById.setUpdateByUser(jha.getUpdateByUser());
        jhaById.setUpdateByUserId(jha.getUpdateByUserId());
//        jhaById.setEducationMeasure(jha.getEducationMeasure());
//        jhaById.setManageMeasure(jha.getManageMeasure());
//        jhaById.setEmergencyMeasure(jha.getEmergencyMeasure());

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

@@ -102,6 +102,8 @@
        phaById.setPhaRiskFactor(pha.getPhaRiskFactor());
        phaById.setPhaCheckItem(pha.getPhaCheckItem());
        phaById.setFileData(pha.getFileData());
        phaById.setUpdateByUser(pha.getUpdateByUser());
        phaById.setUpdateByUserId(pha.getUpdateByUserId());
//        phaById.setEducationMeasure(pha.getEducationMeasure());
//        phaById.setManageMeasure(pha.getManageMeasure());
//        phaById.setEmergencyMeasure(pha.getEmergencyMeasure());

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

@@ -115,6 +115,8 @@
        sclById.setSclCheckStandard(scl.getSclCheckStandard());
        sclById.setSclCheckUnstandard(scl.getSclCheckUnstandard());
        sclById.setFileData(scl.getFileData());
        sclById.setUpdateByUser(scl.getUpdateByUser());
        sclById.setUpdateByUserId(scl.getUpdateByUserId());
//        sclById.setEducationMeasure(scl.getEducationMeasure());
//        sclById.setManageMeasure(scl.getManageMeasure());
//        sclById.setEmergencyMeasure(scl.getEmergencyMeasure());

 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(), "风险辨识必须在评估结束时间之前");
        }
@@ -1332,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());
@@ -1342,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());
                                }
                            }
@@ -1359,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());
@@ -1369,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());
                                }
                            }
@@ -1386,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());
@@ -1396,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());
                                }
                            }
@@ -1413,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());
@@ -1422,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());
                                    }
                                }
@@ -1440,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());
@@ -1450,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());
                                }
                            }
@@ -1472,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());
@@ -1482,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());
                                }
                            }
@@ -1499,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());
@@ -1509,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());
                                }
                            }
@@ -1526,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());
@@ -1536,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());
                                }
                            }
@@ -1553,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());
@@ -1563,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());
                                }
                            }
@@ -1580,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());
@@ -1590,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());
                                }
                            }
@@ -1611,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());
@@ -1621,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());
                                }
                            }
@@ -1638,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());
@@ -1648,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());
                                }
                            }
@@ -1665,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());
@@ -1675,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());
                                }
                            }
@@ -1750,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());
@@ -1760,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());
                                }
                            }
@@ -1777,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());
@@ -1787,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());
                                }
                            }
@@ -1804,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());
@@ -1814,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());
                                }
                            }
@@ -1831,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());
@@ -1841,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());
                                }
                            }
@@ -1858,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());
@@ -1868,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());
                                }
                            }