From 46c0be4ad0028db3d9a41e29d9a5b46ab46056a0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 18:17:46 +0800
Subject: [PATCH] 省厅标签拆分2

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml                   |    5 -
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                     |  141 +--------------------------
 ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java                       |    1 
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java              |    2 
 ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java             |   14 --
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/TMonitorExp.java           |    4 
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                    |  100 ++-----------------
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |    2 
 8 files changed, 28 insertions(+), 241 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/TMonitorExp.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/TMonitorExp.java
index a5edb27..d74e23c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/TMonitorExp.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/TMonitorExp.java
@@ -53,7 +53,9 @@
      */
     @Excel(name = "鏍囩")
     private String tag;
-    private Boolean provinceTag;
+    private Boolean provinceTagVideo;
+    private Boolean provinceTagCar;
+    private Boolean provinceTagFace;
     private Boolean deptTag;
     private Boolean importantTag;
     private Boolean importantCommandImageTag;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 1cdc1eb..821a478 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -57,8 +57,6 @@
     @Excel(name = "璁惧缂栧彿",sort = 2)
     private String serialNumber;
 
-    private Boolean provinceTag;
-
     private Boolean importantTag;
 
     private Boolean importantCommandImageTag;
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
index a17659f..a08b230 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -36,21 +36,12 @@
 
     IPage page(IPage<YwPointVO> page, @Param("query") YwPointQuery query);
 
-    IPage dataCenterPage(IPage<PointDetailVO> page, @Param("query") DataCenterQuery query);
 
     /**
      * 棣栭〉鍒版湡棰勮
      * @return 鏁版嵁
      */
     List<YwPoint> home();
-
-    /**
-     * 閫氳繃鏍囩鏌ラ噸鐐圭偣浣嶆垨鐪佸巺鐐逛綅鎴栭噸鐐规寚鎸ュ浘鍍�
-     */
-    List<YwPoint> selectByTag(@Param("important")Boolean important,
-                              @Param("province")Boolean province,
-                              @Param("commandImage")Boolean commandImage,
-                              @Param("deptTag") Boolean deptTag);
 
     /**
      * 瀵煎嚭鏁版嵁
@@ -118,11 +109,6 @@
      */
     List<CheckTagVO> getTagsByGB(@Param("gbList") List<String> gbList);
 
