feats

db/.back_文明创办/文明创办-backup-2023228153135.pdma.json → db/.back_文明创办/文明创办-backup-2023313112657.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-28 11:17:54",
+  "updatedTime": "2023-2-28 15:31:35",
   "dbConns": [],
   "profile": {
     "default": {

db/upgrade.1.1.sql

@@ -0,0 +1,3 @@
+
+ALTER TABLE `sys_org`
+    ADD COLUMN `is_responsible` int(0) NULL DEFAULT 1 COMMENT '是否责任单位' AFTER `org_p_id`;

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-28 15:31:35",
+  "updatedTime": "2023-3-13 11:26:57",
   "dbConns": [],
   "profile": {
     "default": {
@@ -667,6 +667,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "B7406CE6-690F-4A9B-8BA4-4EF1F18B5C87"
         },
+        {
+          "defKey": "is_responsible",
+          "defName": "是否责任单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "40B1363B-2AD0-4B89-9ADE-A487DCB59573"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",

pom.xml

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

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

@@ -29,6 +29,11 @@ public class DateUtils {
         return LocalDateTime.now().format(formatter);
     }
 
+    public static String tomorrow() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDateTime.now().plusDays(1).format(formatter);
+    }
+
     public static String todayCompact() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         return LocalDateTime.now().format(formatter);
@@ -54,6 +59,11 @@ public class DateUtils {
         return LocalDateTime.parse(day + " 00:00:00", df);
     }
 
+    public static LocalDateTime day2LocalDateime2(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day + " 23:59:59", df);
+    }
+
     public static LocalDateTime dayToLocalDateime(String day) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(day, df);

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

@@ -0,0 +1,161 @@
+package com.example.civilizedcity.common;
+
+import com.example.civilizedcity.entity.SysOrg;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaOrgIssue;
+import com.example.civilizedcity.service.SysOrgService;
+import com.example.civilizedcity.service.TaAttachService;
+import com.example.civilizedcity.service.TaOrgIssueService;
+import com.example.civilizedcity.vo.IssueExport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Component
+public class ExportIssueUtil {
+
+    @Autowired
+    private SysOrgService sysOrgService;
+
+    @Autowired
+    private TaAttachService taAttachService;
+
+    @Autowired
+    private TaOrgIssueService taOrgIssueService;
+
+    public List<IssueExport> getExportList(List<TaIssue> list) throws MalformedURLException {
+        List<IssueExport> exportList = new ArrayList<>();
+        if (null != list && list.size() > 0) {
+            List<SysOrg> orgList = sysOrgService.list();
+
+            for (TaIssue taIssue : list) {
+                IssueExport issueExport = new IssueExport();
+                issueExport.setIssueId(taIssue.getIssueId());
+                issueExport.setCreateDate(taIssue.getCreateDate());
+                issueExport.setLocName(taIssue.getLocName());
+                issueExport.setAddr(taIssue.getAddr());
+                issueExport.setContent(taIssue.getContent());
+                issueExport.setExpireDate(taIssue.getExpireDate());
+                issueExport.setProcessNum(taIssue.getProcessNum());
+
+                // 转换机构
+                if (StringUtils.isNotEmpty(taIssue.getOrgId())) {
+                    Optional<SysOrg> sysOrg = orgList.stream().filter(x -> x.getOrgId().equals(taIssue.getOrgId())).findFirst();
+                    if (sysOrg.isPresent()) {
+                        issueExport.setOrgId(sysOrg.get().getName());
+                    } else {
+                        issueExport.setOrgId(null);
+                    }
+                }
+
+                // 转换流程状态
+                String processNode = taIssue.getProcessNode();
+                if (processNode.equals(Constants.PROCESS_START)) {
+                    issueExport.setProcessNode("待交办");
+                } else if (processNode.equals(Constants.PROCESS_END)) {
+                    issueExport.setProcessNode("已办结");
+                } else if (StringUtils.isNotEmpty(taIssue.getExpireDate()) && LocalDateTime.now().isAfter(DateUtils.day2LocalDateime2(taIssue.getExpireDate()))) {
+                    issueExport.setProcessNode("已逾期");
+                } else {
+                    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());
+
+                        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);
+            }
+        }
+
+        return exportList;
+    }
+}

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

@@ -15,9 +15,7 @@ import java.util.Map;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysResource;
 import com.example.civilizedcity.entity.SysRole;
-import com.example.civilizedcity.service.SysResourceService;
-import com.example.civilizedcity.service.SysRoleService;
-import com.example.civilizedcity.service.SysUserDutyService;
+import com.example.civilizedcity.service.*;
 import com.example.civilizedcity.vo.ChangePassword;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +23,6 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.service.SysUserService;
 
 /**
  * 用户表;(sys_user)表控制层
@@ -47,6 +44,12 @@ public class SysUserController extends BaseController {
     @Autowired
     SysUserDutyService sysUserDutyService;
 
+    @Autowired
+    SysLoginService sysLoginService;
+
+    @Autowired
+    SysOrgService sysOrgService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -85,6 +88,7 @@ public class SysUserController extends BaseController {
         sysUser.setRolesList(rolesList);
         sysUser.setResourcesList(resourcesList);
         sysUser.setDutyList(dutyList);
+        sysUser.setOrg(sysOrgService.getById(sysUser.getOrgId()));
 
         return sysUser;
     }
@@ -284,6 +288,9 @@ public class SysUserController extends BaseController {
             return ResponseBean.error("暂无权限");
         }
 
+        // 删除登录信息
+        sysLoginService.removeByUser(sysUser.getUserId());
+
         sysUserService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -186,7 +186,7 @@ public class TaCheckItemController extends BaseController {
             }});
         }
 
-        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taCheck.getEndDate()))) {
+        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime2(taCheck.getEndDate()))) {
             return ResponseBean.success(new HashMap<String, Object>(){{
                 put("errorCode", 1);    // 正数代表, 只能查看
                 put("message", "本次测评已结束");
@@ -245,7 +245,7 @@ public class TaCheckItemController extends BaseController {
             return ResponseBean.error("未找到有效的测评信息");
         }
 
-        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taCheck.getEndDate()))) {
+        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime2(taCheck.getEndDate()))) {
             return ResponseBean.error("本次测评已结束");
         }
 

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

@@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.stream.Collectors;
 
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.service.*;
+import com.example.civilizedcity.vo.IssueExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,6 +40,9 @@ public class TaIssueController extends BaseController {
     @Autowired
     private TaIssueService taIssueService;
 
+    @Autowired
+    private TaOrgIssueService taOrgIssueService;
+
     @Autowired
     private TaAttachService taAttachService;
 
@@ -49,6 +55,9 @@ public class TaIssueController extends BaseController {
     @Autowired
     private SysOrgService sysOrgService;
 
+    @Autowired
+    private ExportIssueUtil exportIssueUtil;
+
     /**
      * 通过ID查询单条数据
      *
@@ -76,8 +85,9 @@ public class TaIssueController extends BaseController {
      * @param orgId
      * @return
      */
-    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String bizStatus, String sourceType, String locId, Boolean mine, String orgId, Boolean all) {
+    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String issueId, String bizStatus, String sourceType, String locId, Boolean mine, String orgId, Boolean all) {
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(issueId), "issue_id", issueId);
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
@@ -126,6 +136,7 @@ public class TaIssueController extends BaseController {
     @GetMapping("/taIssue")
     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("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
                              @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
@@ -142,7 +153,7 @@ public class TaIssueController extends BaseController {
         }
 
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId, all);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, issueId, bizStatus, sourceType, locId, mine, orgId, all);
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
@@ -158,7 +169,8 @@ public class TaIssueController extends BaseController {
      */
     @ApiOperation("导出")
     @PostMapping("/taIssue/export")
-    public ResponseBean export(@ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+    public ResponseBean export(@ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
+                               @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,
@@ -174,38 +186,12 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId, all);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, issueId, bizStatus, sourceType, locId, mine, orgId, all);
         List<TaIssue> list = taIssueService.list(queryWrapper);
 
-        if (null != list && list.size() > 0) {
-            List<SysOrg> orgList = sysOrgService.list();
-            for (TaIssue taIssue : list) {
-
-                // 转换机构
-                if (StringUtils.isNotEmpty(taIssue.getOrgId())) {
-                    Optional<SysOrg> sysOrg = orgList.stream().filter(x -> x.getOrgId().equals(taIssue.getOrgId())).findFirst();
-                    if (sysOrg.isPresent()) {
-                        taIssue.setOrgId(sysOrg.get().getName());
-                    } else {
-                        taIssue.setOrgId(null);
-                    }
-                }
-
-                // 转换流程状态
-                String processNode = taIssue.getProcessNode();
-                if (processNode.equals(Constants.PROCESS_START)) {
-                    taIssue.setProcessNode("待交办");
-                } else if (processNode.equals(Constants.PROCESS_END)) {
-                    taIssue.setProcessNode("已办结");
-                } else if (StringUtils.isNotEmpty(taIssue.getExpireDate()) && LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taIssue.getExpireDate()))) {
-                    taIssue.setProcessNode("已逾期");
-                } else {
-                    taIssue.setProcessNode("已交办");
-                }
-            }
-        }
+        List<IssueExport> exportList = exportIssueUtil.getExportList(list);
+        ExcelUtils.flush(response, IssueExport.class, exportList, "问题单列表");
 
