From c2068c6ebd5305eb637040a494b2a0ba0ae91614 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Sat, 14 Sep 2024 16:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=AE=89=E5=85=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firemanager/FireRecordMapper.java         |  1 -
 .../firemanager/FireRecordService.java        |  1 -
 .../impl/FireRecordServiceImpl.java           |  5 --
 .../datasource/corpsystem/CorpMenuMapper.xml  |  2 +-
 .../firemanager/FireRecordMapper.xml          | 53 -------------------
 .../mybatis/datasource/system/MenuMapper.xml  |  2 +-
 6 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
index 8caf8132..abf8fc57 100644
--- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
@@ -89,7 +89,6 @@ public interface FireRecordMapper {
 
     List<PageData> datalistPageV2(Page page);
 
-    List<PageData> datalistPageV3(Page page);
     List<PageData> datalistPage(Page page);
 
     List<PageData> getCheckingByCid(String fireCheckId);
diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
index 54caa768..e10279e6 100644
--- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
+++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
@@ -80,7 +80,6 @@ public interface FireRecordService {
     List<PageData> getCheckListByApp(Page page);
     List<PageData> getCheckListByAppV2(Page page);
 
-    List<PageData> getCheckListByAppV3(Page page);
     List<PageData> getCheckRecordByPid(PageData pd);
 
     /**
diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
index 7a307fa2..3c7fbdcc 100644
--- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
+++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
@@ -723,11 +723,6 @@ public class FireRecordServiceImpl implements FireRecordService {
         return data;
     }
 
-    @Override
-    public List<PageData> getCheckListByAppV3(Page page) {
-        List<PageData> data = fireRecordMapper.datalistPageV3(page);
-        return data;
-    }
     @Override
     public List<PageData> getCheckRecordByPid(PageData pd) {
         return fireRecordMapper.getCheckRecordByPid(pd);
diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml
index 24f3cd6b..9cde531e 100644
--- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml
+++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<!--表名 -->
 	<sql id="tableName">
-		SYS_MENU
+		sys_menu2
 	</sql>
 
 	<!-- 字段 -->
diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
index bd0a81ec..29996134 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
@@ -1031,58 +1031,5 @@
             frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID}
           AND frp.ISDELETE = '0'
     </select>
-    <select id="datalistPageV3" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.Page">
-        SELECT
-        cl.FIRE_CHECK_STANDARD_NAME,
-        fr.FIRE_CHECK_ID,
-        cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID,
-        d.`NAME` AS DEPARTMENT_NAME,
-        su.`NAME` AS USER_NAME,
-        count(
-        IF
-        ( fr.FINISHED = 0, NULL, fr.FINISHED )) COUNT,
-        IF
-        ( temp.FINISHED > 0, temp.FINISHED, 0 ) checkCount,
-        cl.STATE,
-        sys_dictionaries.`NAME` AS PERIODNAME
-        FROM
-        bus_fire_record AS fr
-        LEFT JOIN bus_fire_record_point AS cp ON fr.FIRE_CHECK_ID = cp.FIRE_CHECK_ID
-        LEFT JOIN bus_fire_checklist AS cl ON cp.FIRE_CHECK_ID = cl.FIRE_CHECK_ID
-        LEFT JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID
-        LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
-        LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
-        LEFT JOIN ( SELECT count(FINISHED) FINISHED ,FIRE_CHECK_ID FROM bus_fire_record WHERE
-        CONCAT(date_format(current_date(),'%Y-%m-%d'),' 00:00:00') BETWEEN PERIODSTART AND PERIODEND  and isdelete = 0 and FINISHED = '1' GROUP BY
-        FIRE_CHECK_ID ) temp ON
-        fr.FIRE_CHECK_ID = temp.FIRE_CHECK_ID
-        LEFT JOIN ( SELECT * FROM bus_fire_record WHERE CONCAT(date_format(current_date()-1,'%Y-%m-%d'),' 00:00:00')
-        BETWEEN PERIODSTART AND
-        PERIODEND GROUP BY FIRE_CHECK_ID ) st ON fr.FIRE_CHECK_ID = st.FIRE_CHECK_ID
-        WHERE
-        fr.ISDELETE = 0
-        AND cl.ISDELETE = 0
-        <if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
-            <choose>
-                <!--公司领导-->
-                <when test='pd.roleLevel == "0"'>
-                    <if test="pd.CORPINFO_ID!=null and pd.CORPINFO_ID != ''">
-                        AND cp.CORPINFO_ID = #{pd.CORPINFO_ID,jdbcType=VARCHAR}
-                    </if>
-                </when>
-                <when test='pd.roleLevel == "1"'>
-                    and cp.DEPARTMENT_ID in (${pd.supDeparIds})
-                </when>
-                <when test='pd.roleLevel == "2"'>
-                    <if test="pd.FIRE_POINT_ID != null and pd.FIRE_POINT_ID != ''">
-                        AND cp.FIRE_POINT_ID = #{pd.FIRE_POINT_ID}
-                    </if>
-                </when>
-            </choose>
-        </if>
-        GROUP BY
-        FIRE_CHECK_ID
-        order by fr. CREATTIME
-    </select>
 
 </mapper>
diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml
index b8ffb1ba..cc6123ea 100644
--- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml
@@ -34,7 +34,7 @@
 
 	<!--表名 -->
 	<sql id="tableName">
-		SYS_MENU
+		sys_menu2
 	</sql>
 
 	<!-- 字段 -->