zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceJobTimeoutDto.java

@@ -68,7 +68,7 @@ public class EnforceJobTimeoutDto {
     /**
      * 检查期限
      */
-    @Excel(name = "检查期限")
+    @Excel(name = "检查期限",dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "检查期限")
     private Date lastEnforceDate;

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforcementJobProcessDTO.java

@@ -52,7 +52,7 @@ public class EnforcementJobProcessDTO {
     /**
      * 结束执行任务时间
      */
-    @Excel(name = "结束执行任务时间")
+    @Excel(name = "结束执行任务时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "结束执行任务时间")
     private Date finishTime;

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceEvaluateController.java

@@ -1,14 +1,12 @@
 package com.zfjg.manage.controller.enforce.job;
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.utils.StringUtils;
 import com.zfjg.common.core.utils.poi.ExcelUtil;
 import com.zfjg.common.core.web.page.TableInfo;
-import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordDTO;
-import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordQuery;
-import com.zfjg.manage.api.dto.enforce.job.EnforceEvaluateDTO;
-import com.zfjg.manage.api.dto.enforce.job.EnforceEvaluateQuery;
+import com.zfjg.manage.api.dto.enforce.job.*;
 import com.zfjg.manage.api.vo.enforce.job.WReportDeductVo;
 import com.zfjg.manage.service.enforce.job.IEnforceDeductRecordService;
 import io.swagger.annotations.Api;
@@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.zfjg.common.core.utils.PageUtils.startPage;
@@ -38,6 +37,7 @@ class EnforceEvaluateController {
     @ApiOperation(value = "查询执法考评列表（不分页）")
     @GetMapping("/evaluate/list")
     public R<List<EnforceEvaluateDTO>> getList(EnforceEvaluateQuery query) {
+        getOrgIds(query);
         getTime(query);
         List<EnforceEvaluateDTO> list = enforceDeductRecordService.selectEvaluateList(query);
         return R.ok(list);
@@ -47,6 +47,7 @@ class EnforceEvaluateController {
     @ApiOperation(value = "执法过错扣分列表(分页)")
     @GetMapping("/wreport/list")
     public TableInfo<WReportDeductVo> getWreportList(EnforceEvaluateQuery query) {
+        getOrgIds(query);
         startPage();
         List<WReportDeductVo> wReportList = enforceDeductRecordService.selectWreportList(query);
         return new TableInfo<>(wReportList);
@@ -56,6 +57,7 @@ class EnforceEvaluateController {
     @ApiOperation(value="执法过错扣分列表导出")
     @GetMapping("/wreport/list/export")
     public void export(HttpServletResponse response, EnforceEvaluateQuery query) {
+        getOrgIds(query);
         List<WReportDeductVo> list = enforceDeductRecordService.selectWreportList(query);
         ExcelUtil<WReportDeductVo> util = new ExcelUtil<WReportDeductVo>(WReportDeductVo.class);
         util.exportExcel(response, list, "执法过错扣分列表", "执法过错扣分列表");
@@ -120,6 +122,12 @@ class EnforceEvaluateController {
     }
 
 
+    public void getOrgIds(EnforceEvaluateQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getEnforceOrgId())) {
+            query.setEnforceOrgIds(Arrays.asList(query.getEnforceOrgId().split(",")));
+        }
+        query.setEnforceOrgId(null);
+    }
 }
 
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceSuperviseController.java

@@ -37,6 +37,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "获取执法记录全过程")
     @GetMapping("/enforcement/process")
     public R<List<EnforcementOrgProcess>> selectEnforcementProcess(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforcementOrgProcess> enforcementProcess = enforceSuperviseMapper.selectEnforcementProcess(query);
         return R.ok(enforcementProcess);
     }
@@ -45,6 +46,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "获取执法记录全过程导出")
     @GetMapping(value = "/enforcement/process/export")
     public void selectEnforcementProcessExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforcementOrgProcess> enforcementProcess = enforceSuperviseMapper.selectEnforcementProcess(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(enforcementProcess)) {
             return;
@@ -59,6 +61,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "获取执法记录全过程的任务列表(分页)")
     @GetMapping("/enforcement/process/joblist")
     public TableInfo<EnforcementJobProcessDTO> getEnforcementJobProcessList(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         startPage();
         List<EnforcementJobProcessDTO> list = enforceSuperviseMapper.getEnforcementJobProcessList(query);
         return new TableInfo<>(list);
@@ -67,12 +70,15 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "获取执法记录全过程的任务列表导出")
     @GetMapping(value = "/enforcement/process/joblist/export")
     public void getEnforcementJobProcessListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforcementJobProcessDTO> list = enforceSuperviseMapper.getEnforcementJobProcessList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
             return;
         }
         list.forEach(e -> {
             e.setRelate(e.getRelate());
+            e.setEnforceResultName(e.getEnforceResultName());
+            e.setJobTypeName(e.getJobTypeName());
         });
         ExcelUtil<EnforcementJobProcessDTO> util = new ExcelUtil<EnforcementJobProcessDTO>(EnforcementJobProcessDTO.class);
         util.exportExcel(response, list, "执法全过程记录列表", "执法全过程记录列表");
@@ -81,6 +87,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期列表(分页)")
     @GetMapping("/enforcement/timeout/joblist")
     public TableInfo<EnforceJobTimeoutDto> getEnforcementJobTimeOutList(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         startPage();
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
         return new TableInfo<>(list);
@@ -89,6 +96,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期列表导出")
     @GetMapping(value = "/enforcement/timeout/joblist/export")
     public void getEnforcementJobTimeOutListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
             return;
@@ -105,6 +113,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期")
     @GetMapping("/enforcement/timeout")
     public R<List<EnforceOrgTimeoutDto>> selectEnforceTimeout(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforcementOrgInfo> orglist = enforceSuperviseMapper.selectOrgInfoList(query.getEnforceOrgId(),query.getEnforceOrgIds());
         Map<String, String> orgmap = orglist.stream() .collect(Collectors.toMap( EnforcementOrgInfo::getOrgId, EnforcementOrgInfo::getOrgName));
         List<EnforceOrgTimeoutDto> enforceOrgTimeoutDtos = new ArrayList<>();
@@ -138,6 +147,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期导出")
     @GetMapping(value = "/enforcement/timeout/export")
     public void selectEnforceTimeoutExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforceOrgTimeoutDto> enforceTimeouts = enforceSuperviseMapper.selectEnforceTimeout(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(enforceTimeouts)) {
             return;
@@ -149,6 +159,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查时长")
     @GetMapping("/enforcement/average-time")
     public R<List<EnforceOrgAverageTimeDto>> selectEnforceAverageTime(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforceOrgAverageTimeDto> enforceAverageTimes = enforceSuperviseMapper.selectEnforceAverageTime(query);
         EnforceOrgAverageTimeDto enforceAverageTimeDto = new EnforceOrgAverageTimeDto();
         enforceAverageTimeDto.setOrgName("重庆市消防救援总队");
@@ -178,6 +189,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查时长导出")
     @GetMapping(value = "/enforcement/average-time/export")
     public void selectEnforceAverageTimeExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         List<EnforceOrgAverageTimeDto> enforceAverageTimes = enforceSuperviseMapper.selectEnforceAverageTime(query);
         EnforceOrgAverageTimeDto enforceAverageTimeDto = new EnforceOrgAverageTimeDto();
         enforceAverageTimeDto.setOrgName("重庆市消防救援总队");
@@ -214,6 +226,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查时长列表（分页）")
     @GetMapping("/enforcement/org/average-time")
     public TableInfo<EnforcementJobAverageTimeDTO> selectEnforceJobAverageTime(EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         getTypeName(query);
         startPage();
         List<EnforcementJobAverageTimeDTO> list = enforceSuperviseMapper.selectEnforceJobAverageTime(query);
@@ -224,6 +237,7 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查时长列表导出")
     @GetMapping(value = "/enforcement/org/average-time/export")
     public void selectEnforceJobAverageTimeExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        getOrgIds(query);
         getTypeName(query);
         List<EnforcementJobAverageTimeDTO> list = enforceSuperviseMapper.selectEnforceJobAverageTime(query);
         ExcelUtil<EnforcementJobAverageTimeDTO> util = new ExcelUtil<EnforcementJobAverageTimeDTO>(EnforcementJobAverageTimeDTO.class);
@@ -234,6 +248,13 @@ public class EnforceSuperviseController {
         util.exportExcel(response, list, "检查时长列表", "检查时长列表");
     }
 
+    public void getOrgIds(EnforcementJobProcessQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getEnforceOrgId())) {
+            query.setEnforceOrgIds(Arrays.asList(query.getEnforceOrgId().split(",")));
+        }
+        query.setEnforceOrgId(null);
+    }
+
     public void getTypeName(EnforcementJobProcessQuery query){
         if (ObjectUtils.isNotEmpty(query.getJobType())) {
             switch (query.getJobType()) {

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -19,6 +19,12 @@
             <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                 and a.enforce_org_id = #{pm.enforceOrgId}
             </if>
+            <if test="pm.enforceOrgIds !=null and pm.enforceOrgIds.size>0">
+                and a.enforce_org_id in
+                <foreach item="item" index="i" collection="pm.enforceOrgIds" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="pm.startDate != null and pm.startDate !=''">
                 AND a.deduct_time <![CDATA[ >= ]]> #{pm.startDate}
             </if>
@@ -133,6 +139,12 @@
             <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                 and org_id = #{pm.enforceOrgId}
             </if>
+            <if test="pm.enforceOrgIds !=null and pm.enforceOrgIds.size>0">
+                and org_id in
+                <foreach item="item" index="i" collection="pm.enforceOrgIds" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="pm.startDate != null and pm.startDate !=''">
                 AND s_time <![CDATA[ >= ]]> #{pm.startDate}
             </if>