linjiawei hace 1 mes
padre
commit
c5b3714274

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

@@ -70,6 +70,15 @@ public class EnforcementJobProcessDTO {
     @Excel(name = "是否关联")
     private String relate;
 
+
+    public void setJobTypeName(String jobTypeName) {
+        this.jobTypeName = ParamTypeUtil.getJobTypeName(this.jobType);
+    }
+
+    public void setEnforceResultName(String enforceResultName) {
+        this.enforceResultName = ParamTypeUtil.getEnforceResultName(this.enforceResult);
+    }
+
     public String getJobTypeName() {
         return ParamTypeUtil.getJobTypeName(this.jobType);
     }

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

@@ -67,7 +67,6 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "获取执法记录全过程的任务列表导出")
     @GetMapping(value = "/enforcement/process/joblist/export")
     public void getEnforcementJobProcessListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
-        startPage();
         List<EnforcementJobProcessDTO> list = enforceSuperviseMapper.getEnforcementJobProcessList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
             return;
@@ -90,7 +89,6 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期列表导出")
     @GetMapping(value = "/enforcement/timeout/joblist/export")
     public void getEnforcementJobTimeOutListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
-        startPage();
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
             return;
@@ -225,7 +223,6 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查时长列表导出")
     @GetMapping(value = "/enforcement/org/average-time/export")
     public void selectEnforceJobAverageTimeExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
-        startPage();
         List<EnforcementJobAverageTimeDTO> list = enforceSuperviseMapper.selectEnforceJobAverageTime(query);
         ExcelUtil<EnforcementJobAverageTimeDTO> util = new ExcelUtil<EnforcementJobAverageTimeDTO>(EnforcementJobAverageTimeDTO.class);
         list.forEach(e -> {