消单申请驳回申请修改

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

@@ -79,7 +79,9 @@ public class TaIssueApplyController extends BaseController {
      */
     @ApiOperation("获取申请条数")
     @GetMapping("/taIssueApply/nums")
-    public ResponseBean countApply(@ApiParam("申请状态") @RequestParam(value = "state", defaultValue = "0") Integer state,
+    public ResponseBean countApply(
+            @ApiParam("申请状态") @RequestParam(value = "state", defaultValue = "0") Integer state,
+            @ApiParam("是否删除") @RequestParam(value = "status", defaultValue = "-1") Integer status,
                                    @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
 
         String orgId = getOrgId();
@@ -87,6 +89,7 @@ public class TaIssueApplyController extends BaseController {
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotEmpty(applyType), "apply_type", applyType);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
+        queryWrapper.gt("status",status);
 
         if (0 == state) {
             queryWrapper.isNull("verify_date");

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

@@ -241,7 +241,7 @@ public class TaOrgIssueController extends BaseController {
     /**
      * 通过主键删除数据
      *
-     * @param orgIssueId
+     * @param issueId
      * @return 是否成功
      *
      */

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

@@ -20,4 +20,7 @@ public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
                                    @Param("orgId") String orgId,
                                    @Param("sourceType") String sourceType,
                                    @Param("isAll") Boolean isAll);
+
+     int removeByIssueId(@Param("issueId") String issueId);
+
  }

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

@@ -26,6 +26,8 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
 
     @Autowired
     TaIssueMapper taIssueMapper;
+    @Autowired
+    TaIssueApplyMapper taIssueApplyMapper;
 
     @Autowired
     TaIssueProcessMapper taIssueProcessMapper;
@@ -146,6 +148,7 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     public void removeByIssueId(String issueId){
         baseMapper.removeByIssueId(issueId);
         taIssueMapper.removeByIssueId(issueId);
+        taIssueApplyMapper.removeByIssueId(issueId);
        }
 
 }

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -2,18 +2,24 @@
 <!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">
+    <update id="removeByIssueId">
+        UPDATE ta_issue_apply t
+        SET t.status =-1
+        WHERE
+        t.issue_id = #{issueId};
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssueApply">
         SELECT
-            t.*,
-            s.content AS issue_content,
-            s.addr AS issue_addr
+        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
+        ta_issue_apply t
+        INNER JOIN ta_issue s ON t.issue_id = s.issue_id
         WHERE
-            t.`status` &gt; -1
-            AND s.`status` &gt; -1
+        t.`status` &gt; -1
+        <!--            AND s.`status` &gt; -1-->
         <if test="issueId != null">
             AND t.issue_id = #{issueId}
         </if>
@@ -21,7 +27,7 @@
             AND t.apply_type = #{applyType}
         </if>
         <if test="orgId != null and orgId != ''">
-          AND t.org_id = #{orgId}
+            AND t.org_id = #{orgId}
         </if>
         <if test="sourceType != null and sourceType == 'feedback'">
             AND s.source_type = 'feedback'
@@ -33,7 +39,7 @@
             AND t.verify_date is null
         </if>
         ORDER BY
-            IFNULL(t.verify_status, -1) ASC,
-            t.create_date DESC
+        IFNULL(t.verify_status, -1) ASC,
+        t.create_date DESC
     </select>
 </mapper>