-    /**
-     * 鏌ヨ璁惧鎬绘暟
-     * @return
-     */
-    Integer distinctCount(@Param("query") DataCenterQuery query);
 
     /**
      * 璁惧鏁伴噺
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index d353ed2..39f5366 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -897,7 +897,7 @@
                 String type = car.replaceAll("3", "浜鸿劯");
                 monitor.setCameraFunType(type);
             }
-            StringBuilder tag = new StringBuilder("" + (monitor.getProvinceTag() ? "鐪佸巺銆�" : "") + (monitor.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (monitor.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (monitor.getDeptTag() ? "閮ㄧ骇銆�" : ""));
+            StringBuilder tag = new StringBuilder("" + (monitor.getProvinceTagVideo() ? "鐪佸巺瑙嗛銆�" : "") + (monitor.getProvinceTagCar() ? "鐪佸巺杞﹁締銆�" : "")+ (monitor.getProvinceTagFace() ? "鐪佸巺浜鸿劯銆�" : "")+ (monitor.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (monitor.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (monitor.getDeptTag() ? "閮ㄧ骇銆�" : ""));
             //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
             if (!CollectionUtils.isEmpty(monitor.getDynamicColumnList())) {
                 List<DynamicColumnVO> dynamicColumnList = monitor.getDynamicColumnList();
diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index 5b8b350..4c575fb 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -49,6 +49,7 @@
         if (checkTemplate != null) {
             Short examineCategory = checkTemplate.getExamineCategory();
             Short examineTag = checkTemplate.getExamineTag();
+            //鐢ㄤ簬琛ュ厖鏁伴噺
             List<YwPointVO> pointVOS= pointMapper.selectToCount(examineCategory, examineTag);
             //鏌ユ潈閲�
             CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 42bcced..3fd35dc 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -38,28 +38,6 @@
         <result property="lxbm" column="lxbm"/>
         <result property="deviceType" column="device_type"/>
     </resultMap>
-    <!-- TODO -->
-    <resultMap id="monitorMap" type="com.ycl.platform.domain.result.SYS.TMonitorResult">
-        <result column="m.id" property="id"/>
-        <result column="no" property="no"/>
-        <result column="m.name" property="name"/>
-        <result column="monitorType" property="monitorType"/>
-        <result column="d.dept_id" property="deptId"/>
-        <result column="p.province_tag" property="provinceTag"/>
-        <result column="p.important_tag" property="importantTag"/>
-        <result column="p.important_command_image_tag" property="importantCommandImageTag"/>
-        <result column="p.dept_tag" property="deptTag"/>
-        <result column="p.online" property="online"/>
-        <collection property="dynamicColumnList" select="getDyColumns"
-                    column="{pid=pid,tableName=tableName}"
-                    ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>
-    </resultMap>
-
-    <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
-        <result column="prop_name" property="propName"/>
-        <result column="label_value" property="labelValue"/>
-        <result column="column_value" property="columnValue"/>
-    </resultMap>
 
     <sql id="selectTMonitorVo">
         select id,
@@ -117,7 +95,7 @@
             #{number}
         </foreach>
     </select>
-    <!-- TODO -->
+
     <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
         select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
         camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag_video,p.province_tag_car,p.province_tag_face,p.dept_tag,
@@ -183,10 +161,10 @@
             ${params.dataScope}
         </where>
     </select>
-    <!-- TODO -->
+
     <select id="exportTMonitorList" resultType="com.ycl.platform.domain.excel.TMonitorExp">
         select m.id, m.serial_number, name, ip, camera_fun_type,p.online as onState,
-        d.dept_name, p.id as pointId,p.province_tag,p.dept_tag,p.important_tag,p.important_command_image_tag,u.unit_name as managementUnit
+        d.dept_name, p.id as pointId,p.province_tag_video,p.province_tag_car,p.province_tag_face,p.dept_tag,p.important_tag,p.important_command_image_tag,u.unit_name as managementUnit
         from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
         left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
@@ -200,7 +178,9 @@
                 or m.serial_number like concat('%', #{name}, '%')
                 or u.unit_name like concat('%', #{name}, '%'))
             </if>
-            <if test="provinceTag != null ">and p.province_tag = #{provinceTag}</if>
+            <if test="provinceTag != null and cameraFunType==1">and p.province_tag_video = #{provinceTag}</if>
+            <if test="provinceTag != null and cameraFunType==2">and p.province_tag_car = #{provinceTag}</if>
+            <if test="provinceTag != null and cameraFunType==3">and p.province_tag_face = #{provinceTag}</if>
             <if test="deptTag != null ">and p.dept_tag = #{deptTag}</if>
             <if test="cameraFunType != null  and cameraFunType != ''">and camera_fun_type like concat('%',
                 #{cameraFunType}, '%')
@@ -209,20 +189,23 @@
             <if test="civilCode != null  and civilCode != ''">and civil_code = #{civilCode}</if>
         </where>
     </select>
-    <!-- TODO -->
     <select id="selectMonitorVOList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
         select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
         camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
         public_security, installed_time, management_unit, mu_contact_info, storage_days
         , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
-        camera_dept, hybm, lxbm,d.dept_id, d.dept_name,p.province_tag,p.dept_tag from t_monitor m
+        camera_dept, hybm, lxbm,d.dept_id, d.dept_name,
+        CASE
+            WHEN p.provnce_tag_video = 1 OR p.provnce_tag_car = 1 OR p.provnce_tag_face = 1 THEN 1
+            ELSE 0
+        END AS province_tag,p.dept_tag
+        from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id
     </select>
-    <!-- TODO -->
     <select id="selectMonitorResult" resultType = "com.ycl.platform.domain.result.SYS.TMonitorResult">
         select m.id, m.serial_number as no,m.name,m.camera_fun_type as monitorType,
-        d.dept_id,p.province_tag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online,p.id as pointId
+        d.dept_id,p.province_tag_video as provinceTag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online,p.id as pointId
         from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id
@@ -238,7 +221,7 @@
             </foreach>
             </if>
             <if test="provinceTag!=null">
-                and p.province_tag = #{provinceTag}
+                and p.province_tag_video = #{provinceTag}
             </if>
             <if test="importantTag!=null">
                 and p.important_tag = #{importantTag}
@@ -533,7 +516,6 @@
         LEFT JOIN t_yw_point p3 ON t_monitor.serial_number = p3.serial_number  AND p3.examine_status = 1 AND p3.online = 1  AND p1.id = p3.id<if test="dataScope == 1"> AND p3.province_tag_face = 1 </if><if test="dataScope == 3"> AND p3.dept_tag = 1 </if><if test="deptId != null"> AND p3.dept_id = #{deptId} </if>
         WHERE INSTR(camera_fun_type, 3)
     </select>
-    <!-- TODO -->
     <select id="monitorRate" resultType="com.ycl.platform.domain.vo.screen.MonitorRateVO">
         SELECT
             *
@@ -645,60 +627,6 @@
             </if>
         </where>
     </select>
-
-<!--    <select id="getDyColumns" resultMap="dynamicColumnMap">-->
-<!--        SELECT-->
-<!--               *-->
-<!--        FROM-->
-<!--             t_dynamic_column_value dcv-->
-<!--                 LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}-->
-<!--        WHERE-->
-<!--            dcv.ref_id = #{id}-->
-<!--            <if test="keyword != null and keyword != ''">-->
-<!--                and dcv.column_value like concat('%', #{keyword}, '%')-->
-<!--            </if>-->
-<!--    </select>-->
-
-<!--    <resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">-->
-<!--        <id column="id" property="id"/>-->
-<!--        <result column="serial_number" property="serialNumber"/>-->
-<!--        <result column="name" property="name"/>-->
-<!--        <result column="site_type" property="siteType"/>-->
-<!--        <result column="mac_addr" property="macAddr"/>-->
-<!--        <result column="ip" property="ip"/>-->
-<!--        <result column="longitude" property="longitude"/>-->
-<!--        <result column="latitude" property="latitude"/>-->
-<!--        <result column="camera_capture_area" property="cameraCaptureArea"/>-->
-<!--        <result column="camera_fun_type" property="cameraFunType"/>-->
-<!--        <result column="on_state" property="onState"/>-->
-<!--        <result column="civil_code" property="civilCode"/>-->
-<!--        <result column="integrated_device" property="integratedDevice"/>-->
-<!--        <result column="camera_brand" property="cameraBrand"/>-->
-<!--        <result column="address" property="address"/>-->
-<!--        <result column="public_security" property="publicSecurity"/>-->
-<!--        <result column="installed_time" property="installedTime"/>-->
-<!--        <result column="management_unit" property="managementUnit"/>-->
-<!--        <result column="mu_contact_info" property="muContactInfo"/>-->
-<!--        <result column="storage_days" property="storageDays"/>-->
-<!--        <result column="monitor_azimuth" property="monitorAzimuth"/>-->
-<!--        <result column="scene_photo_addr" property="scenePhotoAddr"/>-->
-<!--        <result column="model" property="model"/>-->
-<!--        <result column="site_vulgo" property="siteVulgo"/>-->
-<!--        <result column="camera_type" property="cameraType"/>-->
-<!--        <result column="camera_light_type" property="cameraLightType"/>-->
-<!--        <result column="encoded_format" property="encodedFormat"/>-->
-<!--        <result column="camera_dept" property="cameraDept"/>-->
-<!--        <result column="hybm" property="hybm"/>-->
-<!--        <result column="lxbm" property="lxbm"/>-->
-<!--        <collection property="dynamicColumnList" select="getDyColumns" column="{id=id,tableName=tableName,keyword=keyword}" ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>-->
-<!--    </resultMap>-->
-
-<!--    <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">-->
-<!--        <result column="prop_name" property="propName"/>-->
-<!--        <result column="label_value" property="labelValue"/>-->
-<!--        <result column="column_value" property="columnValue"/>-->
-<!--    </resultMap>-->
-
 
     <delete id="deleteAll">
         delete from t_monitor
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 112848c..4eb03d6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -149,7 +149,6 @@
         p.yw_person_name
         ORDER BY wo.work_order_no DESC
     </select>
-    <!-- TODO -->
     <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
         SELECT
         wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,
@@ -157,7 +156,6 @@
         u.unit_name,
         p.yw_person_name,
         yp.serial_number,
-        yp.province_tag,
         yp.important_tag,
         yp.important_command_image_tag,
         odr.create_time as distributeTime,
@@ -205,7 +203,6 @@
         wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
         u.unit_name,
         p.yw_person_name,
-        yp.province_tag,
         yp.important_tag,
         yp.important_command_image_tag,
         odr.create_time,
@@ -213,12 +210,10 @@
         ORDER BY wo.create_time DESC
     </select>
 
-    <!-- TODO -->
     <select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
         SELECT
              wo.id,
              wod.create_time,
-             yp.province_tag,
              yp.important_tag,
              yp.important_command_image_tag
         FROM
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 00c45db..7a95e7d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycl.platform.mapper.YwPointMapper">
-    <!-- TODO -->
-    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.YwPointVO">
-        <result column="id" property="id"/>
-        <result column="point_name" property="pointName"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="unit_id" property="unitId"/>
-        <result column="unit_name" property="unitName"/>
-        <result column="status" property="status"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="dept_name" property="deptName"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="province_tag" property="provinceTag"/>
-        <result column="important_tag" property="importantTag"/>
-        <result column="important_command_image_tag" property="importantCommandImageTag"/>
-        <result column="dept_tag" property="deptTag"/>
-    </resultMap>
 
     <!-- 鍒嗛〉鏄犲皠缁撴灉 -->
     <resultMap id="pageMap" type="com.ycl.platform.domain.vo.YwPointVO">
@@ -52,7 +32,6 @@
         <result column="label_value" property="labelValue"/>
         <result column="column_value" property="columnValue"/>
     </resultMap>
-    <!-- TODO -->
     <select id="page" resultMap="pageMap">
         SELECT
         typ.id,
@@ -102,96 +81,6 @@
 <!--            and dcv.column_value like concat('%', #{pointName}, '%')-->
 <!--        </if>-->
     </select>
-    <!-- TODO -->
-    <select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
-        SELECT
-        m.*
-        FROM
-        t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
-        <where>
-            <if test="query.keyword != null and query.keyword != ''">
-                AND (m.name like concat('%', #{query.keyword}, '%') OR m.serial_number like concat('%',
-                #{query.keyword}, '%'))
-            </if>
-            <if test="query.dataType == 1">
-                AND p.province_tag = 1
-            </if>
-            <if test="query.dataType == 2">
-                AND p.dept_tag = 1
-            </if>
-            <choose>
-                <when test="query.deptTag == 1">
-                    AND p.dept_tag = 1
-                </when>
-                <when test="query.deptTag == 2">
-                    AND p.province_tag = 1
-                </when>
-                <when test="query.deptTag == 3">
-                    AND p.important_tag = 1
-                </when>
-                <when test="query.deptTag == 4">
-                    AND p.important_command_image_tag = 1
-                </when>
-                <when test="query.deptTag == 5">
-                    AND p.new_device = 1
-                </when>
-            </choose>
-            <choose>
-                <when test="query.deviceType == 1">
-                    AND m.camera_fun_type like '%1%'
-                </when>
-                <when test="query.deviceType == 2">
-                    AND m.camera_fun_type like '%2%'
-                </when>
-                <when test="query.deviceType == 3">
-                    AND m.camera_fun_type like '%3%'
-                </when>
-            </choose>
-        </where>
-    </select>
-    <!-- TODO -->
-    <select id="distinctCount" resultType="integer">
-        SELECT
-        count(DISTINCT m.serial_number)
-        FROM
-        t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
-        <where>
-            <if test="query.dataType == 1">
-                AND p.province_tag = 1
-            </if>
-            <if test="query.dataType == 2">
-                AND p.dept_tag = 1
-            </if>
-            <choose>
-                <when test="query.deptTag == 1">
-                    AND dept_tag = 1
-                </when>
-                <when test="query.deptTag == 2">
-                    AND province_tag = 1
-                </when>
-                <when test="query.deptTag == 3">
-                    AND important_tag = 1
-                </when>
-                <when test="query.deptTag == 4">
-                    AND important_command_image_tag = 1
-                </when>
-                <when test="query.deptTag == 5">
-                    AND new_device = 1
-                </when>
-            </choose>
-            <choose>
-                <when test="query.deviceType == 1">
-                    AND m.camera_fun_type like '%1%'
-                </when>
-                <when test="query.deviceType == 2">
-                    AND m.camera_fun_type like '%2%'
-                </when>
-                <when test="query.deviceType == 3">
-                    AND m.camera_fun_type like '%3%'
-                </when>
-            </choose>
-        </where>
-    </select>
 
     <select id="home" resultType="com.ycl.platform.domain.entity.YwPoint">
         <![CDATA[
@@ -204,24 +93,6 @@
                                                         WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
         ORDER BY end_time limit 50
         ]]>
-    </select>
-    <!-- TODO -->
-    <select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
-        select * from t_yw_point
-        <where>
-            <if test="important!=null and important == true ">
-                and important_tag = #{important}
-            </if>
-            <if test="province!=null and province == true ">
-                and province_tag = #{province}
-            </if>
-            <if test="commandImage!=null and commandImage == true ">
-                and important_command_image_tag = #{commandImage}
-            </if>
-            <if test="deptTag !=null and deptTag == true ">
-                and dept_tag = #{deptTag}
-            </if>
-        </where>
     </select>
 
     <select id="export" resultType ="com.ycl.platform.domain.excel.PointExport">
@@ -363,14 +234,20 @@
         GROUP BY
         serial_number, province_tag_face,province_tag_car,province_tag_videogetTagsByGB, important_tag, important_command_image_tag, dept_tag
     </select>
-    <!-- TODO -->
+
     <select id="selectToCount" resultType="com.ycl.platform.domain.vo.YwPointVO">
         select p.* from t_yw_point p
         left join t_monitor m on p.serial_number = m.serial_number
         <where>
             p.examine_status = 1 and m.camera_fun_type like concat('%',#{examineCategory},'%')
-            <if test="examineTag == 0">
-                and p.province_tag = 1
+            <if test="examineTag == 0 and examineCategory ==1" >
+                and p.province_tag_video = 1
+            </if>
+            <if test="examineTag == 0 and examineCategory ==2" >
+                and p.province_tag_car = 1
+            </if>
+            <if test="examineTag == 0 and examineCategory ==3" >
+                and p.province_tag_face = 1
             </if>
             <if test="examineTag == 2">
                 and p.dept_tag = 1

--
Gitblit v1.8.0