修改监控调阅

project_data/sql/0.0.2/soc/soc.sql

@@ -151,6 +151,7 @@ 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 = '外包评价任务绑定内容';
@@ -1744,7 +1745,7 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 
 
-DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type','evaluate_cycle');
+DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type','evaluate_cycle','evaluate_type');
 INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES ( 0, '每月', '0', 'evaluate_cycle', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/AppCoreMonitoringRetrievalTaskVO.java

@@ -0,0 +1,13 @@
+package com.xunmei.common.core.domain.retrieval.vo;
+
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/23
+ */
+@Data
+public class AppCoreMonitoringRetrievalTaskVO extends CoreMonitoringRetrievalTask {
+    private Integer isExist;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -40,7 +40,12 @@ public class CoreEvaluateTaskController extends BaseController {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
 
-
+    @ApiOperation(value = "统计")
+    @RequiresPermissions("core:task:list")
+    @GetMapping("/statistics")
+    public TableDataInfo<CoreEvaluateTaskVO> statistics(EvaluateTaskDTO coreEvaluateTask) {
+        return coreEvaluateTaskService.selectPage(coreEvaluateTask);
+    }
     /**
      * 获取外包评价任务详细信息
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/domain/CoreEvaluateTask.java

@@ -24,104 +24,124 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_evaluate_task")
-@ApiModel(value = "CoreEvaluateTask对象" , description = "外包评价任务")
-public class CoreEvaluateTask extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "CoreEvaluateTask对象", description = "外包评价任务")
+public class CoreEvaluateTask extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 评价计划id */
-            @ApiModelProperty(value = "评价计划id")
+    /**
+     * 评价计划id
+     */
+    @ApiModelProperty(value = "评价计划id")
     private Long planId;
 
-    /** 机构id */
-            @ApiModelProperty(value = "机构id")
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
     private Long orgId;
-            @ApiModelProperty(value = "评价人")
-private String evaluateBy;
-    /** 状态0待1中2完成 */
-            @ApiModelProperty(value = "状态0待1中2完成")
+    @ApiModelProperty(value = "评价人")
+    private String evaluateBy;
+    /**
+     * 状态0待1中2完成
+     */
+    @ApiModelProperty(value = "状态0待1中2完成")
     private String status;
 
-    /** 机构名称 */
-            @ApiModelProperty(value = "机构名称")
+    /**
+     * 机构名称
+     */
+    @ApiModelProperty(value = "机构名称")
     private String orgName;
-            @ApiModelProperty(value = "机构路径")
-            private String orgPath;
-    /** 外包评价名称 */
-            @ApiModelProperty(value = "外包评价名称")
+    @ApiModelProperty(value = "机构路径")
+    private String orgPath;
+    /**
+     * 外包评价名称
+     */
+    @ApiModelProperty(value = "外包评价名称")
     private String evaluateName;
-            @ApiModelProperty(value = "角色")
-private String roleName;
-    /** 是否删除 */
-            @ApiModelProperty(value = "是否删除")
+    @ApiModelProperty(value = "角色")
+    private String roleName;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /** 开始时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "开始时间")
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
-    /** 结束时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "结束时间")
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
-    /** 完成时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "完成时间")
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "完成时间")
     private Date completeTime;
-            @ApiModelProperty(value = "周期")
-          private String evaluateCycle;
-            @ApiModelProperty(value = "周期")
-            private String evaluateOrg;
-@Override
-public String toString(){
+    @ApiModelProperty(value = "周期")
+    private String evaluateCycle;
+    @ApiModelProperty(value = "被评价机构名称")
+    private String evaluateOrg;
+
+    @Override
+    public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("planId" ,getPlanId())
+                .append("planId", getPlanId())
 
 
-                .append("orgId" ,getOrgId())
+                .append("orgId", getOrgId())
 
 
-                .append("status" ,getStatus())
+                .append("status", getStatus())
 
 
-                .append("orgName" ,getOrgName())
+                .append("orgName", getOrgName())
 
 
-                .append("evaluateName" ,getEvaluateName())
+                .append("evaluateName", getEvaluateName())
 
 
-                .append("createTime" ,getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("updateTime" ,getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("isDeleted" ,getIsDeleted())
+                .append("isDeleted", getIsDeleted())
 
 
-                .append("startTime" ,getStartTime())
+                .append("startTime", getStartTime())
 
 
-                .append("endTime" ,getEndTime())
+                .append("endTime", getEndTime())
 
 
-                .append("completeTime" ,getCompleteTime())
+                .append("completeTime", getCompleteTime())
 
 
-                .append("createBy" ,getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("updateBy" ,getUpdateBy())
-        .toString();
-        }
-        }
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

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

@@ -146,9 +146,16 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
             coreEvaluatePlanContent.setEvaluateId(planId);
             coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         });
-  /*      if (coreEvaluatePlanDTO.getBuildTaskNow()) {
-            this.distribute(planId);
-        }*/
+        //固定
+        CoreEvaluateContent coreEvaluateContent=new CoreEvaluateContent();
+        coreEvaluateContent.setCode(1L);
+        coreEvaluateContent.setContentType("1");
+        coreEvaluateContent.setContent("被评价外包公司名称");
+        coreEvaluateContentMapper.insert(coreEvaluateContent);
+        CoreEvaluatePlanContent coreEvaluatePlanContent = new CoreEvaluatePlanContent();
+        coreEvaluatePlanContent.setContentId(coreEvaluateContent.getId());
+        coreEvaluatePlanContent.setEvaluateId(planId);
+        coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         return insert;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateStatisticsVO.java

@@ -0,0 +1,17 @@
+package com.xunmei.core.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/23
+ */
+@Data
+public class CoreEvaluateStatisticsVO {
+    private Long id;
+    @ApiModelProperty(value = "评价机构")
+    private String orgName;
+    @ApiModelProperty(value = "被评价机构名称")
+    private String evaluateOrg;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.retrieval.controller;
 
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.xunmei.common.core.domain.retrieval.vo.AppCoreMonitoringRetrievalTaskVO;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -52,7 +53,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     @ApiOperation(value = "app查询调阅任务列表")
     //  @RequiresPermissions("core:task:list")
     @GetMapping("/selectListApp")
-    public TableDataInfo<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
+    public TableDataInfo<AppCoreMonitoringRetrievalTaskVO> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         return coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -7,10 +7,7 @@ import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
-import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskExcelVo;
-import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
-import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
-import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
+import com.xunmei.common.core.domain.retrieval.vo.*;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -78,7 +75,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     Page<CoreMonitoringRetrievalTaskVo> selectPageList(@Param("page") Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
 
-    Page<CoreMonitoringRetrievalTask> selectListApp(Page<CoreMonitoringRetrievalTask> page, @Param("request") CoreMonitoringTaskRegistrationDTO request);
+    Page<AppCoreMonitoringRetrievalTaskVO> selectListApp(Page<CoreMonitoringRetrievalTask> page, @Param("request") CoreMonitoringTaskRegistrationDTO request);
 
     List<TaskDataVo> selectTaskDataVoListByRetrievalTaskId(@Param("taskId") Long id);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -147,7 +147,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
-        Page<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
+        Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
         TableDataInfo<CoreMonitoringRetrievalTask> tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);

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

@@ -130,23 +130,40 @@
         order by a.plan_start_time desc,a.plan_end_time desc,a.org_id asc,a.order_num asc
     </select>
     <select id="selectListApp"
-            resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+            resultType="com.xunmei.common.core.domain.retrieval.vo.AppCoreMonitoringRetrievalTaskVO">
         SELECT
-        *
+        IF
+        (
+        IF
+        ( COUNT( b.id ) > 0, 1, 0 )+
+        IF
+        ( COUNT( c.id ) > 0, 1, 0 )= 2,
+        1,
+        0
+        ) as isExist,
+        a.*
         FROM
-        core_monitoring_retrieval_task
+        core_monitoring_retrieval_task a
+        LEFT JOIN sys_device b ON a.org_id = b.org_id
+        AND b.del_flag = '0'
+        AND b.device_type = '0'
+        LEFT JOIN sys_device c ON c.org_id = a.org_id
+        AND c.del_flag = '0'
+        AND c.device_type = '2'
         WHERE 1=1 and is_deleted=0
         <if test="request.orgId != null ">
-            and org_id = #{request.orgId}
+            and a.org_id = #{request.orgId}
         </if>
         <if test="request.status !=null and request.status !='' ">
-            and status =#{request.status}
+            and a.status =#{request.status}
         </if>
         <if test="request.moth !=null">
-            and ymd_date like concat('%', #{request.moth}, '%')
+            and a.ymd_date like concat('%', #{request.moth}, '%')
         </if>
-        ORDER BY FIELD(`status`,'1','0','2','3'),
-        create_time DESC
+        GROUP BY
+        a.id
+        ORDER BY FIELD(a.`status`,'1','0','2','3'),
+        a.create_time DESC
     </select>
     <select id="selectTaskDataVoListByRetrievalTaskId"
             resultType="com.xunmei.common.core.domain.retrieval.vo.TaskDataVo">