1

src/main/java/com/chinaitop/depot/sptData/controller/SptController.java

@@ -326,14 +326,14 @@ public class SptController {
         @ApiImplicitParam(name = "pzmc", value = "品种名称", paramType = "query"),
         @ApiImplicitParam(name = "wtsbh", value = "委托书编号", paramType = "query"),
         @ApiImplicitParam(name = "wtkssj", value = "委托起始时间", paramType = "query"),
-        @ApiImplicitParam(name = "wtjssj", value = "委托结束时间", paramType = "query")
+        @ApiImplicitParam(name = "wtjssj", value = "委托结束时间", paramType = "query"),
+        @ApiImplicitParam(name = "crklx", value = "出入库类型(1:出库,2:入库)", paramType = "query")
 	})
 	public SptDataVO getDsfzjList(Integer pageNum, Integer pageSize, Integer pageType, String kqmc, 
-			String cfmc, String pzmc, String wtsbh, String wtkssj, String wtjssj) {
-		//{"applySubTypeName":"","applyNumber":"","houseName":"","applyDateBegin":"","applyDateEnd":"","pageType":2,"pageSize":10,"pageNum":1}
+			String cfmc, String pzmc, String wtsbh, String wtkssj, String wtjssj, String crklx) {
 		SptDataVO sptDataVO = null;
 		try {
-			sptDataVO = sptService.getDsfzjList(pageNum, pageSize,pageType, kqmc, cfmc, pzmc,wtsbh,wtkssj,wtjssj);
+			sptDataVO = sptService.getDsfzjList(pageNum, pageSize,pageType, kqmc, cfmc, pzmc,wtsbh,wtkssj,wtjssj, crklx);
 			
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

src/main/java/com/chinaitop/depot/sptData/service/SptService.java

@@ -155,11 +155,12 @@ public interface SptService {
 	 * @param wtsbh
 	 * @param wtkssj
 	 * @param wtjssj
+	 * @param crklx 出入库类型(1:出库,2:入库)
 	 * @return
 	 * @throws Exception
 	 */
 	SptDataVO getDsfzjList(Integer pageNum, Integer pageSize, Integer pageType, String kqmc, String cfmc, String pzmc,
-			String wtsbh, String wtkssj, String wtjssj) throws Exception;
+			String wtsbh, String wtkssj, String wtjssj, String crklx) throws Exception;
 
 	/**
 	 * 第三方质检详情

src/main/java/com/chinaitop/depot/sptData/service/impl/SptServiceImpl.java

@@ -392,7 +392,7 @@ public class SptServiceImpl implements SptService {
 
 	@Override
 	public SptDataVO getDsfzjList(Integer pageNum, Integer pageSize, Integer pageType, String kqmc, String cfmc,
-			String pzmc, String wtsbh, String wtkssj, String wtjssj) throws Exception {
+			String pzmc, String wtsbh, String wtkssj, String wtjssj, String crklx) throws Exception {
 		String path = sysCodeService.getSVal(10, "dsfzjlb");
 		StringBuffer sbf = new StringBuffer(50);
 		if (null == pageNum) {
@@ -401,7 +401,8 @@ public class SptServiceImpl implements SptService {
 		if (null == pageSize) {
 			pageSize = 10;
 		}
-		sbf.append(path).append("?pageNum=").append(pageNum).append("&pageSize=").append(pageSize).append("&pageType=").append(pageType);
+		//sbf.append(path).append("?pageNum=").append(pageNum).append("&pageSize=").append(pageSize).append("&pageType=").append(pageType);
+		sbf.append(path).append("?pageType=").append(pageType);
 
 		JSONObject param = new JSONObject();
 		if (StringUtils.isNotBlank(wtsbh)) {//委托书编号
@@ -422,6 +423,9 @@ public class SptServiceImpl implements SptService {
 		if (StringUtils.isNotBlank(kqmc)) {//库区名称
 			param.put("beInspectOrgName", kqmc);
 		}
+		if (StringUtils.isNotBlank(crklx)) {//出入库类型(1:出库,2:入库)
+			param.put("entrustApplyType", crklx);
+		}
 		
 		//调用登录接口 获取token
 		//String token = sptToken();

src/main/java/com/chinaitop/depot/sptData/utils/PageHelperUtils.java

@@ -14,15 +14,18 @@ public class PageHelperUtils {
 	public static String pageHelper(String datas, Integer pageNum, Integer pageSize) {
 		JSONObject datasAll = JSONObject.parseObject(datas);
 
+		//总条数
+		int total = Integer.parseInt(datasAll.getString("total"));
+
 		String items = datasAll.getString("items");
 
 		List<Object> list = JSONArray.parseArray(items);
 
-		if (pageNum != null && pageSize != null) {
-			PageHelper.startPage(pageNum, pageSize);
-		} else {
-			PageHelper.startPage(1, 10);
-		}
+//		if (pageNum != null && pageSize != null) {
+//			PageHelper.startPage(pageNum, pageSize);
+//		} else {
+//			PageHelper.startPage(1, 10);
+//		}
 
         int pageStart = pageNum == 1 ? 0 : (pageNum - 1) * pageSize;
         int pageEnd = Math.min(list.size(), pageSize * pageNum);
@@ -32,10 +35,10 @@ public class PageHelperUtils {
         }
         PageInfo<Object> pageInfo = new PageInfo<Object>(pageResult);
         //获取PageInfo其他参数
-        pageInfo.setTotal(list.size());
+        pageInfo.setTotal(total);
         int endRow = pageInfo.getEndRow() == 0 ? 0 : (Integer) (pageNum - 1) * pageSize + pageInfo.getEndRow() + 1;
         pageInfo.setEndRow(endRow);
-        boolean hasNextPage = list.size() > pageSize * pageNum;
+        boolean hasNextPage = total > pageSize * pageNum;
         pageInfo.setHasNextPage(hasNextPage);
         boolean hasPreviousPage = pageNum != 1;
         pageInfo.setHasPreviousPage(hasPreviousPage);
@@ -43,7 +46,7 @@ public class PageHelperUtils {
         boolean isLastPage = list.size() > pageSize * (pageNum - 1) && list.size() <= pageSize * pageNum;
         pageInfo.setIsLastPage(isLastPage);
         //总页数
-        int pages = list.size() % pageSize == 0 ? list.size() / pageSize : (list.size() / pageSize) + 1;
+        int pages = total % pageSize == 0 ? total / pageSize : (total / pageSize) + 1;
         pageInfo.setNavigateLastPage(pages);
 //        int[] navigatePageNums = new int[pages];
 //        for (int i = 1; i <= pages; i++) {
@@ -76,7 +79,7 @@ public class PageHelperUtils {
 //        	System.out.println("pages <= 8");
         	page_list = new int[pages];
         	for (int i = 0; i < pages; i++) {
-        		page_list[0] = i+1;
+        		page_list[i] = i+1;
 //        		if (i == pages-1) {
 //        			System.out.println(page_list[0]);
 //        		} else {