From b7b60d8b793dd7ea3f6722baf9b8c0cee0e7d2c2 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Fri, 26 Apr 2024 16:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/hiddenApi/HiddenApiController.java | 4 ++-- .../mybatis/datasource/hiddenApi/HiddenApiMapper.xml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index a8b87855..61e2004b 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -1052,7 +1052,7 @@ public class HiddenApiController extends BaseController { PageData vpd = new PageData(); vpd.put("var1", i + 1); //1 vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("type1Name")) ? "" : varOList.get(i).getString("type1Name")); //2 - vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("LEVEL")) ? "" : varOList.get(i).getString("LEVEL")); //3 + vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("levelName")) ? "" : varOList.get(i).getString("levelName")); //3 vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("POSITIONDESC")) ? "" : varOList.get(i).getString("POSITIONDESC")); //4 vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("HIDDENDESCR")) ? "" : varOList.get(i).getString("HIDDENDESCR")); //5 vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("RECTIFYDESCR")) ? "" : varOList.get(i).getString("RECTIFYDESCR")); //6 @@ -1062,7 +1062,7 @@ public class HiddenApiController extends BaseController { vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("zgUserName")) ? "" : varOList.get(i).getString("zgUserName")); //10 vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("conUsername")) ? "" : varOList.get(i).getString("conUsername")); //11 vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("INVESTMENT_FUNDS")) ? "" : varOList.get(i).getString("INVESTMENT_FUNDS")); //12 - vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("REVIEWTIME")) ? "" : varOList.get(i).getString("REVIEWTIME")); //13 + vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("CHECK_TIME")) ? "" : varOList.get(i).getString("CHECK_TIME")+" 已完成"); //13 vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("revieworName")) ? "" : varOList.get(i).getString("revieworName")); //14 vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("INSPECTION_USER")) ? varOList.get(i).getString("CREATER_NAME") : varOList.get(i).getString("INSPECTION_USER")); //15 varList.add(vpd); diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 81c29a8d..52249217 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -863,6 +863,8 @@ GROUP_CONCAT( su.NAME ) AS INSPECTION_USER, c.NAME AS CREATER_NAME, revieworUser.NAME AS revieworName, + bhc.CHECK_TIME, + type2.NAME AS levelName, f.* FROM bus_hidden f @@ -872,7 +874,8 @@ left join oa_department bhuUserDeptD on bhuUserDeptD.DEPARTMENT_ID = bhuUserDept.PARENT_ID left join vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR LEFT JOIN vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER - LEFT JOIN vi_user_all revieworUser on revieworUser.USER_ID = f.REVIEWOR + LEFT JOIN bus_hiddencheck bhc ON bhc.HIDDEN_ID = f.HIDDEN_ID + LEFT JOIN vi_user_all revieworUser ON revieworUser.USER_ID = bhc.USER_ID LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT @@ -882,6 +885,7 @@ left join bus_inspection_safetyenvironmental_inspector bi ON bi.INSPECTION_ID = isa.INSPECTION_ID LEFT JOIN vi_user_all su on su.USER_ID = bi.INSPECTION_USER_ID LEFT JOIN vi_user_all c ON c.USER_ID = f.CREATOR + LEFT JOIN sys_dictionaries type2 ON type2.bianma = f.HIDDENLEVEL WHERE f.ISDELETE = '0' and f.STATE not in ('0','7','8','100','101','102')