保管总账分页异常

src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageAccountRecordController.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -44,46 +43,14 @@ public class StorageAccountRecordController {
     })
 	public PageInfo<Map<String, Object>> sumAccountList(HttpServletRequest request, Integer pageNum, Integer pageSize, 
 			Integer lspz, Integer lsxz, String startDate, String endDate) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (lspz != null) {
-			map.put("pz", lspz+"");
-		}
-		if (lsxz != null) {
-			map.put("hwxz", lsxz+"");
-		}
+
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
-		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"),"");
-		List<Map<String, Object>> list = recordService.selectKeepSumAccountData(map);
-		if (null != list && list.size() > 0) {
-			Map<String, Object> kcsl_map = null;
-			List<Map<String, Object>> group_list = null;
-			List<Map<String, Object>> kcsl_list = null;
-			double kcsl = 0d;
-			for (Map<String, Object> obj : list) {
-				kcsl_map = new HashMap<String, Object>();
-				kcsl_map.put("pz", obj.get("lspz"));
-				kcsl_map.put("hwxz", obj.get("hwxz"));
-				kcsl_map.put("rq", obj.get("rq"));
-				kcsl_map.put("orgId", orgId == "" ? null : Integer.parseInt(orgId));
-				//查询这个条件下有多少分组，然后把所有分组的数据相加
-				group_list = recordService.selectAccountGroup(kcsl_map);
-				if (null != group_list && group_list.size() > 0) {
-					for (Map<String, Object> gop : group_list) {
-						kcsl_map.put("houseId", gop.get("house_id"));
-						kcsl_map.put("wareId", gop.get("ware_id"));
-						kcsl_list = recordService.selectKCSL(kcsl_map);
-						if (null != kcsl_list && kcsl_list.size() > 0) {
-							kcsl = kcsl + Double.parseDouble(kcsl_list.get(0).get("kcsl")+"");
-						}
-					}
-					obj.put("kcsl", kcsl);
-					kcsl = 0d;
-				}
-			}
-		}
+		List<Map<String, Object>> list = recordService.getGroupByList(request, lspz, lsxz);
 		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+		pageInfo = recordService.setListData(request, pageInfo);
+
 		return pageInfo;
 	}
 

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageAccountRecordMapper.xml

@@ -465,40 +465,75 @@
   <!-- 保管总账查询列表 -->
   <select id="selectKeepSumAccount" parameterType="java.util.Map" resultType="java.util.Map">
 	SELECT 
-		fcbgz.hwxz, fcbgz.lspz, DATE_FORMAT(fcbgz.rq,'%Y-%m') as rq, sum(fcbgz.srsl) as srsl, 
-		sum(fcbgz.zcsl) as zcsl, (sum(fcbgz.srsl)-sum(fcbgz.zcsl)) as kcsl 
-	FROM (
-		SELECT * FROM storage_account_record where 1=1 AND account_type=0 AND auditor_date IS NOT NULL 
-		<if test="pz != null">
-	        and lspz = #{pz} 
-	    </if>
-	    <if test="hwxz != null">
-	        and hwxz = #{hwxz} 
-	    </if>
-	) fcbgz 
-	group by fcbgz.hwxz, fcbgz.lspz, DATE_FORMAT(fcbgz.rq,'%Y-%m') 
-	order by fcbgz.rq
+		hwxz, lspz, DATE_FORMAT(rq,'%Y-%m') as rq, sum(srsl) as srsl, sum(zcsl) as zcsl
+	FROM storage_account_record 
+	where 1=1 AND account_type=0 AND auditor_date IS NOT NULL 
+	<if test="pz != null">
+        and lspz = #{pz} 
+    </if>
+    <if test="hwxz != null">
+        and hwxz = #{hwxz} 
+    </if>
+    <if test="orgId != null">
+        and org_id = #{orgId} 
+    </if>
+	group by hwxz, lspz, DATE_FORMAT(rq,'%Y-%m') 
+	order by rq
   </select>
   <!-- 查询当前条件下的总账分组类别 -->
   <select id="selectAccountGroup" parameterType="java.util.Map" resultType="java.util.Map">
