diff --git a/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java b/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java index 71ddef6f..03d95158 100644 --- a/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java +++ b/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java @@ -138,7 +138,12 @@ public class HomeHighRiskWorkController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - List varList = highworkService.listAllHighRiskWorkLocation(pd); + List varList = new ArrayList<>(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { // 一公司 + varList = highworkService.listAllHighRiskWorkLocationFirst(pd); + }else { + varList = highworkService.listAllHighRiskWorkLocation(pd); + } map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java index 7cc81fa2..c4fb4158 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java @@ -112,5 +112,7 @@ public interface HighWorkMapper{ * @throws Exception */ List statisticsAllHighRiskWorkFirst(PageData pd); + + List listAllHighRiskWorkLocationFirst(PageData pd); } diff --git a/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java b/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java index 635369d9..1c80ed58 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java @@ -127,5 +127,7 @@ public interface HighWorkService{ * @throws Exception */ List statisticsAllHighRiskWorkFirst(PageData pd)throws Exception; + + List listAllHighRiskWorkLocationFirst(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java index 11068f77..19d944e1 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java @@ -197,5 +197,10 @@ public class HighWorkServiceImpl implements HighWorkService { public List statisticsAllHighRiskWorkFirst(PageData pd) throws Exception { return highworkMapper.statisticsAllHighRiskWorkFirst(pd); } + + @Override + public List listAllHighRiskWorkLocationFirst(PageData pd) throws Exception { + return highworkMapper.listAllHighRiskWorkLocationFirst(pd); + } } diff --git a/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml index aa62c068..89ea328a 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml @@ -1392,4 +1392,77 @@ SELECT count(*) COUNT FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} + + +