名称查询

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpDataFilterVo.java

@@ -9,6 +9,7 @@ import java.util.List;
  */
 @Data
 public class YdbpDataFilterVo {
+    private String name;
     private Integer pageNum;
     private Integer pageSize;
     private List<String> ids;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/DecisionType.java

@@ -17,9 +17,10 @@ public enum DecisionType {
     DECISION_TYPE_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_5("5", "使用权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_6("6", "供地数据", "vector.gj_gd_data", "gid", "gj_gd_data", "gid","srr", "nf"),
-    DECISION_TYPE_7("7", "报批数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),
+    DECISION_TYPE_7("7", "用地报批（存量）数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),
     DECISION_TYPE_6_1("6", "土地供应数据", "public.c_one_code_tdgy", "node_id", "c_one_code_tdgy", "node_id","srf","hbcrht_date"),
-    DECISION_TYPE_7_1("7", "用地报批数据", "public.c_one_code_ydbp", "node_id", "c_one_code_ydbp", "node_id", "project_name","tdyt"),
+    DECISION_TYPE_7_1("7", "用地报批数据", "public.t_ydbp_data", "id", "t_ydbp_data", "id", "name","pfwh"),
+
 //    DECISION_TYPE_6_2("6", "供地数据", "c_one_code_tdgy", "node_id", "供地数据2", "project_name","project_code"),
 //    DECISION_TYPE_7_2("7", "报批数据", "c_one_code_ydbp", "node_id", "报批数据2", "node_id", "project_name","project_code");
     DECISION_TYPE_8("8", "永久基本农田", "vector.gj_nongtian", "gid", "gj_nongtian", "gid", "dlmc","dlbm");

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdbpDataMapper.java

@@ -30,7 +30,7 @@ public interface YdbpDataMapper {
      * @param pageSize 每页记录数
      * @return 用地报批数据列表
      */
-    List<YdbpData> selectPage(@Param("offset") int offset, @Param("pageSize") int pageSize, @Param("ids") List<String> ids);
+    List<YdbpData> selectPage(@Param("offset") int offset, @Param("pageSize") int pageSize, @Param("ids") List<String> ids,@Param("name") String name);
 
     /**
      * 更新用地报批数据

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpDataImpl.java

@@ -12,6 +12,7 @@ import com.siwei.apply.domain.vo.YdbpExcelVo;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.YdbpDataMapper;
 import com.siwei.apply.service.YdbpDataService;
+import com.siwei.common.core.utils.StringUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,7 +77,11 @@ public class YdbpDataImpl implements YdbpDataService {
         int pageSize = filterVo.getPageSize() == null ? 10 : filterVo.getPageSize();
         int offset = (pageNum - 1) * pageSize;
         List<String> ids = filterVo.getIds();
-        List<YdbpData> rows = ydbpDataMapper.selectPage(offset, pageSize,ids);
+        String name = filterVo.getName();
+        if(StringUtils.isBlank(name)){
+            name="";
+        }
+        List<YdbpData> rows = ydbpDataMapper.selectPage(offset, pageSize,ids,name);
         int total = ydbpDataMapper.countAll();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -33,8 +33,12 @@
     <select id="selectPage" resultMap="YdbpDataResultMap">
         SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
         FROM t_ydbp_data
+        where 1=1
+        <if test="name != null and name != ''">
+            AND name LIKE CONCAT('%', #{name}, '%')
+        </if>
         <if test="ids != null and ids.size() > 0">
-            WHERE id IN
+            AND id IN
             <foreach collection="ids" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>