111

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

@@ -235,6 +235,24 @@ public class TaOrgIssueController extends BaseController {
         taOrgIssueService.updateData(taOrgIssue);
         return ResponseBean.success(taOrgIssue);
     }
+
+
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param orgIssueId
+     * @return 是否成功
+     *
+     */
+
+    @ApiOperation(value="通过主键删除数据",httpMethod="DELETE")
+    @DeleteMapping("/taOrgIssue/{issueId}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String issueId){
+        taOrgIssueService.removeByIssueId(issueId);
+        return ResponseBean.success("success成功删除");
+    }
+
 //
 //    /**
 //     * 通过主键删除数据

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

@@ -99,4 +99,8 @@ public class TdIssueTypeController extends BaseController {
         tdIssueTypeService.removeLogicById(id);
         return ResponseBean.success("success");
     }
+
+
+
+
 }

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

@@ -56,11 +56,11 @@ public class TdLocTypeController extends BaseController {
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
 
         IPage<TdLocType> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TdLocType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
-        queryWrapper.orderByDesc("create_date");
-        IPage<TdLocType> result = tdLocTypeService.page(pg, queryWrapper);
-
+//        QueryWrapper<TdLocType> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.gt("status", Constants.STATUS_DELETE);
+//        queryWrapper.orderByDesc("create_date");
+//        IPage<TdLocType> result = tdLocTypeService.page(pg, queryWrapper);
+        IPage<TdLocType> result = tdLocTypeService.pageAsc(pg);
         return ResponseBean.success(result);
     }
 

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

@@ -40,4 +40,8 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
                       @Param("processStatus") String processStatus);
 
     List<StatVo> statIssueLoc();
+
+
+    int removeByIssueId(@Param("issueId") String issueId);
+
 }

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

@@ -27,4 +27,5 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
     int updateProcess(@Param("issueId") Integer issueId,@Param("orgId") String orgId,@Param("processStatus") String processStatus);
 
     List<TaIssue> getIssueListBy(@Param("params") Map<String, Object> params);
+    int removeByIssueId(@Param("issueId") String issueId);
 }

src/main/java/com/example/civilizedcity/mapper/TdLocTypeMapper.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.TdLocType;
@@ -12,5 +13,6 @@ import com.example.civilizedcity.entity.TdLocType;
  */
 @Mapper
 public interface TdLocTypeMapper  extends BaseMapper<TdLocType>{
-    
-}
+  IPage<TdLocType> sortAsc(IPage<TdLocType> pg);
+
+ }

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

@@ -25,4 +25,6 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
      void updateData(TaOrgIssue taOrgIssue) throws Exception;
 
      List<TaIssue> getIssueListBy(Map<String, Object> params);
- }
+
+     void removeByIssueId(String issueId);
+}

src/main/java/com/example/civilizedcity/service/TdLocTypeService.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.TdLocType;
 
@@ -9,5 +10,5 @@ import com.example.civilizedcity.entity.TdLocType;
  * @date : 2022-12-12
  */
 public interface TdLocTypeService extends IBaseService<TdLocType> {
-    
-}
+  IPage<TdLocType> pageAsc(IPage<TdLocType> pg);
+ }

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

@@ -36,6 +36,7 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     @Autowired
     TaAttachMapper taAttachMapper;
 
+
     private void transParams(Map<String, Object> params) {
         params.put("processNode", null);
         params.put("isExpire", false);
@@ -140,4 +141,11 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         transParams(params);
         return baseMapper.getIssueListBy(params);
     }
+
+    @Override
+    public void removeByIssueId(String issueId){
+        baseMapper.removeByIssueId(issueId);
+        taIssueMapper.removeByIssueId(issueId);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TdLocType;
@@ -12,5 +13,9 @@ import com.example.civilizedcity.service.TdLocTypeService;
  */
 @Service
 public class TdLocTypeServiceImpl extends BaseServiceImpl<TdLocTypeMapper, TdLocType> implements TdLocTypeService {
-    
+  @Override
+  public IPage<TdLocType> pageAsc(IPage<TdLocType> pg) {
+   IPage<TdLocType> result = (IPage<TdLocType>) baseMapper.sortAsc(pg);
+   return result;
+  }
 }

src/main/resources/mapper/TaIssueMapper.xml

@@ -25,6 +25,13 @@
             t.issue_id = #{issueId}
     </update>
 
+    <update id="removeByIssueId">
+        UPDATE ta_issue t
+        SET t.status =-1
+        WHERE
+        t.issue_id = #{issueId};
+    </update>
+
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
             *

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -9,6 +9,12 @@
             t.org_id = #{orgId}
           AND t.issue_id = #{issueId}
     </update>
+    <update id="removeByIssueId">
+        UPDATE ta_org_issue t
+        SET t.status =-1
+        WHERE
+        t.issue_id = #{issueId};
+    </update>
 
     <sql id="getOrgIssueList">
         SELECT

src/main/resources/mapper/TdLocTypeMapper.xml

@@ -2,5 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TdLocTypeMapper">
-    
+    <select id="sortAsc" resultType="com.example.civilizedcity.entity.TdLocType">
+        SELECT
+        * FROM td_loc_type t
+        WHERE
+        t.STATUS !=- 1
+        order by t.sort_no ASC
+    </select>
+
 </mapper>