Переглянути джерело

添加选址结果删除接口

gushoubang 10 місяців тому
батько
коміт
8e5390c464

+ 10 - 1
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -72,7 +72,16 @@ public class FzssController extends BaseController {
         RequestResult res = fzssService.GetXzResList(startTime, endTime, name, pageNum, pageSize);
         return res;
     }
-
+    /**
+     * 删除选址结果
+     *
+     * @return
+     */
+    @DeleteMapping("/DelXzRes")
+    public RequestResult DelXzRes(String bsm) {
+        RequestResult res = fzssService.DelXzRes(bsm);
+        return res;
+    }
     /**
      * 通过选择的方案生成报告
      *

+ 2 - 0
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzDTO.java

@@ -32,4 +32,6 @@ public class FzxzDTO {
     private String xmlx;//项目类型
     // TODO:字段待确认
     private String jsdw;
+    @TableField(value = "is_deleted")
+    private Boolean isDeleted=false;
 }

+ 3 - 0
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzMapper.java

@@ -24,6 +24,9 @@ public interface FzxzMapper extends BaseMapper<FzxzDTO> {
     @Master
     List<FzxzResultDTO> getList(Map<String, Object> paramMap);
 
+    @Master
+    void delByBsm(String bsm);
+
     @Master
     Integer getCount(Map<String, Object> paramMap);
 }

+ 2 - 0
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IFzssService.java

@@ -20,5 +20,7 @@ public interface IFzssService {
 
     RequestResult GetXzResList(String startTime, String endTime, String name, Integer pageNum, Integer pageSize);
 
+    RequestResult DelXzRes(String bsm);
+
     // RequestResult saveWordFile(String bsm, ArrayList xzbsm);
 }

+ 7 - 0
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -425,6 +425,13 @@ public class FzssServiceImpl implements IFzssService {
         return RequestResult.success("查询成功!", resMap);
     }
 
+    @Override
+    public RequestResult DelXzRes(String bsm) {
+        fzxzMapper.delByBsm(bsm);
+        return RequestResult.success("删除成功!");
+    }
+
+
     // /**
     //  * 生成word文件
     //  *

+ 8 - 4
onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/FzxzMapper.xml

@@ -61,11 +61,10 @@
         from T_FZSS_FZXZ_TB
         where  t.RWBSM = #{rwbsm}
     </select>
-
     <select id="getList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.res.FzxzResultDTO">
         select *
         from t_fzss_fzxz
-        where 1=1
+        where is_delete = false
         <if test="userId != null and userId != ''">
             and user_id = #{userId}
         </if>
@@ -81,11 +80,10 @@
         order by cjsj desc
         LIMIT #{limit} OFFSET #{offset}
     </select>
-
     <select id="getCount" parameterType="map" resultType="Integer">
         select count(1)
         from t_fzss_fzxz
-        where 1=1
+        where is_delete = false
         <if test="userId != null and userId != ''">
             and user_id = #{userId}
         </if>
@@ -99,4 +97,10 @@
             and cjsj &lt;= TO_TIMESTAMP(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>
     </select>
+
+    <update id="delByBsm" parameterType="java.lang.String" >
+        update t_fzss_fzxz
+        set is_delete = true
+        where bsm = #{bsm}
+    </update>
 </mapper>

+ 6 - 1
sql/pgsql/0_init.sql

@@ -1,2 +1,7 @@
 -- 20240703,发布现场,以后sql表变动记录
-base.t_fzss_hgxfx 表添加字段了,需重新建表
+base.t_fzss_hgxfx 表添加字段了,需重新建表
+
+
+ALTER TABLE "base"."t_fzss_fzxz" ADD COLUMN "is_delete" bool;
+COMMENT ON COLUMN "base"."t_fzss_fzxz"."is_delete" IS '是否删除';
+UPDATE t_fzss_fzxz SET is_delete=FALSE;