From f629b3535135815245293ad0b2adbf337c04aed3 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Thu, 5 Sep 2024 09:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E7=82=B9=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppFireRecordController.java          | 16 ++++++
 .../firemanager/FireRecordMapper.java         |  1 +
 .../firemanager/FireRecordService.java        |  1 +
 .../impl/FireRecordServiceImpl.java           |  5 ++
 .../firemanager/FireRecordMapper.xml          | 53 +++++++++++++++++++
 5 files changed, 76 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
index 69587a87..4b99ab52 100644
--- a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
+++ b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
@@ -194,6 +194,22 @@ public class AppFireRecordController extends BaseController {
         map.put("varList", res);
         return map;
     }
+
+    @RequestMapping("getCheckRecordListV3")
+    @ResponseBody
+    public Object getCheckRecordListV3(Page page) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = getPageData();
+        page.setPd(pd);
+        List<PageData> res = fireRecordService.getCheckListByAppV3(page);
+//        List<PageData> res = fireRecordService.getCheckRecordList(pd);
+        map.put("result", errInfo);
+        map.put("page", page);
+        map.put("varList", res);
+        return map;
+    }
+
     /**
      * @Description: 清单下的检查记录
      * @Author: dearLin
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 cfe481a5..835d5d51 100644
--- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
@@ -89,6 +89,7 @@ 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 982a1b70..799c900b 100644
--- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
+++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
@@ -80,6 +80,7 @@ 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 771b1771..45aecea5 100644
--- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
+++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
@@ -723,6 +723,11 @@ 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/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
index 29996134..bd0a81ec 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
@@ -1031,5 +1031,58 @@
             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>