-        ExcelUtils.flush(response, TaIssue.class, list, "问题单列表");
         return null;
     }
 

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

@@ -3,25 +3,26 @@ package com.example.civilizedcity.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
+
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
-import com.example.civilizedcity.common.StringUtils;
-import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.entity.TaAttach;
-import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.service.SysOrgService;
 import com.example.civilizedcity.service.TaAttachService;
+import com.example.civilizedcity.vo.IssueExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.service.TaOrgIssueService;
 
- /**
+import javax.servlet.http.HttpServletResponse;
+
+/**
  * 单位问题单;(ta_org_issue)表控制层
  * @author : http://njyunzhi.com
  * @date : 2022-12-28
@@ -36,7 +37,14 @@ public class TaOrgIssueController extends BaseController {
 
     @Autowired
     private TaAttachService taAttachService;
-    
+
+    @Autowired
+    private SysOrgService sysOrgService;
+
+    @Autowired
+    private ExportIssueUtil exportIssueUtil;
+
+
     /** 
      * 通过ID查询单条数据 
      *
@@ -95,15 +103,41 @@ public class TaOrgIssueController extends BaseController {
     @GetMapping("/taOrgIssue")
     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("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
                              @ApiParam("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus) throws Exception {
         SysUser sysUser = currentUser();
 
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssue> result = taOrgIssueService.getIssuePageBy(pg, sysUser.getOrgId(), sourceType, bizStatus);
+        IPage<TaIssue> result = taOrgIssueService.getIssuePageBy(pg, sysUser.getOrgId(), issueId, sourceType, bizStatus, locId);
         
         return ResponseBean.success(result);
     }
+
+
+     /**
+      * 分页查询
+      *
+      * @param pageNum 当前页码
+      * @param pageSize 每页条数
+      * @return 查询结果
+      */
+     @ApiOperation("分页查询")
+     @PostMapping("/taOrgIssue/export")
+     public ResponseBean export(@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("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus,
+                                HttpServletResponse response) throws Exception {
+         SysUser sysUser = currentUser();
+
+         List<TaIssue> list = taOrgIssueService.getIssueListBy(sysUser.getOrgId(), issueId, sourceType, bizStatus, locId);
+         List<IssueExport> exportList = exportIssueUtil.getExportList(list);
+
+         ExcelUtils.flush(response, IssueExport.class, exportList, "问题单列表");
+         return null;
+     }
     
 //    /**
 //     * 新增数据

src/main/java/com/example/civilizedcity/entity/SysOrg.java

@@ -36,6 +36,10 @@ public class SysOrg implements Serializable,Cloneable{
     /** 上级单位 */
     @ApiModelProperty(name = "上级单位",notes = "")
     private String orgPId ;
+
+     /** 是否责任单位 */
+     @ApiModelProperty(name = "是否责任单位",notes = "")
+    private Boolean isResponsible;
     /** 排序 */
     @ApiModelProperty(name = "排序",notes = "")
     private Integer sortNo ;

src/main/java/com/example/civilizedcity/entity/SysUser.java

@@ -72,4 +72,8 @@ public class SysUser implements Serializable,Cloneable{
      @ApiModelProperty(name = "职责列表", notes = "")
      @TableField(exist = false)
      List<String> dutyList;
+
+     @ApiModelProperty(name = "单位信息", notes = "")
+     @TableField(exist = false)
+     SysOrg org;
 }

src/main/java/com/example/civilizedcity/entity/TaIssue.java

@@ -33,7 +33,8 @@ import lombok.experimental.Accessors;
 @TableName("ta_issue")
 public class TaIssue implements Serializable, Cloneable {
 
-    @ExcelIgnore
+    @ColumnWidth(24)
+    @ExcelProperty(value = "问题单号", index = 0)
     @ApiModelProperty(name = "问题ID", notes = "")
     @TableId(value = "issue_id", type = IdType.AUTO)
     private Integer issueId;
@@ -55,7 +56,7 @@ public class TaIssue implements Serializable, Cloneable {
     private String locId;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "点位", index = 1)
+    @ExcelProperty(value = "点位", index = 2)
     @ApiModelProperty(name = "点位名称", notes = "")
     private String locName;
 
@@ -64,17 +65,17 @@ public class TaIssue implements Serializable, Cloneable {
     private String location;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "位置", index = 2)
+    @ExcelProperty(value = "位置", index = 3)
     @ApiModelProperty(name = "具体位置", notes = "")
     private String addr;
 
     @ColumnWidth(80)
-    @ExcelProperty(value = "问题详情", index = 3)
+    @ExcelProperty(value = "问题详情", index = 4)
     @ApiModelProperty(name = "问题详情", notes = "")
     private String content;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "流程状态", index = 5)
+    @ExcelProperty(value = "流程状态", index = 6)
     @ApiModelProperty(name = "流程节点", notes = "")
     private String processNode;
 
@@ -83,7 +84,7 @@ public class TaIssue implements Serializable, Cloneable {
     private String processStatus;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "截止时间", index = 6)
+    @ExcelProperty(value = "截止时间", index = 7)
     @ApiModelProperty(name = "截止时间", notes = "YYYY-MM-DD")
     private String expireDate;
 
@@ -92,14 +93,14 @@ public class TaIssue implements Serializable, Cloneable {
     private LocalDateTime endDate;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "交办次数", index = 7)
+    @ExcelProperty(value = "交办次数", index = 8)
     @ApiModelProperty(name = "交办次数", notes = "")
     private Integer processNum;
     /**
      * 责任单位
      */
     @ColumnWidth(40)
-    @ExcelProperty(value = "责任单位", index = 4)
+    @ExcelProperty(value = "责任单位", index = 5)
     @ApiModelProperty(name = "责任单位", notes = "")
     private String orgId;
 
@@ -140,7 +141,7 @@ public class TaIssue implements Serializable, Cloneable {
     private String userDuty;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "上报日期", index = 0, converter = LocalDateTimeConverter.class)
+    @ExcelProperty(value = "上报日期", index = 1, converter = LocalDateTimeConverter.class)
     @ApiModelProperty(name = "创建时间", notes = "")
     private LocalDateTime createDate;
 

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

@@ -3,11 +3,11 @@ package com.example.civilizedcity.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.TaIssue;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaOrgIssue;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,14 +20,22 @@ 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("isExpire") Boolean isExpire,
+                                   @Param("locId") String locId);
 
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
 
      Map<String, Object> statMaIndex(@Param("orgId") String orgId);
 
     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);
 }

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

