费用申请-费用类别选择时候搜索功能不起作用翻页功能不起作用

src/main/java/com/liang/dao/PrjAnnualbudgetdetailDao.java

@@ -96,7 +96,7 @@ public interface PrjAnnualbudgetdetailDao {
      */
     List<PrjAnnualbudgetdetail> getFysqBudgetList(Integer nys);
 
-    List<PrjAnnualbudgetdetail> getSubNode(Integer nys);
+    List<PrjAnnualbudgetdetail> getSubNode(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit, String mc);
 
     /**
      * 批量删除年度预算明细
@@ -125,5 +125,7 @@ public interface PrjAnnualbudgetdetailDao {
     BigDecimal selectXMZYS_SX(Integer rws);
 
     int updateRWSYS_SX(Integer rws);
+
+    Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 }
 

src/main/java/com/liang/service/PrjAnnualbudgetdetailService.java

@@ -1,14 +1,11 @@
 package com.liang.service;
 
-import com.liang.entity.PrjAnnualbudget;
 import com.liang.entity.PrjAnnualbudgetdetail;
-import com.liang.entity.PrjBudget;
-import com.liang.entity.StaBudget;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 年度预算明细(PrjAnnualbudgetdetail)表服务接口
@@ -80,7 +77,7 @@ public interface PrjAnnualbudgetdetailService {
      */
     List<PrjAnnualbudgetdetail> getFysqBudgetList(Integer nys);
 
-    List<PrjAnnualbudgetdetail> getSubNode(Integer nys);
+    List<PrjAnnualbudgetdetail> getSubNode(Integer nys, Integer page, Integer limit, String mc);
 
     /**
      * 更新预算
@@ -91,4 +88,5 @@ public interface PrjAnnualbudgetdetailService {
     int updateBatch(List<PrjAnnualbudgetdetail> budgetDetails);
 
 
+    Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 }

src/main/java/com/liang/service/impl/PrjAnnualbudgetdetailServiceImpl.java

@@ -211,8 +211,8 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
     }
 
     @Override
-    public List<PrjAnnualbudgetdetail> getSubNode(Integer nys) {
-        return this.prjAnnualbudgetdetailDao.getSubNode(nys);
+    public List<PrjAnnualbudgetdetail> getSubNode(Integer nys, Integer page, Integer limit, String mc) {
+        return this.prjAnnualbudgetdetailDao.getSubNode(nys,page,limit,mc);
     }
 
     @Override
@@ -224,4 +224,9 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return count;
     }
 
+    @Override
+    public Integer getSubNodeCount(Integer nys, Integer page, Integer limit) {
+        return this.prjAnnualbudgetdetailDao.getSubNodeCount(nys,page,limit);
+    }
+
 }

src/main/java/com/liang/vo/Page.java

@@ -0,0 +1,72 @@
+package com.liang.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ApiModel
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Page<T> implements Serializable {
+    private static final long serialVersionUID = -880132266597087829L;
+
+    /**
+     * 包装Page对象
+     *
+     * @param list
+     */
+    public Page(List<? extends T> list) {
+        PageInfo<? extends T> page = new PageInfo<>(list);
+        this.total = page.getTotal();
+        this.pageNum = page.getPageNum();
+        this.pageSize = page.getPageSize();
+        this.rows = page.getList();
+    }
+
+    /**
+     * 包装Page对象
+     *
+     * @param list
+     */
+    public Page(List<? extends T> list, Map<String,Object> other) {
+        PageInfo<? extends T> page = new PageInfo<>(list);
+        this.total = page.getTotal();
+        this.pageNum = page.getPageNum();
+        this.pageSize = page.getPageSize();
+        this.rows = page.getList();
+        this.other = other;
+    }
+    //当前页
+    @ApiModelProperty(value = "当前页数",required = true)
+    private int pageNum =1;
+    //每页的数量
+    @ApiModelProperty(value = "每页显示数",required = true)
+    private int pageSize = 10;
+
+    private long total = 0;
+
+    /**
+     * 列表查询入参实体类
+     */
+    @ApiModelProperty(value = "列表查询返回附加数据实体类",dataType = "java.util.HashMap",hidden = true)
+    private Map<String,Object> other;
+    /**
+     * 列表查询入参实体类
+     */
+    @ApiModelProperty(value = "列表查询入参实体类")
+    @Valid
+    private transient T data;
+    @ApiModelProperty(hidden = true)
+    private  List<? extends T> rows;
+}

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -536,11 +536,22 @@
 
     <!--获取费用申请年度预算-->
     <select id="getSubNode" resultMap="PrjAnnualbudgetdetailMap">
-        select (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC, b.*
-        from prj_AnnualBudgetDetail b
-        where NYS = #{nys}
-          and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
-          AND NYS=#{nys})
+        select top ${limit} *
+        from (
+            select
+            (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC,
+              b.*,
+              row_number() over (order by b.id asc) as rownumber
+                 from prj_AnnualBudgetDetail b
+                 where NYS = #{nys}
+                   and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
+                   AND NYS=#{nys})
+                 <if test="mc != null and mc != ''">
+                   AND b.FYMC LIKE  CONCAT('%',#{mc},'%')
+                  </if>
+
+                   ) temp_row
+        where rownumber  > ((${page} - 1) * ${limit})
     </select>
     <select id="selectWWYJZCF_GW" resultType="java.math.BigDecimal">
         select ((SELECT SUM(SKJE)
@@ -573,5 +584,13 @@
         from prj_feescheme
         where ZB = #{id}
     </select>
+    <select id="getSubNodeCount" resultType="java.lang.Integer">
+        select
+        count(*)
+        from prj_AnnualBudgetDetail b
+        where NYS = #{nys}
+        and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
+        AND NYS=#{nys})
+    </select>
 </mapper>
 

src/main/resources/templates/annualbudget/add_apply.html

@@ -651,7 +651,7 @@
             searchPlaceholder: '搜索费用名称',
             table: {
                 url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId,
-                method: 'post',
+                method: 'get',
                 cols: [
                     [
                         {type: "radio", fixed: 'left'},