From bc8002876ba90c063479344da5026a6bea2d7a67 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Sat, 14 Sep 2024 09:50:07 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppFireRecordController.java          | 15 ++++++
 .../firemanager/FireRecordMapper.java         |  2 +
 .../firemanager/FireRecordService.java        |  2 +
 .../impl/FireRecordServiceImpl.java           |  5 ++
 .../firemanager/FireRecordMapper.xml          | 53 +++++++++++++++++++
 5 files changed, 77 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..13765cf4 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,21 @@ 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..abf8fc57 100644
--- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
@@ -121,4 +121,6 @@ public interface FireRecordMapper {
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
 
     PageData getPhotoUploadMethod(PageData pageData);
+
+    List<PageData> datalistPageV3(Page page);
 }
diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
index 982a1b70..e10279e6 100644
--- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
+++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
@@ -142,4 +142,6 @@ public interface FireRecordService {
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
 
     PageData getPhotoUploadMethod(PageData pageData);
+
+    List<PageData> getCheckListByAppV3(Page page);
 }
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..3c7fbdcc 100644
--- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
+++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
@@ -799,4 +799,9 @@ public class FireRecordServiceImpl implements FireRecordService {
     public PageData getPhotoUploadMethod(PageData pageData) {
         return fireRecordMapper.getPhotoUploadMethod(pageData);
     }
+
+    @Override
+    public List<PageData> getCheckListByAppV3(Page page) {
+        return fireRecordMapper.datalistPageV3(page);
+    }
 }
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>