zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportDto.java

@@ -9,37 +9,26 @@ import java.util.List;
 
 @Data
 public class WReportDto {
-    @ApiModelProperty("新增不传ID， 更新才传ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty("执法机构")
     private String orgId;
 
-    @ApiModelProperty("执法机构名称")
     private List<String> orgName;
 
-    @ApiModelProperty("过错责任人")
     private String wUser;
 
-    @ApiModelProperty("不当履行职责执法过错情形")
     private List<String> wrongCategory;
 
-    @ApiModelProperty("未履行职责执法过错情形")
     private List<String> notCategory;
 
-    @ApiModelProperty("违法履行职责执法过错情形")
     private List<String> breakLawCategory;
 
-    @ApiModelProperty("处理方式，多个以逗号分割")
     private List<String> doHandlerCategory;
 
-    @ApiModelProperty("上传文件多文件逗号分割")
     private List<String> files;
 
-    @ApiModelProperty("处理方式")
     private List<String> doHandler;
 
-    @ApiModelProperty("级联数据")
     private String caseData;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportQuery.java

@@ -19,4 +19,6 @@ public class WReportQuery {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
+
+    private String year;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/other/WReportVo.java

@@ -1,6 +1,7 @@
 package com.zfjg.manage.api.vo.other;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zfjg.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,28 +11,26 @@ import java.time.LocalDateTime;
 public class WReportVo {
     private Long id;
 
-    @ApiModelProperty("执法机构")
     private String orgId;
 
-    @ApiModelProperty("执法机构名称")
+    @Excel(name = "执法机构")
     private String orgName;
 
-    @ApiModelProperty("过错责任人")
+    @Excel(name = "过错责任人")
     private String wUser;
 
-    @ApiModelProperty("检查人")
     private String cUser;
 
-    @ApiModelProperty("不当履行职责次数")
+    @Excel(name = "不当履行职责次数")
     private Integer dCount;
 
-    @ApiModelProperty("未履行职责次数")
+    @Excel(name = "未履行职责次数")
     private Integer nCount;
 
-    @ApiModelProperty("违法履行职责次数")
+    @Excel(name = "违法履行职责次数")
     private Integer wCount;
 
-    @ApiModelProperty("处理次数")
+    @Excel(name = "处理次数")
     private Integer aCount;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/WReportController.java

@@ -2,12 +2,19 @@ package com.zfjg.manage.controller.other;
 
 import cn.hutool.core.collection.ListUtil;
 import com.zfjg.common.core.domain.R;
+import com.zfjg.common.core.exception.ServiceException;
 import com.zfjg.common.core.utils.ServletUtils;
+import com.zfjg.common.core.utils.StringUtils;
+import com.zfjg.common.core.utils.bean.BeanUtils;
+import com.zfjg.common.core.utils.poi.ExcelUtil;
 import com.zfjg.common.core.web.controller.BaseController;
 import com.zfjg.common.core.web.page.TableInfo;
 import com.zfjg.manage.api.domain.other.WReport;
 import com.zfjg.manage.api.dto.other.WReportDto;
 import com.zfjg.manage.api.dto.other.WReportQuery;
+import com.zfjg.manage.api.search.enforce.job.EnforceJobQuery;
+import com.zfjg.manage.api.vo.enforce.job.ReportCheckExporter;
+import com.zfjg.manage.api.vo.other.WReportVo;
 import com.zfjg.manage.service.enforce.report.ReportService;
 import com.zfjg.manage.service.other.WReportBizService;
 import io.swagger.annotations.Api;
@@ -16,9 +23,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 /**
  * <p>
  * 前端控制器
@@ -54,6 +63,21 @@ public class WReportController extends BaseController {
         String apkUrl = wReportBizService.removeReport(id);
         return R.ok(apkUrl);
     }
+    @ApiOperation(value = "详情")
+    @GetMapping("/info")
+    public R<WReportDto> info(@RequestParam Long id) {
+        WReportDto wReportDto1 = Optional.ofNullable(wReportBizService.info(id)).map(e -> {
+            WReportDto wReportDto = new WReportDto();
+            BeanUtils.copyProperties(e,wReportDto);
+            wReportDto.setFiles(Optional.ofNullable(e.getFDown()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
+            wReportDto.setDoHandler(Optional.ofNullable(e.getDDo()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
+            wReportDto.setNotCategory(Optional.ofNullable(e.getNType()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
+            wReportDto.setWrongCategory(Optional.ofNullable(e.getWType()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
+            wReportDto.setBreakLawCategory(Optional.ofNullable(e.getSType()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
+            return wReportDto;
+        }).orElseThrow(() -> new ServiceException("error"));
+        return R.ok(wReportDto1);
+    }
 
     @ApiOperation(value = "详情")
     @GetMapping("/detail")
@@ -75,6 +99,17 @@ public class WReportController extends BaseController {
         return R.ok(wReportDtos);
     }
 
+    @ApiOperation(value = "执法过错调查导出")
+    @PostMapping(value = "/export")
+    public void export(HttpServletResponse response, @RequestBody WReportQuery wReportQuery) {
+        List<WReportVo> tableInfo = wReportBizService.getList(wReportQuery);
+        if (StringUtils.isEmpty(tableInfo)) {
+            return;
+        }
+        ExcelUtil<WReportVo> util = new ExcelUtil<WReportVo>(WReportVo.class);
+        util.exportExcel(response, tableInfo, "执法过错调查", "执法过错调查明细表");
+    }
+
     @ApiOperation(value = "列表")
     @GetMapping("/list")
     public TableInfo<?> updateReport(WReportQuery wReportQuery) {
@@ -83,4 +118,5 @@ public class WReportController extends BaseController {
     }
 
 
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/other/WReportMapper.java

@@ -13,4 +13,5 @@ import com.zfjg.manage.api.domain.other.WReport;
  */
 public interface WReportMapper extends BaseMapper<WReport> {
 
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/WReportServiceImpl.java

@@ -10,12 +10,10 @@ import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.exception.ServiceException;
 import com.zfjg.common.core.utils.StringUtils;
 import com.zfjg.common.core.utils.bean.BeanUtils;
-import com.zfjg.common.core.web.domain.AjaxResult;
 import com.zfjg.common.core.web.page.TableInfo;
 import com.zfjg.manage.api.domain.other.WReport;
 import com.zfjg.manage.api.dto.other.WReportDto;
 import com.zfjg.manage.api.dto.other.WReportQuery;
-import com.zfjg.manage.api.vo.other.WReportDetailVO;
 import com.zfjg.manage.api.vo.other.WReportVo;
 import com.zfjg.manage.mapper.other.WReportMapper;
 import com.zfjg.manage.service.other.IWReportService;
@@ -23,16 +21,11 @@ import com.zfjg.manage.service.other.WReportBizService;
 import com.zfjg.system.api.RemoteUserService;
 import com.zfjg.system.api.domain.SysDept;
 import com.zfjg.system.api.domain.SysUser;
-import com.zfjg.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -123,11 +116,15 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
     }
 
     @Override
-    public TableInfo<?> listReport(WReportQuery wReportQuery) {
+    public TableInfo<WReportVo> listReport(WReportQuery wReportQuery) {
         QueryWrapper<WReport> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNoneBlank(wReportQuery.getOrgId())) {
             queryWrapper.eq("org_id", wReportQuery.getOrgId());
         }
+        if (StringUtils.isNoneBlank(wReportQuery.getYear())){
+            queryWrapper.ge("create_time", wReportQuery.getYear());
+            queryWrapper.le("create_time", wReportQuery.getYear());
+        }
         if (StringUtils.isNoneBlank(wReportQuery.getUsername())) {
             R<SysUser> info2 = remoteUserService.getInfo2(wReportQuery.getUsername(), SecurityConstants.INNER);
             queryWrapper.eq("w_user", info2.getData().getNickName());
@@ -139,7 +136,8 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
             queryWrapper.lt("create_time", wReportQuery.getEndTime());
         }
         queryWrapper.groupBy("org_id");
-        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "sum(w_type_c) as w_type_c", "n_type", "sum(n_type_c) as n_type_c", "s_type", "sum(s_type_c) as s_type_c");
+        queryWrapper.select("ANY_VALUE(id) as id", "ANY_VALUE(org_id) as org_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
+//        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "w_type_c", "n_type", "n_type_c", "s_type", "as s_type_c");
         List<WReport> wReports = this.list(queryWrapper);
 
 
@@ -166,4 +164,58 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
         reportVoPageInfo.setRows(wReportVos);
         return reportVoPageInfo;
     }
+
+    @Override
+    public List<WReportVo> getList(WReportQuery wReportQuery) {
+        QueryWrapper<WReport> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNoneBlank(wReportQuery.getOrgId())) {
+            queryWrapper.eq("org_id", wReportQuery.getOrgId());
+        }
+        if (StringUtils.isNoneBlank(wReportQuery.getYear())){
+            queryWrapper.ge("create_time", wReportQuery.getYear());
+            queryWrapper.le("create_time", wReportQuery.getYear());
+        }
+        if (StringUtils.isNoneBlank(wReportQuery.getUsername())) {
+            R<SysUser> info2 = remoteUserService.getInfo2(wReportQuery.getUsername(), SecurityConstants.INNER);
+            queryWrapper.eq("w_user", info2.getData().getNickName());
+        }
+        if (ObjectUtil.isNotEmpty(wReportQuery.getStartTime())) {
+            queryWrapper.gt("create_time", wReportQuery.getStartTime());
+        }
+        if (ObjectUtil.isNotEmpty(wReportQuery.getEndTime())) {
+            queryWrapper.lt("create_time", wReportQuery.getEndTime());
+        }
+        queryWrapper.groupBy("org_id");
+        queryWrapper.select("ANY_VALUE(id) as id", "ANY_VALUE(org_id) as org_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
+//        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "w_type_c", "n_type", "n_type_c", "s_type", "as s_type_c");
+        List<WReport> wReports = this.list(queryWrapper);
+
+
+        TableInfo<WReportVo> reportVoPageInfo = new TableInfo<>();
+        BeanUtils.copyProperties(wReports, reportVoPageInfo);
+        List<WReportVo> wReportVos = wReports.stream().map(it -> {
+            WReportVo wReportVo = new WReportVo();
+            wReportVo.setId(it.getId());
+            wReportVo.setOrgId(it.getOrgId());
+            wReportVo.setOrgName(it.getOrgName());
+            wReportVo.setWUser(it.getWUser());
+            Integer i = Optional.ofNullable(it.getWTypeC()).orElse(0);
+            Integer i1 = Optional.ofNullable(it.getNTypeC()).orElse(0);
+            Integer i2 = Optional.ofNullable(it.getSTypeC()).orElse(0);
+            wReportVo.setDCount(it.getWTypeC());
+            wReportVo.setNCount(it.getNTypeC());
+            wReportVo.setWCount(it.getSTypeC());
+            Integer i3 = i + i1 + i2;
+            wReportVo.setACount(i3);
+            wReportVo.setCreateTime(it.getCreateTime());
+            return wReportVo;
+        }).collect(Collectors.toList());
+        return wReportVos;
+    }
+
+    @Override
+    public WReport info(Long id) {
+        return this.getById(id);
+    }
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/other/WReportBizService.java

@@ -5,6 +5,9 @@ import com.zfjg.manage.api.domain.other.WReport;
 import com.zfjg.manage.api.dto.other.WReportDto;
 import com.zfjg.manage.api.dto.other.WReportQuery;
 import com.zfjg.manage.api.vo.other.WReportDetailVO;
+import com.zfjg.manage.api.vo.other.WReportVo;
+
+import java.util.List;
 
 import java.util.List;
 
@@ -37,5 +40,9 @@ public interface WReportBizService {
     /**
      * 列表
      */
-    TableInfo<?> listReport(WReportQuery wReportQuery);
+    TableInfo<WReportVo> listReport(WReportQuery wReportQuery);
+
+    List<WReportVo> getList(WReportQuery wReportQuery);
+
+    WReport info(Long id);
 }

zfjg-modules/zfjg-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sr.role_name,
 		u.status_end_time,
 		sr.role_id,
-		u.number
+		u.number,sr.role_sort
 		FROM
 		sys_user u
 		LEFT JOIN sys_dept d ON u.dept_id = d.dept_id