feats

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.13</version>
+    <version>0.0.15</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

src/main/java/com/example/civilizedcity/common/ExportIssueUtil.java

@@ -31,7 +31,7 @@ public class ExportIssueUtil {
     @Autowired
     private TaOrgIssueService taOrgIssueService;
 
-    public List<IssueExport> getExportList(List<TaIssue> list) throws MalformedURLException {
+    public List<IssueExport> getExportList(List<TaIssue> list, Boolean withImage) throws MalformedURLException {
         List<IssueExport> exportList = new ArrayList<>();
         if (null != list && list.size() > 0) {
             List<SysOrg> orgList = sysOrgService.list();
@@ -39,6 +39,7 @@ public class ExportIssueUtil {
             for (TaIssue taIssue : list) {
                 IssueExport issueExport = new IssueExport();
                 issueExport.setIssueId(taIssue.getIssueId());
+                issueExport.setTypeName(taIssue.getTypeName());
                 issueExport.setCreateDate(taIssue.getCreateDate());
                 issueExport.setLocName(taIssue.getLocName());
                 issueExport.setAddr(taIssue.getAddr());
@@ -46,6 +47,7 @@ public class ExportIssueUtil {
                 issueExport.setExpireDate(taIssue.getExpireDate());
                 issueExport.setProcessNum(taIssue.getProcessNum());
                 issueExport.setUserName(taIssue.getUserName());
+                issueExport.setEndDate(taIssue.getEndDate());
 
                 // 转换机构
                 if (StringUtils.isNotEmpty(taIssue.getOrgId())) {
@@ -69,53 +71,12 @@ public class ExportIssueUtil {
                     issueExport.setProcessNode("已交办");
                 }
 
-                // 获取图片列表
-                List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_ISSUE, taIssue.getIssueId().toString());
-                if (null != attachList && attachList.size() > 0) {
-                    List<TaAttach> images = attachList.stream().filter(x -> StringUtils.isEmpty(x.getFileType()) || x.getFileType().equals("image")).collect(Collectors.toList());
-
-                    int max = 5;
-                    for (int i = 0; i < max; i += 1) {
-                        TaAttach taAttach = null;
-
-                        try {
-                            taAttach = images.get(i);
-                        } catch (Exception e) {
-                            //
-                        }
-
-                        if (null != taAttach) {
-
-                            URL url = new URL(taAttach.getUrl());
-                            switch (i) {
-                                case 0:
-                                    issueExport.setUrl1(url);
-                                    break;
-                                case 1:
-                                    issueExport.setUrl2(url);
-                                    break;
-                                case 2:
-                                    issueExport.setUrl3(url);
-                                    break;
-                                case 3:
-                                    issueExport.setUrl4(url);
-                                    break;
-                                case 4:
-                                    issueExport.setUrl5(url);
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                //
-                TaOrgIssue taOrgIssue = taOrgIssueService.getByIssueAndOrg(taIssue.getIssueId(), taIssue.getOrgId());
-                if (null != taOrgIssue) {
-                    List<TaAttach> orgAttachList = taAttachService.getListBy(Constants.SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
-                    if (null != orgAttachList && orgAttachList.size() > 0) {
-                        List<TaAttach> images = orgAttachList.stream().filter(x -> StringUtils.isEmpty(x.getFileType()) || x.getFileType().equals("image")).collect(Collectors.toList());
+                // 默认是带图的
+                if (null == withImage || withImage) {
+                    // 获取图片列表
+                    List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_ISSUE, taIssue.getIssueId().toString());
+                    if (null != attachList && attachList.size() > 0) {
+                        List<TaAttach> images = attachList.stream().filter(x -> StringUtils.isEmpty(x.getFileType()) || x.getFileType().equals("image")).collect(Collectors.toList());
 
                         int max = 5;
                         for (int i = 0; i < max; i += 1) {
@@ -128,22 +89,23 @@ public class ExportIssueUtil {
                             }
 
                             if (null != taAttach) {
+
                                 URL url = new URL(taAttach.getUrl());
                                 switch (i) {
                                     case 0:
-                                        issueExport.setUrl6(url);
+                                        issueExport.setUrl1(url);
                                         break;
                                     case 1:
-                                        issueExport.setUrl7(url);
+                                        issueExport.setUrl2(url);
                                         break;
                                     case 2:
-                                        issueExport.setUrl8(url);
+                                        issueExport.setUrl3(url);
                                         break;
                                     case 3:
-                                        issueExport.setUrl9(url);
+                                        issueExport.setUrl4(url);
                                         break;
                                     case 4:
-                                        issueExport.setUrl10(url);
+                                        issueExport.setUrl5(url);
                                         break;
                                     default:
                                         break;
@@ -151,6 +113,49 @@ public class ExportIssueUtil {
                             }
                         }
                     }
+
+                    //
+                    TaOrgIssue taOrgIssue = taOrgIssueService.getByIssueAndOrg(taIssue.getIssueId(), taIssue.getOrgId());
+                    if (null != taOrgIssue) {
+                        List<TaAttach> orgAttachList = taAttachService.getListBy(Constants.SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
+                        if (null != orgAttachList && orgAttachList.size() > 0) {
+                            List<TaAttach> images = orgAttachList.stream().filter(x -> StringUtils.isEmpty(x.getFileType()) || x.getFileType().equals("image")).collect(Collectors.toList());
+
+                            int max = 5;
+                            for (int i = 0; i < max; i += 1) {
+                                TaAttach taAttach = null;
+
+                                try {
+                                    taAttach = images.get(i);
+                                } catch (Exception e) {
+                                    //
+                                }
+
+                                if (null != taAttach) {
+                                    URL url = new URL(taAttach.getUrl());
+                                    switch (i) {
+                                        case 0:
+                                            issueExport.setUrl6(url);
+                                            break;
+                                        case 1:
+                                            issueExport.setUrl7(url);
+                                            break;
+                                        case 2:
+                                            issueExport.setUrl8(url);
+                                            break;
+                                        case 3:
+                                            issueExport.setUrl9(url);
+                                            break;
+                                        case 4:
+                                            issueExport.setUrl10(url);
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
 
                 exportList.add(issueExport);

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -9,9 +9,7 @@ import com.example.civilizedcity.common.*;
 
 import java.net.URL;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.example.civilizedcity.entity.*;
@@ -78,16 +76,48 @@ public class TaIssueController extends BaseController {
     /**
      * 构造 查询构造器
      * @param sysUser
-     * @param bizStatus
-     * @param sourceType
-     * @param locId
-     * @param mine
-     * @param orgId
+     * @param params
      * @return
      */
-    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String issueId, String bizStatus, String sourceType, String locId, Boolean mine, String orgId, Boolean all) {
+    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, Map<String, Object> params) {
+
+        String issueId = (String) params.get("issueId");
+        String typeId = (String) params.get("typeId");
+        String bizStatus = (String) params.get("bizStatus");
+        String sourceType = (String) params.get("sourceType");
+        String locId = (String) params.get("locId");
+        Boolean mine = (Boolean) params.get("mine");
+        String orgId = (String) params.get("orgId");
+        String userName = (String) params.get("userName");
+        Boolean all = (Boolean) params.get("all");
+
+        LocalDateTime createDateStart = null;
+        LocalDateTime createDateEnd = null;
+        if (null != params.get("createDateStart")) {
+            String dt1 = (String) params.get("createDateStart");
+            String dt2 = (String) params.get("createDateEnd");
+
+            if (StringUtils.isNotEmpty(dt1)) {
+                createDateStart = DateUtils.day2LocalDateime(dt1);
+                createDateEnd = DateUtils.day2LocalDateime2(dt2);
+            }
+        }
+
+        LocalDateTime endDateStart = null;
+        LocalDateTime endDateEnd = null;
+        if (null != params.get("endDateStart")) {
+            String dt1 = (String) params.get("endDateStart");
+            String dt2 = (String) params.get("endDateEnd");
+
+            if (StringUtils.isNotEmpty(dt1)) {
+                endDateStart = DateUtils.day2LocalDateime(dt1);
+                endDateEnd = DateUtils.day2LocalDateime2(dt2);
+            }
+        }
+
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotEmpty(issueId), "issue_id", issueId);
+        queryWrapper.eq(StringUtils.isNotEmpty(typeId), "type_id", typeId);
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
@@ -101,7 +131,11 @@ public class TaIssueController extends BaseController {
         } else if ("expired".equals(bizStatus)) {
             // 已逾期
             queryWrapper.ne("process_node", Constants.PROCESS_END);
-            queryWrapper.le("expire_date", DateUtils.yestoday());
+            queryWrapper.lt("expire_date", DateUtils.today());
+        } else if ("expiredEnd".equals(bizStatus)) {
+            // 逾期办结
+            queryWrapper.eq("process_node", Constants.PROCESS_END);
+            queryWrapper.lt("expire_date", DateUtils.today());
         } else if ("reject".equals(bizStatus)) {
             // 已打回
             queryWrapper.eq("process_node", Constants.PROCESS_APPLY_REJECT);
@@ -117,6 +151,9 @@ public class TaIssueController extends BaseController {
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
+        queryWrapper.like(StringUtils.isNotEmpty(userName), "user_name", userName);
+        queryWrapper.between(null != createDateStart, "create_date", createDateStart, createDateEnd);
+        queryWrapper.between(null != endDateStart, "end_date", endDateStart, endDateEnd);
         queryWrapper.eq(Constants.SOURCE_FEEDBACK.equals(sourceType) && !all, "source_type", Constants.SOURCE_FEEDBACK);
         queryWrapper.ne(!Constants.SOURCE_FEEDBACK.equals(sourceType) && !all, "source_type", Constants.SOURCE_FEEDBACK);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
@@ -137,11 +174,17 @@ public class TaIssueController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
+                             @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
                              @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                              @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
+                             @ApiParam("上报人") @RequestParam(value = "userName", required = false) String userName,
+                             @ApiParam(value = "创建时间-开始", example = "2023-03-01") @RequestParam(value = "createDateStart", required = false) String createDateStart,
+                             @ApiParam(value = "创建时间-结束", example = "2023-03-31") @RequestParam(value = "createDateEnd", required = false) String createDateEnd,
+                             @ApiParam(value = "结单时间-开始", example = "2023-03-01") @RequestParam(value = "endDateStart", required = false) String endDateStart,
+                             @ApiParam(value = "结单时间-结束", example = "2023-03-31") @RequestParam(value = "endDateEnd", required = false) String endDateEnd,
                              @ApiParam("是否全部") @RequestParam(value = "all", defaultValue = "false") Boolean all) throws Exception {
 
         SysUser sysUser = currentUser();
@@ -152,8 +195,23 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
+        Map<String, Object> params = new HashMap<>();
+        params.put("issueId", issueId);
+        params.put("typeId", typeId);
+        params.put("bizStatus", bizStatus);
+        params.put("sourceType", sourceType);
+        params.put("locId", locId);
+        params.put("mine", mine);
+        params.put("orgId", orgId);
+        params.put("userName", userName);
+        params.put("all", all);
+        params.put("createDateStart", createDateStart);
+        params.put("createDateEnd", createDateEnd);
+        params.put("endDateStart", endDateStart);
+        params.put("endDateEnd", endDateEnd);
+
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, issueId, bizStatus, sourceType, locId, mine, orgId, all);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, params);
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
@@ -171,11 +229,18 @@ public class TaIssueController extends BaseController {
     @PostMapping("/taIssue/export")
     public ResponseBean export(@ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
                                @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+                               @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
                                @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                                @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                                @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                                @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
+                               @ApiParam("上报人") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam(value = "创建时间-开始", example = "2023-03-01") @RequestParam(value = "createDateStart", required = false) String createDateStart,
+                               @ApiParam(value = "创建时间-结束", example = "2023-03-31") @RequestParam(value = "createDateEnd", required = false) String createDateEnd,
+                               @ApiParam(value = "结单时间-开始", example = "2023-03-01") @RequestParam(value = "endDateStart", required = false) String endDateStart,
+                               @ApiParam(value = "结单时间-结束", example = "2023-03-31") @RequestParam(value = "endDateEnd", required = false) String endDateEnd,
                                @ApiParam("是否全部") @RequestParam(value = "all", defaultValue = "false") Boolean all,
+                               @ApiParam("是否带图") @RequestParam(value = "withImage", defaultValue = "true") Boolean withImage,
                                HttpServletResponse response) throws Exception {
 
         SysUser sysUser = currentUser();
@@ -186,10 +251,26 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, issueId, bizStatus, sourceType, locId, mine, orgId, all);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("issueId", issueId);
+        params.put("typeId", typeId);
+        params.put("bizStatus", bizStatus);
+        params.put("sourceType", sourceType);
+        params.put("locId", locId);
+        params.put("mine", mine);
+        params.put("orgId", orgId);
+        params.put("userName", userName);
+        params.put("all", all);
+        params.put("createDateStart", createDateStart);
+        params.put("createDateEnd", createDateEnd);
+        params.put("endDateStart", endDateStart);
+        params.put("endDateEnd", endDateEnd);
+
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, params);
         List<TaIssue> list = taIssueService.list(queryWrapper);
 
-        List<IssueExport> exportList = exportIssueUtil.getExportList(list);
+        List<IssueExport> exportList = exportIssueUtil.getExportList(list, withImage);
         ExcelUtils.flush(response, IssueExport.class, exportList, "问题单列表");
 
         return null;

src/main/java/com/example/civilizedcity/controller/TaOrgIssueController.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import com.example.civilizedcity.entity.*;
@@ -107,11 +109,41 @@ public class TaOrgIssueController extends BaseController {
                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
+                             @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
+                             @ApiParam("上报人") @RequestParam(value = "userName", required = false) String userName,
+                             @ApiParam(value = "创建时间-开始", example = "2023-03-01") @RequestParam(value = "createDateStart", required = false) String createDateStart,
+                             @ApiParam(value = "创建时间-结束", example = "2023-03-31") @RequestParam(value = "createDateEnd", required = false) String createDateEnd,
+                             @ApiParam(value = "结单时间-开始", example = "2023-03-01") @RequestParam(value = "endDateStart", required = false) String endDateStart,
+                             @ApiParam(value = "结单时间-结束", example = "2023-03-31") @RequestParam(value = "endDateEnd", required = false) String endDateEnd,
                              @ApiParam("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus) throws Exception {
         SysUser sysUser = currentUser();
 
+        Map<String, Object> params = new HashMap<>();
+        params.put("issueId", issueId);
+        params.put("typeId", typeId);
+        params.put("bizStatus", bizStatus);
+        params.put("sourceType", sourceType);
+        params.put("locId", locId);
+        params.put("orgId", sysUser.getOrgId());
+        params.put("userName", userName);
+        if (StringUtils.isNotEmpty(createDateStart)) {
+            params.put("createDateStart", DateUtils.day2LocalDateime(createDateStart));
+            params.put("createDateEnd", DateUtils.day2LocalDateime2(createDateEnd));
+        } else {
+            params.put("createDateStart", null);
+            params.put("createDateEnd", null);
+        }
+
+        if (StringUtils.isNotEmpty(endDateStart)) {
+            params.put("endDateStart", DateUtils.day2LocalDateime(endDateStart));
+            params.put("endDateEnd", DateUtils.day2LocalDateime2(endDateEnd));
+        } else {
+            params.put("endDateStart", null);
+            params.put("endDateEnd", null);
+        }
+
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssue> result = taOrgIssueService.getIssuePageBy(pg, sysUser.getOrgId(), issueId, sourceType, bizStatus, locId);
+        IPage<TaIssue> result = taOrgIssueService.getIssuePageBy(pg, params);
         
         return ResponseBean.success(result);
     }
@@ -130,11 +162,42 @@ public class TaOrgIssueController extends BaseController {
                                 @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                                 @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
                                 @ApiParam("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus,
+                                @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
+                                @ApiParam("上报人") @RequestParam(value = "userName", required = false) String userName,
+                                @ApiParam(value = "创建时间-开始", example = "2023-03-01") @RequestParam(value = "createDateStart", required = false) String createDateStart,
+                                @ApiParam(value = "创建时间-结束", example = "2023-03-31") @RequestParam(value = "createDateEnd", required = false) String createDateEnd,
+                                @ApiParam(value = "结单时间-开始", example = "2023-03-01") @RequestParam(value = "endDateStart", required = false) String endDateStart,
+                                @ApiParam(value = "结单时间-结束", example = "2023-03-31") @RequestParam(value = "endDateEnd", required = false) String endDateEnd,
+                                @ApiParam("是否带图") @RequestParam(value = "withImage", defaultValue = "true") Boolean withImage,
                                 HttpServletResponse response) throws Exception {
          SysUser sysUser = currentUser();
 
-         List<TaIssue> list = taOrgIssueService.getIssueListBy(sysUser.getOrgId(), issueId, sourceType, bizStatus, locId);
-         List<IssueExport> exportList = exportIssueUtil.getExportList(list);
+         Map<String, Object> params = new HashMap<>();
+         params.put("issueId", issueId);
+         params.put("typeId", typeId);
+         params.put("bizStatus", bizStatus);
+         params.put("sourceType", sourceType);
+         params.put("locId", locId);
+         params.put("orgId", sysUser.getOrgId());
+         params.put("userName", userName);
+         if (StringUtils.isNotEmpty(createDateStart)) {
+             params.put("createDateStart", DateUtils.day2LocalDateime(createDateStart));
+             params.put("createDateEnd", DateUtils.day2LocalDateime2(createDateEnd));
+         } else {
+             params.put("createDateStart", null);
+             params.put("createDateEnd", null);
+         }
+
+         if (StringUtils.isNotEmpty(endDateStart)) {
+             params.put("endDateStart", DateUtils.day2LocalDateime(endDateStart));
+             params.put("endDateEnd", DateUtils.day2LocalDateime2(endDateEnd));
+         } else {
+             params.put("endDateStart", null);
+             params.put("endDateEnd", null);
+         }
+
+         List<TaIssue> list = taOrgIssueService.getIssueListBy(params);
+         List<IssueExport> exportList = exportIssueUtil.getExportList(list, withImage);
 
          ExcelUtils.flush(response, IssueExport.class, exportList, "问题单列表");
          return null;

src/main/java/com/example/civilizedcity/mapper/TaOrgIssueMapper.java

@@ -18,13 +18,7 @@ import java.util.Map;
 @Mapper
 public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
 
-     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg,
-                                   @Param("orgId") String orgId,
-                                   @Param("issueId") String issueId,
-                                   @Param("sourceType") String sourceType,
-                                   @Param("processNode") String processNode,
-                                   @Param("isExpire") Boolean isExpire,
-                                   @Param("locId") String locId);
+     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, @Param("params") Map<String, Object> params);
 
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
 
@@ -32,10 +26,5 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
 
     int updateProcess(@Param("issueId") Integer issueId,@Param("orgId") String orgId,@Param("processStatus") String processStatus);
 
-    List<TaIssue> getIssueListBy(@Param("orgId") String orgId,
-                                 @Param("issueId") String issueId,
-                                 @Param("sourceType") String sourceType,
-                                 @Param("processNode") String processNode,
-                                 @Param("isExpire") Boolean isExpire,
-                                 @Param("locId") String locId);
+    List<TaIssue> getIssueListBy(@Param("params") Map<String, Object> params);
 }

src/main/java/com/example/civilizedcity/service/TaOrgIssueService.java

@@ -7,6 +7,7 @@ import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.entity.TaOrgIssue;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 单位问题单;(ta_org_issue)表服务接口
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
-     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String issueId, String sourceType, String bizStatus, String locId);
+     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, Map<String, Object> params);
 
      void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
 
@@ -23,5 +24,5 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      void updateData(TaOrgIssue taOrgIssue) throws Exception;
 
-     List<TaIssue> getIssueListBy(String orgId, String issueId, String sourceType, String bizStatus, String locId);
+     List<TaIssue> getIssueListBy(Map<String, Object> params);
  }

src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 单位问题单;(ta_org_issue)表服务实现类
@@ -35,21 +36,27 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     @Autowired
     TaAttachMapper taAttachMapper;
 
-    @Override
-    public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String issueId, String sourceType, String bizStatus, String locId) {
-
-        String processNode = null;
-        Boolean isExpire = false;
+    private void transParams(Map<String, Object> params) {
+        params.put("processNode", null);
+        params.put("isExpire", false);
+        params.put("expiredEnd", false);
 
+        String bizStatus = (String) params.get("bizStatus");
         if (!StringUtils.isEmpty(bizStatus)) {
             if ("expire".equals(bizStatus) || "expired".equals(bizStatus)) {
-                isExpire = true;
+                params.put("isExpire", true);
+            } else if ("expiredEnd".equals(bizStatus)) {
+                params.put("expiredEnd", true);
             } else {
-                processNode = bizStatus;
+                params.put("processNode", bizStatus);
             }
         }
+    }
 
-        return baseMapper.getIssuePageBy(pg, orgId, issueId, sourceType, processNode, isExpire, locId);
+    @Override
+    public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, Map<String, Object> params) {
+        transParams(params);
+        return baseMapper.getIssuePageBy(pg, params);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -129,19 +136,8 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     }
 
     @Override
-    public List<TaIssue> getIssueListBy(String orgId, String issueId, String sourceType, String bizStatus, String locId) {
-
-        String processNode = null;
-        Boolean isExpire = false;
-
-        if (!StringUtils.isEmpty(bizStatus)) {
-            if ("expire".equals(bizStatus) || "expired".equals(bizStatus)) {
-                isExpire = true;
-            } else {
-                processNode = bizStatus;
-            }
-        }
-
-        return baseMapper.getIssueListBy(orgId, issueId, sourceType, processNode, isExpire, locId);
+    public List<TaIssue> getIssueListBy(Map<String, Object> params) {
+        transParams(params);
+        return baseMapper.getIssueListBy(params);
     }
 }

src/main/java/com/example/civilizedcity/vo/IssueExport.java

@@ -24,103 +24,112 @@ import java.time.LocalDateTime;
 public class IssueExport {
 
     @ColumnWidth(24)
-    @ExcelProperty(value = "问题单号", index = 0)
+    @ExcelProperty(value = "问题单号")
     @ApiModelProperty(name = "问题ID", notes = "")
     private Integer issueId;
 
+    @ColumnWidth(24)
+    @ExcelProperty(value = "问题类型")
+    @ApiModelProperty(name = "问题类型", notes = "")
+    private String typeName;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "上报日期", index = 1, converter = LocalDateTimeConverter.class)
+    @ExcelProperty(value = "上报日期", converter = LocalDateTimeConverter.class)
     @ApiModelProperty(name = "创建时间", notes = "")
     private LocalDateTime createDate;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "点位", index = 2)
+    @ExcelProperty(value = "点位")
     @ApiModelProperty(name = "点位名称", notes = "")
     private String locName;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "位置", index = 3)
+    @ExcelProperty(value = "位置")
     @ApiModelProperty(name = "具体位置", notes = "")
     private String addr;
 
     @ColumnWidth(80)
-    @ExcelProperty(value = "问题详情", index = 4)
+    @ExcelProperty(value = "问题详情")
     @ApiModelProperty(name = "问题详情", notes = "")
     private String content;
 
     @ColumnWidth(40)
-    @ExcelProperty(value = "责任单位", index = 5)
+    @ExcelProperty(value = "责任单位")
     @ApiModelProperty(name = "责任单位", notes = "")
     private String orgId;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "流程状态", index = 6)
+    @ExcelProperty(value = "流程状态")
     @ApiModelProperty(name = "流程节点", notes = "")
     private String processNode;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "截止时间", index = 7)
+    @ExcelProperty(value = "截止时间")
     @ApiModelProperty(name = "截止时间", notes = "YYYY-MM-DD")
     private String expireDate;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "交办次数", index = 8)
+    @ExcelProperty(value = "办结时间", converter = LocalDateTimeConverter.class)
+    @ApiModelProperty(name = "办结时间", notes = "")
+    private LocalDateTime endDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "交办次数")
     @ApiModelProperty(name = "交办次数", notes = "")
     private Integer processNum;
 
     @ColumnWidth(26)
-    @ExcelProperty(value = "上报人", index = 9)
+    @ExcelProperty(value = "上报人")
     @ApiModelProperty(name = "上报人", notes = "")
     private String userName;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "问题图片", index = 10)
+    @ExcelProperty(value = "问题图片")
     @ApiModelProperty(name = "问题图片", notes = "")
     private URL url1;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "问题图片", index = 11)
+    @ExcelProperty(value = "问题图片")
     @ApiModelProperty(name = "问题图片", notes = "")
     private URL url2;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "问题图片", index = 12)
+    @ExcelProperty(value = "问题图片")
     @ApiModelProperty(name = "问题图片", notes = "")
     private URL url3;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "问题图片", index = 13)
+    @ExcelProperty(value = "问题图片")
     @ApiModelProperty(name = "问题图片", notes = "")
     private URL url4;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "问题图片", index = 14)
+    @ExcelProperty(value = "问题图片")
     @ApiModelProperty(name = "问题图片", notes = "")
     private URL url5;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "处理结果图片", index = 15)
+    @ExcelProperty(value = "处理结果图片")
     @ApiModelProperty(name = "处理结果图片", notes = "")
     private URL url6;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "处理结果图片", index = 16)
+    @ExcelProperty(value = "处理结果图片")
     @ApiModelProperty(name = "处理结果图片", notes = "")
     private URL url7;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "处理结果图片", index = 17)
+    @ExcelProperty(value = "处理结果图片")
     @ApiModelProperty(name = "处理结果图片", notes = "")
     private URL url8;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "处理结果图片", index = 18)
+    @ExcelProperty(value = "处理结果图片")
     @ApiModelProperty(name = "处理结果图片", notes = "")
     private URL url9;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "处理结果图片", index = 19)
+    @ExcelProperty(value = "处理结果图片")
     @ApiModelProperty(name = "处理结果图片", notes = "")
     private URL url10;
 }

src/main/resources/mapper/TaIssueMapper.xml

@@ -73,7 +73,7 @@
             UUID_SHORT( ) AS id,
             IFNULL( SUM( IF ( t.process_node = '03', t.process_num, 0 ) ), 0 ) AS endNum,
             IFNULL( SUM( IF ( t.process_node LIKE '02%', t.process_num, 0 ) ), 0 ) AS assignedNum,
-            IFNULL( SUM( IF ( TO_DAYS(t.expire_date) < TO_DAYS(DATE_SUB(NOW(), INTERVAL 1 DAY)) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
+            IFNULL( SUM( IF ( TO_DAYS(t.expire_date) < TO_DAYS(NOW()) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
         FROM
             ta_issue t
         WHERE

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -26,25 +26,41 @@
                 AND s.org_id = t.org_id
                 AND s.`status` > -1
             )
-            AND t.org_id = #{orgId}
-        <if test="issueId != null and issueId != ''">
-            AND t.issue_id = #{issueId}
+            AND t.org_id = #{params.orgId}
+        <if test="params.issueId != null and params.issueId != ''">
+            AND t.issue_id = #{params.issueId}
         </if>
-        <if test="sourceType != null and sourceType == 'feedback'">
+        <if test="params.typeId != null and params.typeId != ''">
+            AND t.type_id = #{params.typeId}
+        </if>
+        <if test="params.sourceType != null and params.sourceType == 'feedback'">
             AND t.source_type = 'feedback'
         </if>
-        <if test="sourceType != null and sourceType != 'feedback'">
+        <if test="params.sourceType != null and params.sourceType != 'feedback'">
             AND t.source_type in ('check', 'inspector')
         </if>
-        <if test="locId != null and locId != ''">
-            AND t.loc_id = #{locId}
+        <if test="params.locId != null and params.locId != ''">
+            AND t.loc_id = #{params.locId}
         </if>
-        <if test="processNode != null and processNode != ''">
-            AND t.process_node LIKE CONCAT(#{processNode}, '%')
+        <if test="params.processNode != null and params.processNode != ''">
+            AND t.process_node LIKE CONCAT(#{params.processNode}, '%')
         </if>
-        <if test="isExpire != null and isExpire">
+        <if test="params.isExpire != null and params.isExpire">
             AND t.process_node != '03'
-            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(DATE_SUB(now(), INTERVAL 1 DAY))
+            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(now())
+        </if>
+        <if test="params.expiredEnd != null and params.expiredEnd">
+            AND t.process_node = '03'
+            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(now())
+        </if>
+        <if test="params.createDateStart != null">
+            AND t.create_date BETWEEN #{params.createDateStart} AND #{params.createDateEnd}
+        </if>
+        <if test="params.endDateStart != null">
+            AND t.end_date BETWEEN #{params.endDateStart} AND #{params.endDateEnd}
+        </if>
+        <if test="params.userName != null and params.userName != ''">
+            AND t.user_name LIKE CONCAT('%', #{params.userName}, '%')
         </if>
             AND t.`status` &gt; -1
         ORDER BY
@@ -68,7 +84,7 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM( IF (TO_DAYS(DATE_SUB(NOW(), INTERVAL 1 DAY)) > TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
+            SUM( IF (TO_DAYS(NOW()) &gt; TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
             SUM( IF (t.process_node = '03', 1, 0 ) ) AS end_num,
             SUM( IF (t.process_node != '03', 1, 0 ) ) AS doing_num
         from ta_issue t