-  	SELECT house_id,ware_id,lspz,hwxz,DATE_FORMAT(rq, '%Y-%m') rq FROM storage_account_record 
-	WHERE 1=1 
-	AND account_type = 0 
-	AND auditor_date IS NOT NULL
-	<if test="rq != null">
-	AND DATE_FORMAT(rq, '%Y-%m') = #{rq}
-	</if>
-	<if test="orgId != null">
-	AND org_id=#{orgId}
-	</if>
-	<if test="pz != null">
-	and lspz = #{pz}
-	</if>
-	<if test="hwxz != null">
-    and hwxz = #{hwxz} 
-	</if>
-	GROUP BY house_id, ware_id, lspz, hwxz 
-	ORDER BY house_id, ware_id 
+<!--   	SELECT house_id,ware_id,lspz,hwxz,DATE_FORMAT(rq, '%Y-%m') rq FROM storage_account_record  -->
+<!-- 	WHERE 1=1  -->
+<!-- 	AND account_type = 0  -->
+<!-- 	AND auditor_date IS NOT NULL -->
+<!-- 	<if test="rq != null"> -->
+<!-- 	AND DATE_FORMAT(rq, '%Y-%m') = #{rq} -->
+<!-- 	</if> -->
+<!-- 	<if test="orgId != null"> -->
+<!-- 	AND org_id=#{orgId} -->
+<!-- 	</if> -->
+<!-- 	<if test="pz != null"> -->
+<!-- 	and lspz = #{pz} -->
+<!-- 	</if> -->
+<!-- 	<if test="hwxz != null"> -->
+<!--     and hwxz = #{hwxz}  -->
+<!-- 	</if> -->
+<!-- 	GROUP BY house_id, ware_id, lspz, hwxz  -->
+<!-- 	ORDER BY house_id, ware_id  -->
+    SELECT org_id,lspz,hwxz, rq, SUM(kcsl) kcsl 
+    FROM (
+		SELECT a.org_id,a.house_id,a.ware_id,a.lspz,a.hwxz,DATE_FORMAT(a.rq, '%Y-%m') rq,b.kcsl 
+		FROM (
+			SELECT org_id,house_id,ware_id,lspz,hwxz,DATE_FORMAT(rq, '%Y-%m'),MAX(rq) rq 
+			from storage_account_record
+			WHERE 1=1 
+			AND account_type = 0 
+			AND auditor_date IS NOT NULL
+			<if test="rq != null">
+			AND DATE_FORMAT(rq, '%Y-%m') = #{rq}
+			</if>
+			<if test="orgId != null">
+			AND org_id=#{orgId}
+			</if>
+			<if test="pz != null">
+			and lspz = #{pz}
+			</if>
+			<if test="hwxz != null">
+		    and hwxz = #{hwxz} 
+			</if>
+			GROUP BY org_id,house_id,ware_id,lspz,hwxz,DATE_FORMAT(rq, '%Y-%m')
+		) a
+		LEFT JOIN storage_account_record b on 
+			b.rq = a.rq 
+			AND b.org_id=a.org_id 
+			AND b.house_id=a.house_id 
+			AND b.ware_id=a.ware_id 
+			AND b.lspz=a.lspz 
+			AND b.hwxz=a.hwxz 
+			and b.rq=a.rq
+		WHERE b.auditor_date IS NOT NULL and b.account_type = 0 
+	) q 
+	GROUP BY q.lspz,q.hwxz,q.rq
   </select>
   <!-- 查询保管总账查询列表的库存数量 -->
   <select id="selectKCSL" parameterType="java.util.Map" resultType="java.util.Map">

src/main/java/com/chinaitop/depot/keeperAccount/service/StorageAccountRecordService.java

@@ -3,8 +3,11 @@ package com.chinaitop.depot.keeperAccount.service;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import com.chinaitop.depot.keeperAccount.model.StorageAccountRecord;
 import com.chinaitop.depot.keeperAccount.model.StorageAccountRecordExample;
+import com.github.pagehelper.PageInfo;
 
 public interface StorageAccountRecordService {
 
@@ -69,4 +72,21 @@ public interface StorageAccountRecordService {
      * @return
      */
 	List<Map<String, Object>> selectAccountGroup(Map<String, Object> map);
+
+	/**
+	 * 查询保管总账列表
+	 * 
+	 * @param lspz 粮食品种
+	 * @param lsxz 粮食性质
+	 * @return
+	 */
+	List<Map<String, Object>> getGroupByList(HttpServletRequest request, Integer lspz, Integer lsxz);
+
+	/**
+	 * 给每条数据赋值库存数量
+	 * 
+	 * @param pageInfo 结果集
+	 * @return
+	 */
+	PageInfo<Map<String, Object>> setListData(HttpServletRequest request, PageInfo<Map<String, Object>> pageInfo);
 }

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageAccountRecordServiceImpl.java

@@ -1,16 +1,20 @@
 package com.chinaitop.depot.keeperAccount.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.keeperAccount.mapper.StorageAccountRecordMapper;
 import com.chinaitop.depot.keeperAccount.model.StorageAccountRecord;
 import com.chinaitop.depot.keeperAccount.model.StorageAccountRecordExample;
 import com.chinaitop.depot.keeperAccount.service.StorageAccountRecordService;
+import com.github.pagehelper.PageInfo;
 
 @Service
 public class StorageAccountRecordServiceImpl implements StorageAccountRecordService {
@@ -80,4 +84,43 @@ public class StorageAccountRecordServiceImpl implements StorageAccountRecordServ
 	public List<Map<String, Object>> selectAccountGroup(Map<String, Object> map) {
 		return mapper.selectAccountGroup(map);
 	}
+
+	@Override
+	public List<Map<String, Object>> getGroupByList(HttpServletRequest request, Integer lspz, Integer lsxz) {
+		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"),"");
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (lspz != null) {
+			map.put("pz", lspz+"");
+		}
+		if (lsxz != null) {
+			map.put("hwxz", lsxz+"");
+		}
+		if (orgId != null) {
+			map.put("orgId", orgId);
+		}
+		List<Map<String, Object>> list = mapper.selectKeepSumAccount(map);
+		return list;
+	}
+
+	@Override
+	public PageInfo<Map<String, Object>> setListData(HttpServletRequest request, PageInfo<Map<String, Object>> pageInfo) {
+		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"),"");
+		if (null != pageInfo.getList() && pageInfo.getList().size() > 0) {
+			Map<String, Object> kcsl_map = null;
+			List<Map<String, Object>> group_list = null;
+			for (Map<String, Object> obj : pageInfo.getList()) {
+				kcsl_map = new HashMap<String, Object>();
+				kcsl_map.put("pz", obj.get("lspz"));
+				kcsl_map.put("hwxz", obj.get("hwxz"));
+				kcsl_map.put("rq", obj.get("rq"));
+				kcsl_map.put("orgId", orgId == "" ? null : Integer.parseInt(orgId));
+				//查询这个条件下有多少库存数量
+				group_list = mapper.selectAccountGroup(kcsl_map);
+				if (null != group_list && group_list.size() > 0) {
+					obj.put("kcsl", group_list.get(0).get("kcsl"));
+				}
+			}
+		}
+		return pageInfo;
+	}
 }