标识标牌修改

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java

@@ -150,10 +150,13 @@ public class BsSgcDfBzbpController extends BaseController
      * 获取堤防标识标牌详细信息
      */
     @ApiOperation(" 堤防标识标牌详情")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
+    @GetMapping(value = "/{embankmentCode}")
+    public AjaxResult getInfo(@PathVariable("embankmentCode") String embankmentCode)
     {
-        return AjaxResult.success(bsSgcDfBzbpService.getById(id));
+        QueryWrapper<BsSgcDfBzbp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("embankment_code", embankmentCode);
+        List<BsSgcDfBzbp> list = bsSgcDfBzbpService.list(queryWrapper);
+        return AjaxResult.success(list);
     }
 
     /**

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java

@@ -1,5 +1,6 @@
 package com.kms.yg.df.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,4 +93,7 @@ public class BsSgcDfBzbp extends BaseEntity
 
     private String embankmentName;
 
+    @TableField(exist = false)
+    private String number;
+
 }

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java

@@ -1,9 +1,12 @@
 package com.kms.yg.df.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yg.df.domain.BsSgcDfBzbp;
 
+import java.util.List;
+
 /**
  * 堤防标识标牌Mapper接口
  *
@@ -13,4 +16,5 @@ import com.kms.yg.df.domain.BsSgcDfBzbp;
 @Repository
 public interface BsSgcDfBzbpMapper extends BaseMapper<BsSgcDfBzbp> {
 
+    List<BsSgcDfBzbp> selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd);
 }

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java

@@ -11,6 +11,7 @@ import com.kms.yg.df.domain.BsSgcDfBzbp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -52,8 +53,13 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
 
 
         Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
-        Page<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper.selectPage(page, queryWrapper);
-        return infoPage;
+        List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
+                .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), projectInfo.getAdcd());
+        Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();
+
+        bsSgcDfBzbpPage.setRecords(infoPage);
+        bsSgcDfBzbpPage.setTotal(infoPage.size());
+        return bsSgcDfBzbpPage;
     }
 
 }

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kms.yg.df.mapper.BsSgcDfBzbpMapper">
+
+
+    <resultMap type="com.kms.yg.df.domain.BsSgcDfBzbp" id="Result">
+        <id     property="id"     column="id"     />
+        <result property="embankmentName"   column="embankment_name"   />
+        <result property="adcd"   column="adcd"   />
+        <result property="number"   column="number"   />
+
+    </resultMap>
+
+    <select id="selectList1" resultMap="Result">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        SELECT embankment_name, adcd, COUNT(1) number
+        FROM bs_sgc_df_bzbp
+        <where>
+            <if test="embankmentName != null and embankmentName != ''">
+                embankment_name like concat('%', #{embankmentName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd = #{adcd}
+            </if>
+        </where>
+        GROUP BY embankment_code
+        ORDER BY create_time DESC
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+</mapper>