工作台的监控调阅判断是否有视频

project_data/sql/0.0.2/soc/soc.sql

@@ -151,7 +151,6 @@ CREATE TABLE `core_evaluate_task_content` (
                                               `code` BIGINT DEFAULT NULL COMMENT '编号',
                                               `content_type` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价类型',
                                               `content` VARCHAR ( 1000 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '内容',
-                                                  `company` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '被评价公司名称',
                                               `score` VARCHAR ( 1000 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价评分',
                                               PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '外包评价任务绑定内容';

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -37,8 +37,8 @@ public class PanelListVo {
     @ApiModelProperty(value = "评优状态",notes = "仅演练使用该字段")
     private Integer recStatus;
 
-
-
+    @ApiModelProperty(value = "是否存在监控",notes = "0不存在1存在")
+    private Integer isExist;
 
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -74,4 +74,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return Page
      */
     TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
+
 }

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -490,8 +490,22 @@
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-     select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status
-        from core_monitoring_retrieval_task t where t.org_id =#{request.orgId} and  t.role_id in
+     select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,
+        IF
+        (
+        IF
+        ( COUNT( b.id ) > 0, 1, 0 )+
+        IF
+        ( COUNT( c.id ) > 0, 1, 0 )= 2,
+        1,
+        0
+        ) AS isExist
+        from core_monitoring_retrieval_task t 	LEFT JOIN sys_device b ON t.org_id = b.org_id
+        AND b.del_flag = '0'
+        AND b.device_type = '0'
+        LEFT JOIN sys_device c ON c.org_id = t.org_id
+        AND c.del_flag = '0'
+        AND c.device_type = '2'  where t.org_id =#{request.orgId} and  t.role_id in
          <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
          </foreach>
@@ -507,7 +521,7 @@
                 or (
                 #{request.startTime} >= t.plan_start_time
                 and #{request.endTime}  <![CDATA[<=]]>  t.plan_end_time
-             ))
+             ))GROUP BY t.id
     </select>
     <select id="selectTaskByTime" resultType="java.lang.Long">
         SELECT * FROM core_monitoring_retrieval_task WHERE `status`=1 AND start_time LIKE  concat(#{dateTime}, '%')