@@ -18,4 +18,6 @@ public interface SysLoginService extends IBaseService<SysLogin> {
      boolean changePassword(SysUser user, WxChangePwd wxChangePwd);
 
     Map<String, Object> loginByPerson(TaPerson taPerson);
+
+    void removeByUser(String userId);
 }

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

@@ -6,18 +6,22 @@ import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.entity.TaOrgIssue;
 
- /**
+import java.util.List;
+
+/**
  * 单位问题单;(ta_org_issue)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-28
  */
 public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
-     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
+     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String issueId, String sourceType, String bizStatus, String locId);
 
      void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
 
      TaOrgIssue getByIssueAndOrg(Integer issueId, String orgId);
 
      void updateData(TaOrgIssue taOrgIssue) throws Exception;
+
+     List<TaIssue> getIssueListBy(String orgId, String issueId, String sourceType, String bizStatus, String locId);
  }

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

@@ -1,6 +1,7 @@
 package com.example.civilizedcity.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.entity.SysUser;
@@ -84,4 +85,11 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
 
         return res;
     }
+
+    @Override
+    public void removeByUser(String userId) {
+        QueryWrapper<SysLogin> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        remove(queryWrapper);
+    }
 }

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

@@ -36,20 +36,20 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     TaAttachMapper taAttachMapper;
 
     @Override
