From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期三, 17 七月 2024 16:43:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java index a04018c..f9764f3 100644 --- a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java +++ b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java @@ -2,12 +2,10 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.text.Convert; +import com.ruoyi.doublePrevention.vo.ResultVO; import com.ruoyi.project.tr.riskCheckPoint.mapper.RiskCheckPointMapper; import com.ruoyi.project.tr.riskEvaluationPlan.mapper.RiskEvaluationPlanMapper; -import com.ruoyi.project.tr.riskList.domain.RiskList; -import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts; -import com.ruoyi.project.tr.riskList.domain.RiskListByDevice; -import com.ruoyi.project.tr.riskList.domain.RiskListByWork; +import com.ruoyi.project.tr.riskList.domain.*; import com.ruoyi.project.tr.riskList.mapper.RiskListMapper; import com.ruoyi.project.tr.riskList.service.IRiskListService; import org.springframework.beans.factory.annotation.Autowired; @@ -157,4 +155,30 @@ public RiskList getInfoByRiskListId(Long riskUnitId) { return riskListMapper.getInfoByRiskListId(riskUnitId); } + + @Override + public List<RiskList> getRiskUnitLists() { + return riskListMapper.getRiskUnitLists(); + } + + @Override + public RiskList getInfoByRiskListName(String riskListName) { + return riskListMapper.getInfoByRiskListName(riskListName); + } + + @Override + public List<RiskList> getAllPlan() { + int riskType =5; + return riskListMapper.getAllPlan(riskType); + } + + @Override + public List<RiskList> listHazardSource() { + return riskListMapper.listHazardSource(); + } + + @Override + public RiskList getInfoByRiskListNum(String hazardCode) { + return riskListMapper.getInfoByRiskListNum(hazardCode); + } } -- Gitblit v1.9.2