feats

db/.back_文明创办/文明创办-backup-20221228183638.pdma.json → db/.back_文明创办/文明创办-backup-20221230093454.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-28 16:00:46",
+  "updatedTime": "2022-12-29 16:25:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4366,7 +4366,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
         },
         {
@@ -4467,7 +4467,7 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
           "uiHint": ""
         },
@@ -7858,6 +7858,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
         },
+        {
+          "defKey": "result",
+          "defName": "处理结果",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "A9868395-4BC7-464D-8BA5-07EFEB6CDF6E"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/.back_文明创办/文明创办-backup-20221228183752.pdma.json → db/.back_文明创办/文明创办-backup-20221230141755.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-28 18:36:38",
+  "updatedTime": "2022-12-30 09:34:54",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4366,7 +4366,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
         },
         {
@@ -7503,7 +7503,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
         },
         {
@@ -7554,7 +7554,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
         },
         {
@@ -7571,7 +7571,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
         },
         {
@@ -7858,6 +7858,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
         },
+        {
+          "defKey": "result",
+          "defName": "处理结果",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "A9868395-4BC7-464D-8BA5-07EFEB6CDF6E"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-29 16:25:56",
+  "updatedTime": "2022-12-30 14:17:55",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3674,6 +3674,40 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "94EE1F8F-61A7-4104-B747-4E1C0036CBB8"
         },
+        {
+          "defKey": "apply_type",
+          "defName": "当前申请",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "EA6F4EA5-1BD9-4919-B756-BA0A4949E625"
+        },
+        {
+          "defKey": "apply_id",
+          "defName": "当前申请ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D30F4AC2-D4FE-452A-9A75-4821F0F0BA1E"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -7503,7 +7537,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
         },
         {
@@ -7554,7 +7588,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
         },
         {
@@ -7571,7 +7605,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
         },
         {

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

@@ -82,16 +82,14 @@ public class TaIssueApplyController extends BaseController {
     @GetMapping("/taIssueApply")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                             @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
+                             @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
+                             @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
 
         SysUser sysUser = currentUser();
+        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
 
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isEmpty(applyType),"apply_type", applyType);
-        queryWrapper.nested(q -> q.eq("org_id", sysUser.getOrgId()).or().eq("verify_org", sysUser.getOrgId()));
-        queryWrapper.orderByDesc("create_date");
-        IPage<TaIssueApply> result = taIssueApplyService.page(pg, queryWrapper);
+        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, applyType, orgId, sourceType);
 
         return ResponseBean.success(result);
     }

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

@@ -75,6 +75,7 @@ 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("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                              @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine) throws Exception {
 
         SysUser sysUser = currentUser();
@@ -102,6 +103,8 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
+        queryWrapper.eq(Constants.ISSUE_SOURCE_FEEDBACK.equals(sourceType), "source_type", "feedback");
+        queryWrapper.ne(Constants.ISSUE_SOURCE_INSPECTOR.equals(sourceType), "source_type", "feedback");
         queryWrapper.eq(mine, "create_user", sysUser.getUserId());
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -72,4 +73,11 @@ public class TaIssueApply implements Serializable,Cloneable{
     @ApiModelProperty(name = "申请时间",notes = "")
     private LocalDateTime createDate ;
 
+    @TableField(exist = false)
+    @ApiModelProperty(name = "问题单内容",notes = "")
+    private String issueContent;
+
+     @TableField(exist = false)
+     @ApiModelProperty(name = "问题单地址",notes = "")
+     private String issueAddr;
 }

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

@@ -1,6 +1,7 @@
 package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaIssueApply;
@@ -12,5 +13,9 @@ import com.example.civilizedcity.entity.TaIssueApply;
  */
 @Mapper
 public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
-    
-}
+
+     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg,
+                                   @Param("applyType") String applyType,
+                                   @Param("orgId") String orgId,
+                                   @Param("sourceType") String sourceType);
+ }

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

@@ -17,4 +17,8 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
      IPage<TaIssue> getPageBy(IPage<TaIssue> pg, @Param("orgId") String orgId);
 
      IPage<TaIssue> getAllBy(IPage<TaIssue> pg);
+
+     int updateApply(@Param("issueId") Integer issueId,
+                     @Param("applyType") String applyType,
+                     @Param("applyId") Integer applyId);
  }

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssueApply;
@@ -12,4 +13,6 @@ import com.example.civilizedcity.entity.TaIssueApply;
 public interface TaIssueApplyService extends IBaseService<TaIssueApply> {
 
      void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception;
+
+     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, String applyType, String orgId, String sourceType);
  }

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

@@ -1,7 +1,9 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.ResponseBean;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.mapper.TaIssueMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaIssueApply;
@@ -19,6 +21,9 @@ import java.time.LocalDateTime;
 @Service
 public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper, TaIssueApply> implements TaIssueApplyService {
 
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
     @Override
     public void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception {
 
@@ -33,5 +38,12 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
         taIssueApply.setCreateDate(LocalDateTime.now());
 
         save(taIssueApply);
+
+        taIssueMapper.updateApply(taIssueApply.getIssueId(), taIssueApply.getApplyType(), taIssueApply.getApplyId());
+    }
+
+    @Override
+    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, String applyType, String orgId, String sourceType) {
+        return baseMapper.getPageBy(pg, applyType, orgId, sourceType);
     }
 }

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -2,5 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaIssueApplyMapper">
-    
+
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssueApply">
+        SELECT
+            t.*,
+            s.content AS issue_content,
+            s.addr AS issue_addr
+        FROM
+            ta_issue_apply t
+                INNER JOIN ta_issue s ON t.issue_id = s.issue_id
+        WHERE
+            t.`status` &gt; -1
+        <if test="applyType != null and applyType != ''">
+            AND t.apply_type = #{applyType}
+        </if>
+        <if test="orgId != null and orgId != ''">
+          AND t.org_id = #{orgId}
+        </if>
+        <if test="sourceType != null and sourceType == 'feedback'">
+            AND s.source_type = 'feedback'
+        </if>
+        <if test="sourceType != null and sourceType != 'feedback'">
+            AND s.source_type != 'feedback'
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaIssueMapper.xml

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaIssueMapper">
+    <update id="updateApply">
+        UPDATE ta_issue t
+        SET t.apply_type = #{applyType},
+            t.apply_id = #{applyId}
+        WHERE
+            t.issue_id = #{issueId}
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT