From bd4c1edabfdc4c72586998701fdb91dc3b498c1f Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Tue, 20 Feb 2024 16:37:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=8C=87=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/hidden/HiddenController.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/com/zcloud/controller/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java index ee3669d..d5fa301 100644 --- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java +++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java @@ -1920,4 +1920,25 @@ public class HiddenController extends BaseController { map.put("yys", yys); return map; } + + @RequestMapping(value = "/listForAhZp") + // @RequiresPermissions("hidden:list") + @ResponseBody + public Object listFoAhZp(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = hiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); + for (PageData vector : varList) { + safetyenvironmentalService.departmentUtil(vector); + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } From 24a7d01b8c568a785fa88b809778a4adb13f7f5c Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 20 Feb 2024 16:43:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?app=E9=A6=96=E9=A1=B5=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=95=B0=E6=8D=AE=E6=A0=A1=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/app/AppHiddenController.java | 14 +++++++------- .../mybatis/datasource/check/ListManagerMapper.xml | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 2ea53d8..0b8d38f 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -147,15 +147,15 @@ public class AppHiddenController extends BaseController { } } - List checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 -// List checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页） +// 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")) { continue; } - if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2 -// if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) { +// if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2 + if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) { dys++; } } @@ -186,9 +186,9 @@ public class AppHiddenController extends BaseController { yq++; } } - - List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 -// List creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） + pd.put("APPSELFUSERID", pd.get("userId")); +// List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 + List creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） System.out.println(creatorHid); for (int i = 0; i < creatorHid.size(); i++) { PageData cre = creatorHid.get(i); diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index 76426a6..b54a70e 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -3246,9 +3246,9 @@ and f.CORPINFO_ID = #{CORPINFO_ID} - - - + + and f.USER_ID = #{USER_ID} + @@ -3375,9 +3375,9 @@ and f.CORPINFO_ID = #{CORPINFO_ID} - - - + + and f.USER_ID = #{USER_ID} +