导出

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

@@ -3,6 +3,7 @@ package com.zfjg.manage.api.dto.enforce.job;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zfjg.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,27 +27,38 @@ public class EnforceDeductRecordDTO{
     @ApiModelProperty("执法机构ID")
     private String enforceOrgId;
 
+
+    @Excel(name = "执法机构")
     @ApiModelProperty("执法机构名称")
     private String enforceOrgName;
 
     @ApiModelProperty("扣分人员id")
     private String executorId;
 
+    @Excel(name = "扣分人员")
     @ApiModelProperty("扣分人员名称")
     private String executorName;
 
     @ApiModelProperty("扣分来源（SUPERVISE-内部执法监督,REPORT-举报投诉,RECONSIDERATION-复议、诉讼，PATROL-上级巡察、督导、考评,FIREINVESTIGATION-火灾事故调查,OTHER-其他工作中）")
     private String deductResource;
 
+    @Excel(name = "扣分来源")
+    @ApiModelProperty("扣分来源（SUPERVISE-内部执法监督,REPORT-举报投诉,RECONSIDERATION-复议、诉讼，PATROL-上级巡察、督导、考评,FIREINVESTIGATION-火灾事故调查,OTHER-其他工作中）")
+    private String deductResourceName;
+
+
+    @Excel(name = "扣分情形次数")
+    @ApiModelProperty("扣分情形次数")
+    private Integer situationTimes;
+
+    @Excel(name = "扣分分值")
     @ApiModelProperty("扣分分值")
     private Double deductValue;
 
+    @Excel(name = "扣分时间")
     @ApiModelProperty("扣分时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deductTime;
 
-    @ApiModelProperty("扣分情形次数")
-    private Integer situationTimes;
-
 
 }

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

@@ -44,6 +44,8 @@ public class EnforceJobTimeoutDto {
     @Excel(name = "检查员")
     @ApiModelProperty(value = "检察员名称，多个人名字用,隔开，顺序和id的顺序一致")
     private String executorNames;
+    private String executorIds;
+
 
     @Excel(name = "检查对象")
     @ApiModelProperty(value = "检查对象")

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

@@ -39,6 +39,7 @@ public class EnforcementJobProcessDTO {
     @Excel(name = "检查员")
     @ApiModelProperty(value = "检察员名称，多个人名字用,隔开，顺序和id的顺序一致")
     private String executorNames;
+    private String executorIds;
 
     @Excel(name = "检查对象")
     @ApiModelProperty(value = "检查对象")

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/enforce/job/WReportDeductVo.java

@@ -2,6 +2,7 @@ package com.zfjg.manage.api.vo.enforce.job;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zfjg.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,18 +31,22 @@ public class WReportDeductVo implements Serializable {
     @ApiModelProperty("执法机构")
     private String orgId;
 
+    @Excel(name = "执法机构")
     @ApiModelProperty("执法机构名称")
     private String orgName;
 
+    @Excel(name = "过错责任人")
     @ApiModelProperty("过错责任人")
     private String wUser;
 
     @ApiModelProperty("不当履行职责执法过错情形")
     private String wType;
 
+    @Excel(name = "不当履行职责次数")
     @ApiModelProperty("不当履行职责执法过错情形数量")
     private Integer wTypeC = 0;
 
+    @Excel(name = "不当履行职责扣分")
     @ApiModelProperty("不当履行职责执法过错情形扣分")
     private Double wTypeScore = 0D;
 
@@ -50,10 +55,11 @@ public class WReportDeductVo implements Serializable {
     @ApiModelProperty("未履行职责执法过错情形")
     private String nType;
 
+    @Excel(name = "未履行职责次数")
     @ApiModelProperty("未履行职责执法过错情形数量")
     private Integer nTypeC = 0;
 
-
+    @Excel(name = "未履行职责扣分")
     @ApiModelProperty("未履行职责执法过错情形扣分")
     private Double nTypeScore = 0D;
 
@@ -65,14 +71,17 @@ public class WReportDeductVo implements Serializable {
     @ApiModelProperty("处理方式")
     private String dDo;
 
+    @Excel(name = "违法履行职责次数")
     @ApiModelProperty("违法履行职责执法过错情形数量")
     private Integer sTypeC = 0;
 
+    @Excel(name = "违法履行职责扣分")
     @ApiModelProperty("违法履行职责执法过错情形扣分")
     private Double sTypeScore = 0D;
 
     private String sTypeT;
 
+    @Excel(name = "总扣分")
     @ApiModelProperty("执法过错总扣分")
     private Double wrongScore = 0D;
 

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

@@ -2,16 +2,21 @@ package com.zfjg.manage.controller.enforce.job;
 
 
 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.domain.enforce.job.EnforceDeductRecord;
 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.EnforcementJobAverageTimeDTO;
 import com.zfjg.manage.service.enforce.job.IEnforceDeductRecordService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.ApiOperation;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 import static com.zfjg.common.core.utils.PageUtils.startPage;
@@ -64,6 +69,42 @@ public class EnforceDeductRecordController {
         return new TableInfo<>(list);
     }
 
+    @ApiOperation(value="列表导出")
+    @GetMapping("/enforceDeductRecord/page/export")
+    public void export(HttpServletResponse response, EnforceDeductRecordQuery query) {
+        List<EnforceDeductRecordDTO> list = enforceDeductRecordService.selectEnforceDeductRecordList(query);
+        list.forEach(e->{
+            String name = "";
+            if (StringUtils.isNotEmpty(e.getDeductResource())) {
+                switch (e.getDeductResource()) {
+                    case "SUPERVISE":
+                        name="内部执法监督";
+                        break;
+                    case "REPORT":
+                        name="举报投诉";
+                        break;
+                    case "RECONSIDERATION":
+                        name="复议、诉讼";
+                        break;
+                    case "PATROL":
+                        name="上级巡察、督导、考评";
+                        break;
+                    case "FIREINVESTIGATION":
+                        name="火灾事故调查";
+                        break;
+                    case "OTHER":
+                        name="其他工作中";
+                        break;
+                    default:
+                        break;
+                }
+            }
+            e.setDeductResourceName(name);
+        });
+        ExcelUtil<EnforceDeductRecordDTO> util = new ExcelUtil<EnforceDeductRecordDTO>(EnforceDeductRecordDTO.class);
+        util.exportExcel(response, list, "其他扣分情形列表", "其他扣分情形列表");
+    }
+
 }
 
 

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

@@ -2,7 +2,11 @@ package com.zfjg.manage.controller.enforce.job;
 
 
 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.vo.enforce.job.WReportDeductVo;
@@ -12,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -47,6 +52,15 @@ class EnforceEvaluateController {
         return new TableInfo<>(wReportList);
     }
 
+
+    @ApiOperation(value="执法过错扣分列表导出")
+    @GetMapping("/wreport/list/export")
+    public void export(HttpServletResponse response, EnforceEvaluateQuery query) {
+        List<WReportDeductVo> list = enforceDeductRecordService.selectWreportList(query);
+        ExcelUtil<WReportDeductVo> util = new ExcelUtil<WReportDeductVo>(WReportDeductVo.class);
+        util.exportExcel(response, list, "执法过错扣分列表", "执法过错扣分列表");
+    }
+
     public static void main(String[] args) {
         EnforceEvaluateQuery query = new EnforceEvaluateQuery();
         query.setStartDate("2024-10-01 00:00:00");

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

@@ -103,6 +103,7 @@
                     ej.job_type,
                     ej.enforce_result,
                     ej.executor_names,
+                    ej.executor_ids,
                     ej.finish_time,
                     ej.enforce_obj_id,
                     ej.enforce_obj_name,
@@ -180,6 +181,7 @@
         ej.job_no,
         ej.job_type,
         ej.enforce_result,
+        ej.executor_ids,
         ej.executor_names,
         ej.finish_time,
         ej.enforce_obj_id,