111

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

@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.service.TaOrgIssueService;
 
- /**
+import javax.xml.ws.Response;
+
+/**
  * 单位问题单;(ta_org_issue)表控制层
  * @author : http://njyunzhi.com
  * @date : 2022-12-28
@@ -124,10 +126,28 @@ public class TaOrgIssueController extends BaseController {
      * @param orgIssueId 主键
      * @return 是否成功
      */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taOrgIssue/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        taOrgIssueService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
-}
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/taOrgIssue/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+//        taOrgIssueService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
+
+
+/**
+ * 通过主键删除数据
+ *
+ * @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/TdLocTypeController.java

@@ -6,16 +6,13 @@ 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.entity.TdLocType;
+import com.example.civilizedcity.service.TdLocTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TdLocType;
-import com.example.civilizedcity.service.TdLocTypeService;
 
 /**
  * 点位分类;(td_loc_type)表控制层
@@ -56,12 +53,13 @@ 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.orderByAsc("sort_no");
+//        IPage<TdLocType> result = tdLocTypeService.page(pg, queryWrapper);
 
-        return ResponseBean.success(result);
+        IPage<TdLocType> result = tdLocTypeService.pageAsc(pg);
+        return ResponseBean.success( result );
     }
 
     /**

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

@@ -38,4 +38,7 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
                       @Param("userId") String userId,
                       @Param("processNode") String processNode,
                       @Param("processStatus") String processStatus);
+
+    int removeByIssueId(@Param("issueId") String issueId);
+
 }

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

@@ -30,4 +30,7 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
      Map<String, Object> statMaIndex(@Param("orgId") String orgId);
 
     int updateProcess(@Param("issueId") Integer issueId,@Param("orgId") String orgId,@Param("processStatus") String processStatus);
+
+    int removeByIssueId(@Param("issueId") String issueId);
+
 }

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

@@ -1,16 +1,21 @@
 package com.example.civilizedcity.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
- /**
+import java.util.List;
+
+/**
  * 点位分类;(td_loc_type)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface TdLocTypeMapper  extends BaseMapper<TdLocType>{
-    
+
+    IPage<TdLocType> sortAsc(IPage<TdLocType> pg);
 }

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

@@ -14,6 +14,7 @@ import com.example.civilizedcity.entity.TaOrgIssue;
 public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
+     void removeByIssueId(String issueId);
 
      void createNewIssue(TaIssue taIssue, SysUser sysUser);
  }

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

@@ -1,13 +1,21 @@
 package com.example.civilizedcity.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.TdLocType;
 
- /**
+import java.util.List;
+
+/**
  * 点位分类;(td_loc_type)表服务接口
  * @author : http://njyunzhi.com
  * @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

@@ -6,6 +6,8 @@ import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaIssueProcess;
+import com.example.civilizedcity.mapper.TaIssueMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
@@ -22,6 +24,9 @@ import java.time.LocalDateTime;
 @Service
 public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaOrgIssue> implements TaOrgIssueService {
 
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
     @Override
     public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus) {
 
@@ -51,4 +56,11 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
 
         save(taOrgIssue);
     }
+
+    @Override
+    public void removeByIssueId(String issueId){
+       baseMapper.removeByIssueId(issueId);
+        taIssueMapper.removeByIssueId(issueId);
+    }
+
 }

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

@@ -1,16 +1,25 @@
 package com.example.civilizedcity.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.TdLocType;
 import com.example.civilizedcity.mapper.TdLocTypeMapper;
 import com.example.civilizedcity.service.TdLocTypeService;
- /**
+import org.springframework.stereotype.Service;
+
+/**
  * 点位分类;(td_loc_type)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @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

@@ -5,97 +5,103 @@
     <update id="updateApply">
         UPDATE ta_issue t
         SET t.apply_type = #{applyType},
-            t.apply_id = #{applyId}
+        t.apply_id = #{applyId}
         WHERE
-            t.issue_id = #{issueId}
+        t.issue_id = #{issueId}
     </update>
     <update id="updateValidateStatus">
         UPDATE ta_issue t
         SET t.validate_status = #{validateStatus}
         WHERE
-            t.issue_id = #{issueId}
+        t.issue_id = #{issueId}
     </update>
     <update id="updateProcess">
         UPDATE ta_issue t
         SET t.process_node = #{processNode},
-            t.process_status = #{processStatus},
-            t.update_user = #{userId},
-            t.update_date = now( )
+        t.process_status = #{processStatus},
+        t.update_user = #{userId},
+        t.update_date = now( )
         WHERE
-            t.issue_id = #{issueId}
+        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
-            *
+        *
+        FROM
+        ta_issue t
+        WHERE
+        EXISTS (
+        SELECT
+        *
         FROM
-            ta_issue t
+        ta_issue_process s ON s.issue_id = t.issue_id
         WHERE
-            EXISTS (
-                    SELECT
-                        *
-                    FROM
-                        ta_issue_process s ON s.issue_id = t.issue_id
-                    WHERE
-                    ( s.org_id = #{orgId} OR s.next_org = #{orgId} )
-                        AND s.`status` &gt; -1
-                )
-          AND t.`status` &gt; -1
+        ( s.org_id = #{orgId} OR s.next_org = #{orgId} )
+        AND s.`status` &gt; -1
+        )
+        AND t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
     <select id="getAllBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
-            *
+        *
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
-            t.`status` &gt; -1
+        t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         SELECT
-            count(*) as published_num,
-            sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
-            sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,
-            sum(IF(t.process_node = 'end', 1, 0)) as end_num
+        count(*) as published_num,
+        sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
+        sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,
+        sum(IF(t.process_node = 'end', 1, 0)) as end_num
         FROM
-            ta_issue t
+        ta_issue t
         WHERE 1 = 1
-          <if test="null != userId and userId != ''">
-              AND t.create_user = #{userId}
-          </if>
-          AND t.`status` > - 1
+        <if test="null != userId and userId != ''">
+            AND t.create_user = #{userId}
+        </if>
+        AND t.`status` > - 1
     </select>
     <select id="statIssueOrg" resultType="java.util.Map">
         SELECT
-            UUID_SHORT( ) AS id,
-            IFNULL( SUM( IF ( t.process_node = 'end', t.process_num, 0 ) ), 0 ) AS endNum,
-            IFNULL( SUM( IF ( t.process_node = 'assigned', t.process_num, 0 ) ), 0 ) AS assignedNum,
-            IFNULL( SUM( IF ( t.expire_date &lt;= NOW( ), t.process_num, 0 ) ), 0 ) AS expireNum
+        UUID_SHORT( ) AS id,
+        IFNULL( SUM( IF ( t.process_node = 'end', t.process_num, 0 ) ), 0 ) AS endNum,
+        IFNULL( SUM( IF ( t.process_node = 'assigned', t.process_num, 0 ) ), 0 ) AS assignedNum,
+        IFNULL( SUM( IF ( t.expire_date &lt;= NOW( ), t.process_num, 0 ) ), 0 ) AS expireNum
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
-            t.org_id = #{orgId}
-            AND t.`status` &gt; -1
+        t.org_id = #{orgId}
+        AND t.`status` &gt; -1
     </select>
     <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
         SELECT
-            *
+        *
+        FROM
+        (
+        SELECT
+        t.`name`,
+        sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
         FROM
-            (
-                SELECT
-                    t.`name`,
-                    sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
-                FROM
-                    td_issue_type t
-                        LEFT JOIN ta_issue s ON s.type_id = t.type_id
-                        AND s.`status` &gt; - 1
-                GROUP BY
-                    t.type_id
-            ) a
+        td_issue_type t
+        LEFT JOIN ta_issue s ON s.type_id = t.type_id
+        AND s.`status` &gt; - 1
+        GROUP BY
+        t.type_id
+        ) a
         ORDER BY
-            a.`value` DESC
+        a.`value` DESC
     </select>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -6,62 +6,70 @@
         UPDATE ta_org_issue t
         SET t.process_status = #{processStatus}
         WHERE
-            t.org_id = #{orgId}
-          AND t.issue_id = #{issueId}
+        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>
 
     <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
-            *
+        *
+        FROM
+        ta_issue t
+        WHERE
+        EXISTS (
+        SELECT
+        *
         FROM
-            ta_issue t
+        ta_org_issue s
         WHERE
-            EXISTS (
-                SELECT
-                *
-                FROM
-                ta_org_issue s
-                WHERE
-                s.issue_id = t.issue_id
-                AND s.org_id = #{orgId}
-                AND s.`status` &gt; -1
-            )
-          <if test="sourceType != null and sourceType == 'feedback'">
-              AND t.source_type = 'feedback'
-          </if>
-          <if test="sourceType != null and sourceType != 'feedback'">
-              AND t.source_type in ('check', 'inspector')
-          </if>
-          <if test="processNode != null and processNode != ''">
+        s.issue_id = t.issue_id
+        AND s.org_id = #{orgId}
+        AND s.`status` &gt; -1
+        )
+        <if test="sourceType != null and sourceType == 'feedback'">
+            AND t.source_type = 'feedback'
+        </if>
+        <if test="sourceType != null and sourceType != 'feedback'">
+            AND t.source_type in ('check', 'inspector')
+        </if>
+        <if test="processNode != null and processNode != ''">
             AND t.process_node = #{processNode}
-          </if>
-          <if test="isExpire != null and isExpire">
+        </if>
+        <if test="isExpire != null and isExpire">
             AND t.process_node != 'end'
             AND t.expire_date &lt;= now( )
-          </if>
-            AND t.`status` &gt; -1
+        </if>
+        AND t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
     <select id="getByIssueAndOrg" resultType="com.example.civilizedcity.entity.TaOrgIssue">
         SELECT
-            *
+        *
         FROM
-            ta_org_issue t
+        ta_org_issue t
         WHERE
-            t.issue_id = #{issueId}
-          AND t.org_id = #{orgId}
-          AND t.`status` = 1
+        t.issue_id = #{issueId}
+        AND t.org_id = #{orgId}
+        AND t.`status` = 1
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
-            SUM(s.process_node == 'end', 1, 0) as end_num,
-            SUM(s.process_node != 'end', 1, 0) as doing_num
+        SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
+        SUM(s.process_node == 'end', 1, 0) as end_num,
+        SUM(s.process_node != 'end', 1, 0) as doing_num
         from ta_org_issue t
-                 INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
+        INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
         where t.org_id = #{orgId}
-          and t.`status` &gt; -1
-          and s.`status` &gt; -1
+        and t.`status` &gt; -1
+        and s.`status` &gt; -1
     </select>
+
+
 </mapper>

src/main/resources/mapper/TdLocTypeMapper.xml

@@ -2,5 +2,14 @@
 <!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>