-    public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus) {
+    public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String issueId, String sourceType, String bizStatus, String locId) {
 
         String processNode = null;
         Boolean isExpire = false;
 
         if (!StringUtils.isEmpty(bizStatus)) {
-            if ("expire".equals(bizStatus)) {
+            if ("expire".equals(bizStatus) || "expired".equals(bizStatus)) {
                 isExpire = true;
             } else {
                 processNode = bizStatus;
             }
         }
 
-        return baseMapper.getIssuePageBy(pg, orgId, sourceType, processNode, isExpire);
+        return baseMapper.getIssuePageBy(pg, orgId, issueId, sourceType, processNode, isExpire, locId);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -127,4 +127,21 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         taAttachMapper.deleteNotIn(idList, Constants.SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
         taOrgIssue.setAttachList(attachList);
     }
+
+    @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);
+    }
 }

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

@@ -0,0 +1,121 @@
+package com.example.civilizedcity.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
+import com.example.civilizedcity.common.excel.LocalDateTimeConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.net.URL;
+import java.time.LocalDateTime;
+
+@ContentRowHeight(100)
+@ContentStyle(verticalAlignment = VerticalAlignmentEnum.CENTER)
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "导出问题单", description = "")
+public class IssueExport {
+
+    @ColumnWidth(24)
+    @ExcelProperty(value = "问题单号", index = 0)
+    @ApiModelProperty(name = "问题ID", notes = "")
+    private Integer issueId;
+
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "上报日期", index = 1, converter = LocalDateTimeConverter.class)
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private LocalDateTime createDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "点位", index = 2)
+    @ApiModelProperty(name = "点位名称", notes = "")
+    private String locName;
+
+    @ColumnWidth(50)
+    @ExcelProperty(value = "位置", index = 3)
+    @ApiModelProperty(name = "具体位置", notes = "")
+    private String addr;
+
+    @ColumnWidth(80)
+    @ExcelProperty(value = "问题详情", index = 4)
+    @ApiModelProperty(name = "问题详情", notes = "")
+    private String content;
+
+    @ColumnWidth(40)
+    @ExcelProperty(value = "责任单位", index = 5)
+    @ApiModelProperty(name = "责任单位", notes = "")
+    private String orgId;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "流程状态", index = 6)
+    @ApiModelProperty(name = "流程节点", notes = "")
+    private String processNode;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "截止时间", index = 7)
+    @ApiModelProperty(name = "截止时间", notes = "YYYY-MM-DD")
+    private String expireDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "交办次数", index = 8)
+    @ApiModelProperty(name = "交办次数", notes = "")
+    private Integer processNum;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "问题图片", index = 9)
+    @ApiModelProperty(name = "问题图片", notes = "")
+    private URL url1;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "问题图片", index = 10)
+    @ApiModelProperty(name = "问题图片", notes = "")
+    private URL url2;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "问题图片", index = 11)
+    @ApiModelProperty(name = "问题图片", notes = "")
+    private URL url3;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "问题图片", index = 12)
+    @ApiModelProperty(name = "问题图片", notes = "")
+    private URL url4;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "问题图片", index = 13)
+    @ApiModelProperty(name = "问题图片", notes = "")
+    private URL url5;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "处理结果图片", index = 14)
+    @ApiModelProperty(name = "处理结果图片", notes = "")
+    private URL url6;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "处理结果图片", index = 15)
+    @ApiModelProperty(name = "处理结果图片", notes = "")
+    private URL url7;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "处理结果图片", index = 16)
+    @ApiModelProperty(name = "处理结果图片", notes = "")
+    private URL url8;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "处理结果图片", index = 17)
+    @ApiModelProperty(name = "处理结果图片", notes = "")
+    private URL url9;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "处理结果图片", index = 18)
+    @ApiModelProperty(name = "处理结果图片", notes = "")
+    private URL url10;
+}

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
       # 空闲连接存活最大时间, 默认 600000 - 10分钟
       idle-timeout: 120000 # 2min
       # 最大连接池数, 默认 10
