预案演练评优列表代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskRecTaskPageVo.java

@@ -0,0 +1,32 @@
+package com.xunmei.common.core.domain.drill.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CoreDrillTaskRecTaskPageVo {
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+    /**
+     * @see com.xunmei.common.core.enums.drill.DrillType
+     * 类型
+     */
+    @ApiModelProperty(value = "演练类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "演练类型名称")
+    private String typeText;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "演练时间")
+    private Date drillTime;
+
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillTaskController.java

@@ -5,6 +5,7 @@ import com.xunmei.common.core.domain.drill.domain.CoreDrillTask;
 import com.xunmei.common.core.domain.drill.dto.*;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecPageVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecTaskPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -113,10 +114,17 @@ public class CoreDrillTaskController extends BaseController {
         return success(coreDrillTaskService.evaluate(request));
     }
 
-    @ApiOperation(value = "优秀案例管理")
+    @ApiOperation(value = "优秀案例管理分页",notes = "尚未被确认的优秀案例")
     @RequiresPermissions("core:drillTask:list")
     @PostMapping("/recList")
     public TableDataInfo<CoreDrillTaskRecPageVo> recList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
         return coreDrillTaskService.recList(request);
     }
+
+    @ApiOperation(value = "优秀案例分页",notes = "已经被确认的优秀案例")
+    @RequiresPermissions("core:drillTask:list")
+    @PostMapping("/recTaskList")
+    public TableDataInfo<CoreDrillTaskRecTaskPageVo> recTaskList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
+        return coreDrillTaskService.recTaskList(request);
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillTaskMapper.java

@@ -8,10 +8,7 @@ import com.xunmei.common.core.domain.drill.domain.CoreDrillTask;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskRecPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskReportDto;
-import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskDetailVo;
-import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskPageVo;
-import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecPageVo;
-import com.xunmei.common.core.domain.drill.vo.CoreDrillTaskReportVo;
+import com.xunmei.common.core.domain.drill.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +34,6 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
     Integer checkHasTaskIsDoneByPlanParentId(@Param("planId") Long planId);
 
     IPage<CoreDrillTaskRecPageVo> selectRecPage(Page<CoreDrillTaskRecPageVo> pageRequest, @Param("request") CoreDrillTaskRecPageDto request, @Param("recStatus") Integer recStatus);
+
+    IPage<CoreDrillTaskRecTaskPageVo> selectRecTaskListPage(Page<Object> pageRequest, @Param("request") CoreDrillTaskRecPageDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillTaskService.java

@@ -92,4 +92,6 @@ public interface ICoreDrillTaskService extends IService<CoreDrillTask> {
 
 
     TableDataInfo<CoreDrillTaskRecPageVo> recList(CoreDrillTaskRecPageDto request);
+
+    TableDataInfo<CoreDrillTaskRecTaskPageVo> recTaskList(CoreDrillTaskRecPageDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -633,6 +633,29 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo<CoreDrillTaskRecTaskPageVo> recTaskList(CoreDrillTaskRecPageDto request) {
+        dealRecListParam(request);
+
+        IPage<CoreDrillTaskRecTaskPageVo> page = coreDrillTaskMapper.selectRecTaskListPage(request.getPageRequest(), request);
+        List<CoreDrillTaskRecTaskPageVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return TableDataInfo.build();
+        }
+        //处理演练任务类型字典
+        final List<SysDictData> drillTypeDictList = DictUtils.getDictCache(DictConstants.CORE_DRILL_TYPE);
+        if (ObjectUtil.isEmpty(drillTypeDictList)){
+            return TableDataInfo.build(page);
+        }
+        for (CoreDrillTaskRecTaskPageVo record : records) {
+            if (record.getType()==null){
+                continue;
+            }
+            drillTypeDictList.stream().filter(dict -> ObjectUtil.equal(dict.getDictValue(), record.getType().toString())).findFirst().ifPresent(dict -> record.setTypeText(dict.getDictLabel()));
+        }
+        return TableDataInfo.build(page);
+    }
+
     private void dealRecListParam(CoreDrillTaskRecPageDto request) {
         //App的查询, App 默认下穿
         request.setCheckSub(true);

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -87,16 +87,16 @@
             <if test="request.startTime != null and request.endTime != null">
                 and (
                 (
-                    #{request.startTime}   <![CDATA[<=]]> t.start_date
+                #{request.startTime}   <![CDATA[<=]]> t.start_date
                 and #{request.endTime}     <![CDATA[>=]]> t.start_date
                 )
                 or
                 (
-                    #{request.startTime}   <![CDATA[<=]]> t.end_date
+                #{request.startTime}   <![CDATA[<=]]> t.end_date
                 and #{request.endTime}     <![CDATA[>=]]> t.end_date
                 )
                 or (
-                    #{request.startTime}   <![CDATA[>=]]> t.start_date
+                #{request.startTime}   <![CDATA[>=]]> t.start_date
                 and #{request.endTime}     <![CDATA[<=]]> t.end_date
                 )
                 )
@@ -229,4 +229,28 @@
             )
         </if>
     </select>
+
+    <select id="selectRecTaskListPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecTaskPageVo">
+        select id,org_name,drill_time,type from core_drill_task t where t.org_path like concat(#{request.orgPath},'%')
+        <if test="request.recStatus!=null">
+            and t.rec_status=#{request.recStatus}
+        </if>
+        <if test="request.startTime != null and request.endTime != null">
+            and (
+            (
+            #{request.startTime}   <![CDATA[<=]]> t.start_date
+            and #{request.endTime}     <![CDATA[>=]]> t.start_date
+            )
+            or
+            (
+            #{request.startTime}   <![CDATA[<=]]> t.end_date
+            and #{request.endTime}     <![CDATA[>=]]> t.end_date
+            )
+            or (
+            #{request.startTime}   <![CDATA[>=]]> t.start_date
+            and #{request.endTime}     <![CDATA[<=]]> t.end_date
+            )
+            )
+        </if>
+    </select>
 </mapper>