feats

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

@@ -24,6 +24,8 @@ public class Constants {
 
     // 问题单
     public final static String ATTACH_SOURCE_ISSUE = "issue";
+    // 市民上报
+    public final static String ATTACH_SOURCE_FEEDBACK = "feedback";
     // 单位问题单
     public final static String ATTACH_SOURCE_ORG_ISSUE = "org-issue";
     // 测评答案

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

@@ -4,8 +4,15 @@ 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 java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.service.TaAttachService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,17 +33,23 @@ public class TaFeedbackController extends BaseController {
     
     @Autowired
     private TaFeedbackService taFeedbackService;
+
+    @Autowired
+    private TaAttachService taAttachService;
     
     /** 
      * 通过ID查询单条数据 
      *
-     * @param feedbackId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taFeedback/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(taFeedbackService.getById(id));
+        TaFeedback taFeedback = taFeedbackService.getById(id);
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_FEEDBACK, taFeedback.getFeedbackId());
+        taFeedback.setAttachList(attachList);
+        return ResponseBean.success(taFeedback);
     }
     
     /** 
@@ -49,12 +62,19 @@ public class TaFeedbackController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/taFeedback")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("我的") @RequestParam(value ="isMine", defaultValue = "false") Boolean isMine,
+                             @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus) throws Exception {
+
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson && isMine) {
+            return ResponseBean.error("请在小程序中操作");
+        }
+
+        String personId = isMine ? taPerson.getPersonId() : null;
         
-        IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaFeedback> result = taFeedbackService.page(pg);
+        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+        IPage<TaIssue> result = taFeedbackService.getPageBy(pg, personId, bizStatus);
         
         return ResponseBean.success(result);
     }
@@ -68,23 +88,37 @@ public class TaFeedbackController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taFeedback")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback) throws Exception {
-        taFeedbackService.save(taFeedback);
+
+        if (StringUtils.isEmpty(taFeedback.getContent())) {
+            return ResponseBean.error("请填写反馈内容");
+        }
+        if (StringUtils.isEmpty(taFeedback.getAddr())) {
+            return ResponseBean.error("请填写具体位置");
+        }
+
+        if (null == taFeedback.getAttachList() || taFeedback.getAttachList().size() == 0) {
+            return ResponseBean.error("请上传照片");
+        }
+
+        TaPerson taPerson = currentPerson();
+
+        taFeedbackService.createNew(taFeedback, taPerson);
         return ResponseBean.success(taFeedback);
     }
     
-    /** 
-     * 更新数据
-     *
-     * @param taFeedback 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/taFeedback/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        taFeedbackService.updateById(taFeedback);
-        return ResponseBean.success(taFeedback);
-    }
+//    /**
+//     * 更新数据
+//     *
+//     * @param taFeedback 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/taFeedback/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        taFeedbackService.updateById(taFeedback);
+//        return ResponseBean.success(taFeedback);
+//    }
     
     /** 
      * 通过主键删除数据
@@ -94,7 +128,21 @@ public class TaFeedbackController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taFeedback/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson) {
+            return ResponseBean.error("请在小程序中操作");
+        }
+
+        TaFeedback taFeedback = taFeedbackService.getById(id);
+        if (null == taFeedback || taFeedback.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到相关数据");
+        }
+
+        if (!taPerson.getPersonId().equals(taFeedback.getPersonId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
         taFeedbackService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/example/civilizedcity/entity/TaFeedback.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;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -66,4 +69,8 @@ public class TaFeedback implements Serializable,Cloneable{
     @ApiModelProperty(name = "创建时间",notes = "")
     private LocalDateTime createDate ;
 
+
+     @TableField(exist = false)
+     @ApiModelProperty(name = "文件列表",notes = "")
+     private List<TaAttach> attachList;
 }

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

@@ -1,23 +1,32 @@
 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.TaFeedback;
 
+import java.util.List;
 import java.util.Map;
 
 /**
  * 反馈表;(ta_feedback)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2023-1-30
  */
 @Mapper
-public interface TaFeedbackMapper  extends BaseMapper<TaFeedback>{
+public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
 
-     long countByVerifyStatus(@Param("personId") String personId, @Param("verifyStatus") String verifyStatus);
+    long countByVerifyStatus(@Param("personId") String personId, @Param("verifyStatus") String verifyStatus);
 
-     @MapKey("id")
-     Map<String, Object> statMaIndex(@Param("personId") String personId);
- }
+    @MapKey("id")
+    Map<String, Object> statMaIndex(@Param("personId") String personId);
+
+    IPage<TaIssue> getPageBy(IPage<TaIssue> pg,
+                             @Param("personId") String personId,
+                             @Param("processList") List<String> processList,
+                             @Param("verifyStatus") String verifyStatus);
+}

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

@@ -1,13 +1,20 @@
 package com.example.civilizedcity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaFeedback;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
 
- /**
+/**
  * 反馈表;(ta_feedback)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2023-1-30
  */
 public interface TaFeedbackService extends IBaseService<TaFeedback> {
-    
+
+    void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception;
+
+    IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus);
 }

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

