From 48c8f5de9b5acebab2d92649a6f6f76d16f791b8 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 5 Feb 2024 09:02:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?app=E9=A6=96=E9=A1=B5=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppHiddenController.java | 18 +- .../datasource/check/ListManagerMapper.java | 8 + .../datasource/hidden/HiddenMapper.java | 36 ++ .../service/check/ListManagerService.java | 8 + .../check/impl/ListManagerServiceImpl.java | 10 + .../zcloud/service/hidden/HiddenService.java | 36 ++ .../hidden/impl/HiddenServiceImpl.java | 48 +++ .../datasource/check/ListManagerMapper.xml | 268 +++++++++++++++ .../datasource/hidden/HiddenMapper.xml | 309 ++++++++++++++++++ 9 files changed, 735 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 916fcfa..04443d6 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -133,7 +133,8 @@ public class AppHiddenController extends BaseController { // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 if (Tools.notEmpty(pd.get("userId").toString())) { pd.put("SELFUSERID", pd.get("userId")); - List rectifiHid = hiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 +// List rectifiHid = hiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + List rectifiHid = hiddenService.getRiskStandardCountByRectifiCationorId(pd); // 根据用户ID获取待整改隐患（app首页） for (int i = 0; i < rectifiHid.size(); i++) { PageData rec = rectifiHid.get(i); if (null == rec.get("STATE")) { @@ -144,7 +145,8 @@ public class AppHiddenController extends BaseController { } } - List checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 +// List checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + List checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页） for (int i = 0; i < checkorHid.size(); i++) { PageData che = checkorHid.get(i); if (null == che.get("STATE")) { @@ -155,7 +157,8 @@ public class AppHiddenController extends BaseController { } } - List confirmHid = hiddenService.getCountByConfirmId(pd); // 根据人员id获取整改隐患信息 state 1 5 +// List confirmHid = hiddenService.getCountByConfirmId(pd); // 根据人员id获取整改隐患信息 state 1 5 + List confirmHid = hiddenService.getRiskStandardCountByConfirmId(pd); // 根据用户ID获取待确认隐患（app首页） for (int i = 0; i < confirmHid.size(); i++) { PageData che = confirmHid.get(i); if (null == che.get("STATE")) { @@ -166,7 +169,8 @@ public class AppHiddenController extends BaseController { } } // userId -> 85437f01be1f4c959f71a850b1d731a1 - List specialHid = hiddenService.getCountSpecialByhId(pd); // 根据人员id获取特殊处理隐患和延期隐患信息 state 1 5 +// List specialHid = hiddenService.getCountSpecialByhId(pd); // 根据人员id获取特殊处理隐患和延期隐患信息 state 1 5 + List specialHid = hiddenService.getRiskStandardCountSpecialByhId(pd); // 根据用户ID获取特殊处理隐患和延期隐患（app首页） for (int i = 0; i < specialHid.size(); i++) { PageData che = specialHid.get(i); if (null == che.get("TYPE")) { @@ -183,7 +187,8 @@ public class AppHiddenController extends BaseController { - List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 +// List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 + List creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） for (int i = 0; i < creatorHid.size(); i++) { PageData cre = creatorHid.get(i); if (null == cre.get("STATE")) { @@ -226,7 +231,8 @@ public class AppHiddenController extends BaseController { // } int wjcNum = 0; int yjcNum = 0; - List varList = listmanagerService.listAll(pd);// 列出ListManager列表 +// List varList = listmanagerService.listAll(pd);// 列出ListManager列表 + List varList = listmanagerService.listAllRiskStandard(pd);// 列出ListManager列表 for (PageData list : varList) { String cycle = list.getString("PERIODNAME"); if (list.getString("TYPE").equals("listType0005")) { diff --git a/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java b/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java index e738145..b45f365 100644 --- a/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java @@ -234,5 +234,13 @@ public interface ListManagerMapper { List findByCondition(PageData util); List analysis(PageData util); + + /** + * 列表(全部) + * 源自 listAll(PageData pd) + * @param pd + * @throws Exception + */ + List listAllRiskStandard(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java index ef1ab09..5bb7659 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java @@ -314,5 +314,41 @@ public interface HiddenMapper{ * @throws Exception */ List riskStandardlistPage(Page page); + + /** + * 根据用户ID获取待整改隐患（app首页） + * @param pd CREATOR + * @return + * @throws Exception + */ + List getRiskStandardCountByRectifiCationorId(PageData pd); + + /**根据用户ID获取待验收隐患（app首页） + * @param pd + * @throws Exception + */ + List getRiskStandardCountByCheckorId(PageData pd); + + /**根据用户ID获取待确认隐患（app首页） + * @param pd + * @throws Exception + */ + List getRiskStandardCountByConfirmId(PageData pd); + + /** + * 根据用户ID获取特殊处理隐患和延期隐患（app首页） + * @param pd + * @return + * @throws Exception + */ + List getRiskStandardCountSpecialByhId(PageData pd); + + /** + * 根据用户ID获取发现隐患信息（app首页） + * @param pd + * @return + * @throws Exception + */ + List getRiskStandardCountByCreatorId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/check/ListManagerService.java b/src/main/java/com/zcloud/service/check/ListManagerService.java index fc8e389..6a75d94 100644 --- a/src/main/java/com/zcloud/service/check/ListManagerService.java +++ b/src/main/java/com/zcloud/service/check/ListManagerService.java @@ -220,5 +220,13 @@ public interface ListManagerService { public List getCountNumBi(PageData pd)throws Exception; void saveBaoBaoType(PageData pd) throws Exception; + + /** + * 列表(全部) + * 源自 listAll(PageData pd) + * @param pd + * @throws Exception + */ + List listAllRiskStandard(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java b/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java index 559b731..aee7a60 100644 --- a/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java @@ -334,6 +334,16 @@ public class ListManagerServiceImpl implements ListManagerService { listCheckItemMapper.edit(entity); } } + + /** + * 列表(全部) + * 源自 listAll(PageData pd) + * @param pd + * @throws Exception + */ + public List listAllRiskStandard(PageData pd)throws Exception{ + return listmanagerMapper.listAllRiskStandard(pd); + } } diff --git a/src/main/java/com/zcloud/service/hidden/HiddenService.java b/src/main/java/com/zcloud/service/hidden/HiddenService.java index 0e5fb13..6c3220e 100644 --- a/src/main/java/com/zcloud/service/hidden/HiddenService.java +++ b/src/main/java/com/zcloud/service/hidden/HiddenService.java @@ -377,5 +377,41 @@ public interface HiddenService{ * @throws Exception */ public List listRiskStandard(Page page)throws Exception; + + /** + * 根据用户ID获取待整改隐患（app首页） + * @param pd CREATOR + * @return + * @throws Exception + */ + List getRiskStandardCountByRectifiCationorId(PageData pd) throws Exception; + + /** + * 根据用户ID获取待验收隐患（app首页） + * @param pd + * @throws Exception + */ + List getRiskStandardCountByCheckorId(PageData pd) throws Exception; + + /**根据用户ID获取待确认隐患（app首页） + * @param pd + * @throws Exception + */ + List getRiskStandardCountByConfirmId(PageData pd) throws Exception; + + /** + * 根据用户ID获取特殊处理隐患和延期隐患（app首页） + * @param pd + * @throws Exception + */ + List getRiskStandardCountSpecialByhId(PageData pd) throws Exception; + + /** + * 根据用户ID获取发现隐患信息（app首页） + * @param pd CREATOR + * @return + * @throws Exception + */ + List getRiskStandardCountByCreatorId(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java index 0d613d7..d5c5155 100644 --- a/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java @@ -794,5 +794,53 @@ public class HiddenServiceImpl implements HiddenService { public List listRiskStandard(Page page)throws Exception{ return hiddenMapper.riskStandardlistPage(page); } + + /** + * 根据用户ID获取待整改隐患（app首页） + * @param pd CREATOR + * @return + * @throws Exception + */ + public List getRiskStandardCountByRectifiCationorId(PageData pd) throws Exception{ + return hiddenMapper.getRiskStandardCountByRectifiCationorId(pd); + } + + /** + * 根据用户ID获取待验收隐患（app首页） + * @param pd + * @return + * @throws Exception + */ + public List getRiskStandardCountByCheckorId(PageData pd) throws Exception{ + return hiddenMapper.getRiskStandardCountByCheckorId(pd); + } + + /**根据用户ID获取待确认隐患（app首页） + * @param pd + * @throws Exception + */ + public List getRiskStandardCountByConfirmId(PageData pd) throws Exception{ + return hiddenMapper.getRiskStandardCountByConfirmId(pd); + } + + /** + * 根据用户ID获取特殊处理隐患和延期隐患（app首页） + * @param pd + * @return + * @throws Exception + */ + public List getRiskStandardCountSpecialByhId(PageData pd) throws Exception{ + return hiddenMapper.getRiskStandardCountSpecialByhId(pd); + } + + /** + * 根据用户ID获取发现隐患信息（app首页） + * @param pd CREATOR + * @return + * @throws Exception + */ + public List getRiskStandardCountByCreatorId(PageData pd) throws Exception{ + return hiddenMapper.getRiskStandardCountByCreatorId(pd); + } } diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index f032d90..a4dadf1 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -3089,4 +3089,272 @@ group by f.CUSTOM_ID order by field(f.ISDELETE,'0','1','2','-1') ,f.OPERATTIME desc ) + + + diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml index d8199f3..e04c6af 100644 --- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml @@ -3737,4 +3737,313 @@ order by z.CREATTIME desc + + + + + + + + + + + + + + + From e0530e207cf4953d2381fc8ef78b00f3ab783b57 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Mon, 5 Feb 2024 11:49:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/check/ListManagerController.java | 1 + .../resources/mybatis/datasource/check/ListManagerMapper.xml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/zcloud/controller/check/ListManagerController.java b/src/main/java/com/zcloud/controller/check/ListManagerController.java index 5c57df7..6c73122 100644 --- a/src/main/java/com/zcloud/controller/check/ListManagerController.java +++ b/src/main/java/com/zcloud/controller/check/ListManagerController.java @@ -1081,6 +1081,7 @@ public class ListManagerController extends BaseController { npd.put("STATUS",pd.getString("STATUS")); npd.put("PERIOD",pd.getString("PERIOD")); npd.put("OVERTIME",pd.getString("OVERTIME")); + npd.put("LIST_TYPE",pd.getString("LIST_TYPE")); npd.put("WORKSTATUS",pd.getString("WORKSTATUS")); npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL")); npd.put("TYPE",pd.getString("TYPE")); diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index a4dadf1..119f1e6 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -2737,6 +2737,7 @@ ) f where 1= 1 + @@ -3076,6 +3077,9 @@ ) f where 1= 1 + + and list_type = #{pd.LIST_TYPE} +