1111

db/.back_文明创办/.back_文明创办/文明创办-backup-2023511103013.pdma.json → db/.back_文明创办/.back_文明创办/文明创办-backup-2023511112401.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-11 10:16:45",
+  "updatedTime": "2023-5-11 10:30:13",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3713,7 +3713,7 @@
         {
           "defKey": "source_type",
           "defName": "来源类型",
-          "comment": "feedback市民上报,check模拟测评,dailySpe日常督查",
+          "comment": "feedback市民上报,issue模拟测评,dailySpe日常督查",
           "type": "",
           "len": "",
           "scale": "",

db/.back_文明创办/.back_文明创办/文明创办-backup-2023511101645.pdma.json → db/.back_文明创办/.back_文明创办/文明创办-backup-2023511112445.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-8 16:33:28",
+  "updatedTime": "2023-5-11 11:24:01",
   "dbConns": [],
   "profile": {
     "default": {

db/.back_文明创办/文明创办-backup-2023510115646.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-11 10:30:13",
+  "updatedTime": "2023-5-11 16:31:13",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3713,7 +3713,7 @@
         {
           "defKey": "source_type",
           "defName": "来源类型",
-          "comment": "feedback市民上报,issue模拟测评,dailySpe日常督查",
+          "comment": "feedback市民上报,check模拟测评",
           "type": "",
           "len": "",
           "scale": "",
@@ -3930,6 +3930,23 @@
           "extProps": {},
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
+        },
+        {
+          "defKey": "source_type2",
+          "defName": "问题来源PC",
+          "comment": "check 模拟测评  feedback 市民上报  inspector 督查员上报",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "42892AD2-FF8E-4D87-8705-14737E34AE9A"
         }
       ],
       "correlations": [],

db/upgrade.1.1.sql

@@ -7,3 +7,5 @@ ALTER TABLE `sys_org`
     ADD COLUMN `culture_term` varchar(255) NULL COMMENT '文明用语' AFTER copy_from;
 
 
+ALTER TABLE `ta_issue`
+ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;

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

@@ -49,13 +49,14 @@ public class ExportIssueUtil {
                 issueExport.setUserName(taIssue.getUserName());
                 issueExport.setEndDate(taIssue.getEndDate());
 //                issueExport.setSourceType(taIssue.getSourceType());
-                String sourceType=taIssue.getSourceType();
-                if(sourceType.equals(Constants.SOURCE_FEEDBACK)){
-                    issueExport.setSourceType("市民上报");
-                }else if(sourceType.equals(Constants.SOURCE_CHECK)){
-                    issueExport.setSourceType("实地测评");
-                }else if(sourceType.equals(Constants.SOURCE_INSPECTOR)){
-                    issueExport.setSourceType("日常督查");
+//                此处是PC端excel表展示
+                String sourceType2=taIssue.getSourceType();
+                if(sourceType2.equals(Constants.SOURCE_FEEDBACK)){
+                    issueExport.setSourceType2("市民上报");
+                }else if(sourceType2.equals(Constants.SOURCE_CHECK)){
+                    issueExport.setSourceType2("实地测评");
+                }else if(sourceType2.equals(Constants.SOURCE_INSPECTOR)){
+                    issueExport.setSourceType2("日常督查");
                 }
 
                 // 转换机构

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

@@ -2,27 +2,25 @@ package com.example.civilizedcity.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.enums.SqlLike;
 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.*;
-import java.util.stream.Collectors;
-
-import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
 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;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 问题表;(ta_issue)表控制层
@@ -75,6 +73,7 @@ public class TaIssueController extends BaseController {
 
     /**
      * 构造 查询构造器
+     *
      * @param sysUser
      * @param params
      * @return
@@ -85,6 +84,7 @@ public class TaIssueController extends BaseController {
         String typeId = (String) params.get("typeId");
         String bizStatus = (String) params.get("bizStatus");
         String sourceType = (String) params.get("sourceType");
+        String sourceType2 = (String) params.get("sourceType2");
         String locId = (String) params.get("locId");
         Boolean mine = (Boolean) params.get("mine");
         String orgId = (String) params.get("orgId");
@@ -151,7 +151,8 @@ public class TaIssueController extends BaseController {
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
-        queryWrapper.eq(StringUtils.isNotEmpty(sourceType), "source_type", sourceType);
+//        此处是PC端的查询问题来源
+        queryWrapper.eq(StringUtils.isNotEmpty(sourceType2), "source_type", sourceType2);
         queryWrapper.like(StringUtils.isNotEmpty(userName), "user_name", userName);
         queryWrapper.between(null != createDateStart, "create_date", createDateStart, createDateEnd);
         queryWrapper.between(null != endDateStart, "end_date", endDateStart, endDateEnd);
@@ -178,6 +179,7 @@ public class TaIssueController extends BaseController {
                              @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("PC来源") @RequestParam(value = "sourceType2", required = false) String sourceType2,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                              @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
@@ -201,6 +203,7 @@ public class TaIssueController extends BaseController {
         params.put("typeId", typeId);
         params.put("bizStatus", bizStatus);
         params.put("sourceType", sourceType);
+        params.put("sourceType2", sourceType2);
         params.put("locId", locId);
         params.put("mine", mine);
         params.put("orgId", orgId);
@@ -232,6 +235,7 @@ public class TaIssueController extends BaseController {
                                @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 = "sourceType2", required = false) String sourceType2,
                                @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                                @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                                @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
@@ -258,6 +262,7 @@ public class TaIssueController extends BaseController {
         params.put("typeId", typeId);
         params.put("bizStatus", bizStatus);
         params.put("sourceType", sourceType);
+        params.put("sourceType2", sourceType2);
         params.put("locId", locId);
         params.put("mine", mine);
         params.put("orgId", orgId);
@@ -323,7 +328,6 @@ public class TaIssueController extends BaseController {
     }
 
 
-
     /**
      * 复制问题单
      *

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

@@ -104,10 +104,14 @@ public class TaIssue implements Serializable, Cloneable {
     @ApiModelProperty(name = "责任单位", notes = "")
     private String orgId;
 
+    @ExcelIgnore
+    @ApiModelProperty(name = "来源类型", notes = "feedback市民上报,check模拟测评")
+    private String sourceType;
+
     @ColumnWidth(30)
-    @ExcelProperty(value = "责任单位", index = 9)
+    @ExcelProperty(value = "来源类型", index = 9)
     @ApiModelProperty(name = "来源类型", notes = "check 模拟测评  feedback 市民上报  inspector 督查员上报")
-    private String sourceType;
+    private String sourceType2;
 
     @ExcelIgnore
     @ApiModelProperty(name = "来源ID", notes = "")

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

@@ -36,7 +36,7 @@ public class IssueExport {
     @ColumnWidth(24)
     @ExcelProperty(value = "问题来源")
     @ApiModelProperty(name = "问题来源", notes = "check 模拟测评  feedback 市民上报  inspector 督查员上报")
-    private String sourceType;
+    private String sourceType2;
 
     @ColumnWidth(30)
     @ExcelProperty(value = "上报日期", converter = LocalDateTimeConverter.class)