@@ -1,16 +1,133 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.mapper.TaAttachMapper;
+import com.example.civilizedcity.mapper.TaIssueMapper;
+import com.example.civilizedcity.mapper.TaPersonMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaFeedback;
 import com.example.civilizedcity.mapper.TaFeedbackMapper;
 import com.example.civilizedcity.service.TaFeedbackService;
- /**
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
  * 反馈表;(ta_feedback)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2023-1-30
  */
 @Service
 public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements TaFeedbackService {
-    
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception {
+
+        // 准备 TaFeedback 数据
+        taFeedback.setFeedbackId(StringUtils.uuid());
+
+        if (StringUtils.isEmpty(taFeedback.getName())) {
+            taFeedback.setName(taPerson.getName());
+        } else {
+            if (StringUtils.isEmpty(taPerson.getName())) {
+                taPerson.setName(taFeedback.getName());
+                taPersonMapper.updateById(taPerson);
+            }
+        }
+
+        if (StringUtils.isEmpty(taFeedback.getPhone())) {
+            taFeedback.setPhone(taPerson.getPhone());
+        }
+
+        taFeedback.setPersonId(taPerson.getPersonId());
+        taFeedback.setStatus(Constants.STATUS_NORMAL);
+        taFeedback.setCreateDate(LocalDateTime.now());
+
+        // 准备 TaIssue 数据
+        TaIssue taIssue = new TaIssue();
+        taIssue.setTitle(taFeedback.getTitle());
+        taIssue.setLocation(taFeedback.getLocation());
+        taIssue.setAddr(taFeedback.getAddr());
+        taIssue.setContent(taFeedback.getContent());
+
+        taIssue.setOrgId(null); // 暂时没有责任单位
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssue.setProcessNum(1);
+        taIssue.setSourceType(Constants.ISSUE_SOURCE_FEEDBACK);
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreateUser(taFeedback.getPersonId());
+        taIssue.setUserName(taFeedback.getName());
+        taIssue.setCreateDate(LocalDateTime.now());
+        taIssueMapper.insert(taIssue);
+        // 保存文件
+        List<TaAttach> attachList = taFeedback.getAttachList();
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
+                item.setOwnerId(taIssue.getIssueId().toString());
+                item.setStatus(Constants.STATUS_NORMAL);
+                item.setCreateDate(LocalDateTime.now());
+                taAttachMapper.insert(item);
+            }
+        }
+
+        taFeedback.setIssueId(taIssue.getIssueId().toString());
+        save(taFeedback);
+        // 保存文件
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.ATTACH_SOURCE_FEEDBACK);
+                item.setOwnerId(taFeedback.getFeedbackId());
+                taAttachMapper.insert(item);
+            }
+        }
+
+    }
+
+    @Override
+    public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus) {
+
+        List<String> processList = new ArrayList<>();
+        String verifyStatus = null;
+
+        // 未处理
+        if (Constants.PROCESS_START.equals(bizStatus)) {
+            processList.add(Constants.PROCESS_START);
+        }
+
+        // 已处理, 包含处理中以及已完成的
+        if (Constants.PROCESS_ASSIGNED.equals(bizStatus)) {
+            processList.add(Constants.PROCESS_ASSIGNED);
+            processList.add(Constants.PROCESS_END);
+        }
+
+        // 已打回
+        if (Constants.APPLY_STATUS_REJECT.equals(bizStatus)) {
+            verifyStatus = Constants.APPLY_STATUS_REJECT;
+        }
+
+        return baseMapper.getPageBy(pg, personId, processList, verifyStatus);
+    }
 }

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -27,4 +27,29 @@
             t.person_id = #{personId}
           AND t.`status` > -1
     </select>
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
+        SELECT
+            s.*
+        FROM
+            ta_feedback t
+                INNER JOIN ta_issue s ON t.issue_id = s.issue_id
+        WHERE
+            1 = 1
+          <if test="null != personId and personId != ''">
+              AND t.person_id = #{personId}
+          </if>
+          <if test="processList != null">
+              AND s.process_node IN
+              <foreach item="item" collection="processList" separator="," open="(" close=")">
+                  #{item}
+              </foreach>
+          </if>
+        <if test="null != verifyStatus and verifyStatus != ''">
+          AND t.verify_status = #{verifyStatus}
+        </if>
+          AND t.`status` &gt; -1
+          AND s.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>