-      maximum-pool-size: 30
+      maximum-pool-size: 10
       # 连接池最长生命 0 无限期, 1800000 - 30分钟
       max-lifetime: 180000 # 3min
       # 连接超时 默认 30000 - 30秒

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 ( t.expire_date <= NOW( ) 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

@@ -10,38 +10,49 @@
           AND t.issue_id = #{issueId}
     </update>
 
-    <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
+    <sql id="getOrgIssueList">
         SELECT
-            *
+        *
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
             EXISTS (
-                SELECT
+            SELECT
                 *
-                FROM
+            FROM
                 ta_org_issue s
-                WHERE
+            WHERE
                 s.issue_id = t.issue_id
-                AND s.org_id = #{orgId}
+                AND s.org_id = t.org_id
                 AND s.`status` &gt; -1
             )
-          <if test="sourceType != null and sourceType == 'feedback'">
-              AND t.source_type = 'feedback'
-          </if>
-          <if test="sourceType != null and sourceType != 'feedback'">
-              AND t.source_type in ('check', 'inspector')
-          </if>
-          <if test="processNode != null and processNode != ''">
+            AND t.org_id = #{orgId}
+        <if test="issueId != null and issueId != ''">
+            AND t.issue_id = #{issueId}
+        </if>
+        <if test="sourceType != null and sourceType == 'feedback'">
+            AND t.source_type = 'feedback'
+        </if>
+        <if test="sourceType != null and sourceType != 'feedback'">
+            AND t.source_type in ('check', 'inspector')
+        </if>
+        <if test="locId != null and locId != ''">
+            AND t.loc_id = #{locId}
+        </if>
+        <if test="processNode != null and processNode != ''">
             AND t.process_node LIKE CONCAT(#{processNode}, '%')
-          </if>
-          <if test="isExpire != null and isExpire">
+        </if>
+        <if test="isExpire != null and isExpire">
             AND t.process_node != '03'
-            AND t.expire_date &lt;= now( )
-          </if>
+            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(now())
+        </if>
             AND t.`status` &gt; -1
         ORDER BY
             t.create_date DESC
+    </sql>
+
+    <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
+        <include refid="getOrgIssueList"></include>
     </select>
     <select id="getByIssueAndOrg" resultType="com.example.civilizedcity.entity.TaOrgIssue">
         SELECT
@@ -52,16 +63,29 @@
             t.issue_id = #{issueId}
           AND t.org_id = #{orgId}
           AND t.`status` = 1
+        ORDER BY t.create_date DESC
+        LIMIT 1
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM( IF ( TO_DAYS( now( ) ) > TO_DAYS( s.expire_date ) AND s.process_node != '03', 1, 0 ) ) AS delay_num,
-            SUM( IF (s.process_node = '03', 1, 0 ) ) AS end_num,
-            SUM( IF (s.process_node != '03', 1, 0 ) ) AS doing_num
-        from ta_org_issue t
-                 INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
-        where t.org_id = #{orgId}
+            SUM( IF ( TO_DAYS( now( ) ) > 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
+        where EXISTS (
+                SELECT
+                    *
+                FROM
+                    ta_org_issue s
+                WHERE
+                    s.issue_id = t.issue_id
+                  AND s.org_id = t.org_id
+                  AND s.`status` > - 1
+            )
+            and t.org_id = #{orgId}
           and t.`status` &gt; -1
-          and s.`status` &gt; -1
+    </select>
+    <select id="getIssueListBy" resultType="com.example.civilizedcity.entity.TaIssue">
+        <include refid="getOrgIssueList"></include>
     </select>
 </mapper>