登统表功能新需求开发

src/main/java/com/chinaitop/depot/registrationTable/controller/RegistrationTableController.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.registrationTable.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -14,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.chinaitop.depot.registrationTable.service.RegistrationTableService;
 import com.chinaitop.depot.registrationTable.service.impl.ImportFileServiceImpl;
+import com.github.pagehelper.PageInfo;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -226,4 +228,40 @@ public class RegistrationTableController {
 		return errormsg;
 	}
 
+	@RequestMapping(value="/queryImportPzCount", method=RequestMethod.GET)
+	@ApiOperation(value="查询大豆原油导入总数量", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "json", value = "条件对象", paramType = "query"),
+		@ApiImplicitParam(name = "pzlx", value = "类型(1小麦,2玉米,3大豆,4稻谷,5大豆原油)", paramType = "query")
+	})
+	public String queryImportPzCount(HttpServletRequest request, String json, String pzlx){
+
+		String drzsl = "";
+		try {
+			drzsl = registrationTableService.queryImportPzCount(request, json, pzlx);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return drzsl;
+	}
+	
+	@RequestMapping(value="/view", method=RequestMethod.GET)
+	@ApiOperation(value="查询单位下登统表导入数量跟期初库存数量 ", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页数", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "json", value = "条件对象", paramType = "query"),
+		@ApiImplicitParam(name = "pzlx", value = "类型(1小麦,2玉米,3大豆,4稻谷,5大豆原油)", paramType = "query")
+	})
+	public PageInfo<Map<String, Object>> view(HttpServletRequest request, Integer pageNum, Integer pageSize, String json, String pzlx){
+
+		PageInfo<Map<String, Object>> pageInfo = null;
+		try {
+			pageInfo = registrationTableService.view(request, pageNum, pageSize, json, pzlx);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return pageInfo;
+	}
+
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordCornInfoMapper.java

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.registrationTable.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.chinaitop.depot.registrationTable.model.RecordCornInfo;
@@ -28,4 +30,20 @@ public interface RecordCornInfoMapper {
     int updateByPrimaryKeySelective(RecordCornInfo record);
 
     int updateByPrimaryKey(RecordCornInfo record);
+
+    /**
+     * 查询玉米登统信息导入总数量
+     * 
+     * @param param
+     * @return
+     */
+	String countByConditions(Map<String, Object> param);
+
+	/**
+	 * 按仓房、货位、品种分组，查询登统表导入总数量
+	 * 
+	 * @param param
+	 * @return
+	 */
+	List<Map<String, Object>> queryGroupSumRksl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordCornInfoMapper.xml

@@ -534,4 +534,55 @@
       ccfs = #{ccfs,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <!-- 查询玉米登统信息导入总数量 -->
+  <select id="countByConditions" resultType="java.lang.String" parameterType="java.util.Map">
+  	select nvl(sum(to_number(wheat.rksl)),0) drzsl
+	from record_corn_info wheat
+	left join basic_storehouse storehouse on storehouse.org_id = wheat.org_id and storehouse.del_flag = 1
+		 and storehouse.library_type = 0 and storehouse.storehouse_name = wheat.cfmc
+	left join basic_warehouse warehouse on warehouse.org_id = wheat.org_id and warehouse.del_flag = 1
+		 and warehouse.library_type = 0 and warehouse.warehouse_name = wheat.hwmc
+	WHERE 1=1
+	<if test="orgId != null">
+       	and wheat.org_id = #{orgId} 
+	</if>
+	<if test="houseId != null">
+       	and storehouse.storehouse_id = #{houseId} 
+	</if>  
+	<if test="warehouseId != null">
+       	and warehouse.warehouse_id = #{warehouseId} 
+	</if>  
+	<if test="startDate != null">
+       	and to_char(wheat.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+       	and #{endDate} >= to_char(wheat.rkrq,'yyyy-mm-dd') 
+	</if>
+  </select>
+  <!-- 按仓房、货位、品种分组，查询登统表导入总数量 -->
+  <select id="queryGroupSumRksl" resultType="java.util.Map" parameterType="java.util.Map">
+  	select 
+		b.storehouse_id ch,c.warehouse_id hwh,d.enumid enumid,sum(to_number(a.rksl)) rkzsl 
+	from record_corn_info a 
+	left join basic_storehouse b on b.storehouse_name=a.cfmc and a.org_id=b.org_id and b.library_type = 0
+	left join basic_warehouse c on c.warehouse_name=a.hwmc and c.org_id=a.org_id and c.library_type = 0
+	left join basic_enum d on d.enumname=a.pzmc and d.parentid=1061
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and b.storehouse_id=#{houseId}
+	</if>  
+	<if test="warehouseId != null">
+	and c.warehouse_id=#{warehouseId}
+	</if>  
+	<if test="startDate != null">
+	and to_char(a.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+	and #{endDate} >= to_char(a.rkrq,'yyyy-mm-dd') 
+	</if>
+	group by b.storehouse_id,c.warehouse_id,d.enumid
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordCrudeoilInfoMapper.java

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.registrationTable.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.chinaitop.depot.registrationTable.model.RecordCrudeoilInfo;
@@ -28,4 +30,19 @@ public interface RecordCrudeoilInfoMapper {
     int updateByPrimaryKeySelective(RecordCrudeoilInfo record);
 
     int updateByPrimaryKey(RecordCrudeoilInfo record);
+
+    /**
+     * 查询大豆原油登统信息导入总数量
+     * @param param
+     * @return
+     */
+	String countByConditions(Map<String, Object> param);
+
+	/**
+	 * 按仓房、货位、品种分组，查询登统表导入总数量
+	 * 
+	 * @param param
+	 * @return
+	 */
+	List<Map<String, Object>> queryGroupSumRksl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordCrudeoilInfoMapper.xml

@@ -365,4 +365,49 @@
       ccfs = #{ccfs,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <!-- 查询大豆原油登统信息导入总数量 -->
+  <select id="countByConditions" resultType="java.lang.String" parameterType="java.util.Map">
+  	select nvl(sum(to_number(crudeoil.rksl)),0) drzsl
+	from record_crudeoil_info crudeoil
+	left join basic_tank tank on tank.org_id = crudeoil.org_id and tank.del_flag = 1
+			and tank.storagetank_name = crudeoil.ygmc
+	WHERE 1=1
+	<if test="orgId != null">
+       	and crudeoil.org_id = #{orgId} 
+	</if>
+	<if test="tankId != null">
+       	and tank.id = #{tankId} 
+	</if>  
+	<if test="startDate != null">
+       	and to_char(crudeoil.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+       	and #{endDate} >= to_char(crudeoil.rkrq,'yyyy-mm-dd') 
+	</if>
+  </select>
+  <!-- 按仓房、货位、品种分组，查询登统表导入总数量 -->
+  <select id="queryGroupSumRksl" resultType="java.util.Map" parameterType="java.util.Map">
+  	select 
+		b.id ch,b.id hwh,d.enumid enumid,sum(to_number(a.rksl)) rkzsl 
+	from record_rice_info a 
+	left join basic_tank b on b.storagetank_name=a.ygmc and a.org_id=b.org_id and b.library_type = 0
+	left join basic_enum d on d.enumname=a.pzmc and d.parentid=1061
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and b.storehouse_id=#{houseId}
+	</if>
+	<if test="warehouseId != null">
+	and c.warehouse_id=#{warehouseId}
+	</if>
+	<if test="startDate != null">
+	and to_char(a.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>
+	<if test="endDate != null">
+	and #{endDate} >= to_char(a.rkrq,'yyyy-mm-dd') 
+	</if>
+	group by b.id,d.enumid
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordRiceInfoMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.registrationTable.mapper;
 import com.chinaitop.depot.registrationTable.model.RecordRiceInfo;
 import com.chinaitop.depot.registrationTable.model.RecordRiceInfoExample;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface RecordRiceInfoMapper {
@@ -27,4 +29,20 @@ public interface RecordRiceInfoMapper {
     int updateByPrimaryKeySelective(RecordRiceInfo record);
 
     int updateByPrimaryKey(RecordRiceInfo record);
+
+    /**
+     * 查询稻谷登统信息导入总数量
+     * 
+     * @param param
+     * @return
+     */
+	String countByConditions(Map<String, Object> param);
+
+	/**
+	 * 按仓房、货位、品种分组，查询登统表导入总数量
+	 * 
+	 * @param param
+	 * @return
+	 */
+	List<Map<String, Object>> queryGroupSumRksl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordRiceInfoMapper.xml

@@ -551,4 +551,55 @@
       ccfs = #{ccfs,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <!-- 查询稻谷登统信息导入总数量 -->
+  <select id="countByConditions" resultType="java.lang.String" parameterType="java.util.Map">
+  	select nvl(sum(to_number(wheat.rksl)),0) drzsl
+	from record_rice_info wheat
+	left join basic_storehouse storehouse on storehouse.org_id = wheat.org_id and storehouse.del_flag = 1
+		 and storehouse.library_type = 0 and storehouse.storehouse_name = wheat.cfmc
+	left join basic_warehouse warehouse on warehouse.org_id = wheat.org_id and warehouse.del_flag = 1
+		 and warehouse.library_type = 0 and warehouse.warehouse_name = wheat.hwmc
+	WHERE 1=1
+	<if test="orgId != null">
+       	and wheat.org_id = #{orgId} 
+	</if>
+	<if test="houseId != null">
+       	and storehouse.storehouse_id = #{houseId} 
+	</if>  
+	<if test="warehouseId != null">
+       	and warehouse.warehouse_id = #{warehouseId} 
+	</if>  
+	<if test="startDate != null">
+       	and to_char(wheat.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+       	and #{endDate} >= to_char(wheat.rkrq,'yyyy-mm-dd') 
+	</if>
+  </select>
+  <!-- 按仓房、货位、品种分组，查询登统表导入总数量 -->
+  <select id="queryGroupSumRksl" resultType="java.util.Map" parameterType="java.util.Map">
+  	select 
+		b.storehouse_id ch,c.warehouse_id hwh,d.enumid enumid,sum(to_number(a.rksl)) rkzsl 
+	from record_rice_info a 
+	left join basic_storehouse b on b.storehouse_name=a.cfmc and a.org_id=b.org_id and b.library_type = 0
+	left join basic_warehouse c on c.warehouse_name=a.hwmc and c.org_id=a.org_id and c.library_type = 0
+	left join basic_enum d on d.enumname=a.pzmc and d.parentid=1061
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and b.storehouse_id=#{houseId}
+	</if>
+	<if test="warehouseId != null">
+	and c.warehouse_id=#{warehouseId}
+	</if>
+	<if test="startDate != null">
+	and to_char(a.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>
+	<if test="endDate != null">
+	and #{endDate} >= to_char(a.rkrq,'yyyy-mm-dd') 
+	</if>
+	group by b.storehouse_id,c.warehouse_id,d.enumid
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordSoybeanInfoMapper.java

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.registrationTable.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.chinaitop.depot.registrationTable.model.RecordSoybeanInfo;
@@ -28,4 +30,20 @@ public interface RecordSoybeanInfoMapper {
     int updateByPrimaryKeySelective(RecordSoybeanInfo record);
 
     int updateByPrimaryKey(RecordSoybeanInfo record);
+
+    /**
+     * 查询大豆登统信息导入总数量
+     * 
+     * @param param
+     * @return
+     */
+	String countByConditions(Map<String, Object> param);
+
+	/**
+	 * 按仓房、货位、品种分组，查询登统表导入总数量
+	 * 
+	 * @param param
+	 * @return
+	 */
+	List<Map<String, Object>> queryGroupSumRksl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordSoybeanInfoMapper.xml

@@ -551,4 +551,55 @@
       ccfs = #{ccfs,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <!-- 查询大豆登统信息导入总数量 -->
+  <select id="countByConditions" resultType="java.lang.String" parameterType="java.util.Map">
+  	select nvl(sum(to_number(wheat.rksl)),0) drzsl
+	from record_soybean_info wheat
+	left join basic_storehouse storehouse on storehouse.org_id = wheat.org_id and storehouse.del_flag = 1
+		 and storehouse.library_type = 0 and storehouse.storehouse_name = wheat.cfmc
+	left join basic_warehouse warehouse on warehouse.org_id = wheat.org_id and warehouse.del_flag = 1
+		 and warehouse.library_type = 0 and warehouse.warehouse_name = wheat.hwmc
+	WHERE 1=1
+	<if test="orgId != null">
+       	and wheat.org_id = #{orgId} 
+	</if>
+	<if test="houseId != null">
+       	and storehouse.storehouse_id = #{houseId} 
+	</if>  
+	<if test="warehouseId != null">
+       	and warehouse.warehouse_id = #{warehouseId} 
+	</if>  
+	<if test="startDate != null">
+       	and to_char(wheat.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+       	and #{endDate} >= to_char(wheat.rkrq,'yyyy-mm-dd') 
+	</if>
+  </select>
+  <!-- 按仓房、货位、品种分组，查询登统表导入总数量 -->
+  <select id="queryGroupSumRksl" resultType="java.util.Map" parameterType="java.util.Map">
+  	select 
+		b.storehouse_id ch,c.warehouse_id hwh,d.enumid enumid,sum(to_number(a.rksl)) rkzsl 
+	from record_soybean_info a 
+	left join basic_storehouse b on b.storehouse_name=a.cfmc and a.org_id=b.org_id and b.library_type = 0
+	left join basic_warehouse c on c.warehouse_name=a.hwmc and c.org_id=a.org_id and c.library_type = 0
+	left join basic_enum d on d.enumname=a.pzmc and d.parentid=1061
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and b.storehouse_id=#{houseId}
+	</if>
+	<if test="warehouseId != null">
+	and c.warehouse_id=#{warehouseId}
+	</if>
+	<if test="startDate != null">
+	and to_char(a.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>
+	<if test="endDate != null">
+	and #{endDate} >= to_char(a.rkrq,'yyyy-mm-dd') 
+	</if>
+	group by b.storehouse_id,c.warehouse_id,d.enumid
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordWheatInfoMapper.java

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.registrationTable.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.chinaitop.depot.registrationTable.model.RecordWheatInfo;
@@ -20,4 +22,29 @@ public interface RecordWheatInfoMapper {
     int updateByExampleSelective(@Param("record") RecordWheatInfo record, @Param("example") RecordWheatInfoExample example);
 
     int updateByExample(@Param("record") RecordWheatInfo record, @Param("example") RecordWheatInfoExample example);
+
+    /**
+     * 查询小麦登统信息导入总数量
+     * 
+     * @param param
+     * @return
+     */
+	String countByConditions(Map<String, Object> param);
+
+	/**
+	 * 按仓房、货位、品种分组，查询登统表导入总数量
+	 * 
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	List<Map<String, Object>> queryGroupSumRksl(Map<String, Object> param) throws Exception;
+	
+	/**
+     * 按单位、仓房、货位、品种，查询出入库期初库存数量
+     * 
+     * @param param
+     * @return
+     */
+	String queryCrkQckcSum(Map<String, Object> param)  throws Exception;
 }

src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordWheatInfoMapper.xml

@@ -428,4 +428,75 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  
+  <!-- 查询小麦登统信息导入总数量 -->
+  <select id="countByConditions" resultType="java.lang.String" parameterType="java.util.Map">
+  	select nvl(sum(to_number(wheat.rksl)),0) drzsl
+	from record_wheat_info wheat
+	left join basic_storehouse storehouse on storehouse.org_id = wheat.org_id and storehouse.del_flag = 1
+		 and storehouse.library_type = 0 and storehouse.storehouse_name = wheat.cfmc
+	left join basic_warehouse warehouse on warehouse.org_id = wheat.org_id and warehouse.del_flag = 1
+		 and warehouse.library_type = 0 and warehouse.warehouse_name = wheat.hwmc
+	WHERE 1=1
+	<if test="orgId != null">
+       	and wheat.org_id = #{orgId} 
+	</if>
+	<if test="houseId != null">
+       	and storehouse.storehouse_id = #{houseId} 
+	</if>  
+	<if test="warehouseId != null">
+       	and warehouse.warehouse_id = #{warehouseId} 
+	</if>  
+	<if test="startDate != null">
+       	and to_char(wheat.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+       	and #{endDate} >= to_char(wheat.rkrq,'yyyy-mm-dd') 
+	</if>
+  </select>
+  <!-- 按仓房、货位、品种分组，查询登统表导入总数量 -->
+  <select id="queryGroupSumRksl" resultType="java.util.Map" parameterType="java.util.Map">
+  	select 
+		b.storehouse_id ch,c.warehouse_id hwh,d.enumid enumid,sum(to_number(a.rksl)) rkzsl 
+	from record_wheat_info a 
+	left join basic_storehouse b on b.storehouse_name=a.cfmc and a.org_id=b.org_id and b.library_type = 0
+	left join basic_warehouse c on c.warehouse_name=a.hwmc and c.org_id=a.org_id and c.library_type = 0
+	left join basic_enum d on d.enumname=a.pzmc and d.parentid=1061
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and b.storehouse_id=#{houseId}
+	</if>  
+	<if test="warehouseId != null">
+	and c.warehouse_id=#{warehouseId}
+	</if>  
+	<if test="startDate != null">
+	and to_char(a.rkrq,'yyyy-mm-dd') >= #{startDate} 
+	</if>  
+	<if test="endDate != null">
+	and #{endDate} >= to_char(a.rkrq,'yyyy-mm-dd') 
+	</if>
+	group by b.storehouse_id,c.warehouse_id,d.enumid
+  </select>
+  <!-- 按单位、仓房、货位、品种，查询出入库期初库存数量 -->
+  <select id="queryCrkQckcSum" resultType="java.lang.String" parameterType="java.util.Map">
+  	select 
+		nvl(sum(kcsl),0) kcsl 
+	from lsreport_ts:data_kcgl_qckc_default 
+	where 1=1 
+	<if test="orgId != null">
+	and unitid=#{orgId}
+	</if>
+	<if test="houseId != null">
+	and ch=#{houseId}
+	</if>  
+	<if test="warehouseId != null">
+	and hwh=#{warehouseId}
+	</if>  
+	<if test="pz != null">
+	and pz=#{pz}
+	</if>  
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/registrationTable/service/RegistrationTableService.java

@@ -1,6 +1,11 @@
 package com.chinaitop.depot.registrationTable.service;
 
 import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.github.pagehelper.PageInfo;
 
 public interface RegistrationTableService {
 
@@ -54,4 +59,26 @@ public interface RegistrationTableService {
 	 */
 	public String importDataCrudeOil(List<List<String>> list, String orgId, Integer beginRow);
 
+	/**
+	 * 查询登统表导入总数量
+	 * 
+	 * @param request
+	 * @param map 大豆原油对象
+	 * @param pzlx 品种类型
+	 * @return
+	 */
+	public String queryImportPzCount(HttpServletRequest request, String json, String pzlx);
+
+	/**
+	 * 查询单位下登统表导入数量跟期初库存数量 
+	 * 
+	 * @param request
+	 * @param pageSize 
+	 * @param pageNum 
+	 * @param json
+	 * @param pzlx
+	 * @return
+	 */
+	public PageInfo<Map<String, Object>> view(HttpServletRequest request, Integer pageNum, Integer pageSize, String json, String pzlx);
+
 }

src/main/java/com/chinaitop/depot/registrationTable/service/impl/RegistrationTableServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -24,8 +25,11 @@ import com.chinaitop.depot.registrationTable.model.RecordRiceInfo;
 import com.chinaitop.depot.registrationTable.model.RecordSoybeanInfo;
 import com.chinaitop.depot.registrationTable.model.RecordWheatInfo;
 import com.chinaitop.depot.registrationTable.service.RegistrationTableService;
+import com.chinaitop.depot.registrationTable.util.RecordUtils;
 import com.chinaitop.depot.statisticalReport.mapper.StatisticalReportMapper;
 import com.chinaitop.depot.utils.ParameterUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 
 @Service
 @SuppressWarnings("all")
@@ -1107,4 +1111,116 @@ public class RegistrationTableServiceImpl implements RegistrationTableService {
 		return msg;
 	}
 
+	@Override
+	public String queryImportPzCount(HttpServletRequest request, String json, String pzlx) {
+
+		Map<String, Object> param = objectToMap(request, json);
+
+		String drzsl = "0";
+		if (RecordUtils.TYPE_ONE.equalsIgnoreCase(pzlx)) {
+			drzsl = recordWheatInfoMapper.countByConditions(param);
+		} else if (RecordUtils.TYPE_TWO.equalsIgnoreCase(pzlx)) {
+			drzsl = recordCornInfoMapper.countByConditions(param);
+		} else if (RecordUtils.TYPE_THREE.equalsIgnoreCase(pzlx)) {
+			drzsl = recordSoybeanInfoMapper.countByConditions(param);
+		} else if (RecordUtils.TYPE_FOUR.equalsIgnoreCase(pzlx)) {
+			drzsl = recordRiceInfoMapper.countByConditions(param);
+		} else if (RecordUtils.TYPE_FIVE.equalsIgnoreCase(pzlx)) {
+			drzsl = recordCrudeoilInfoMapper.countByConditions(param);
+		}
+
+		return drzsl;
+	}
+
+	/**
+	 * json解析封装
+	 * 
+	 * @param request
+	 * @param json
+	 * @return
+	 */
+	private Map<String, Object> objectToMap(HttpServletRequest request, String json) {
+		JSONObject json_object = JSONObject.parseObject(json);
+
+		//参数对象
+		Map<String, Object> param = new HashMap<String, Object>();
+
+		//仓房ID
+		String houseId = ObjectUtils.toString(json_object.get("houseId"), "");
+		if (!"".equals(houseId)) {
+			param.put("houseId", Integer.parseInt(houseId));
+		}
+
+		//货位ID
+		String warehouseId = ObjectUtils.toString(json_object.get("warehouseId"), "");
+		if (!"".equals(warehouseId)) {
+			param.put("warehouseId", Integer.parseInt(warehouseId));
+		}
+
+		//油罐ID
+		String tankId = ObjectUtils.toString(json_object.get("tankId"), "");
+		if (!"".equals(tankId)) {
+			param.put("tankId", Integer.parseInt(tankId));
+		}
+
+		//开始时间
+		String startDate = ObjectUtils.toString(json_object.get("startDate"), "");
+		if (!"".equals(startDate)) {
+			param.put("startDate", startDate+" 00:00:00");
+		}
+
+		//结束时间
+		String endDate = ObjectUtils.toString(json_object.get("endDate"), "");
+		if (!"".equals(endDate)) {
+			param.put("endDate", endDate+" 23:59:59");
+		}
+
+		//单位ID
+		param.put("orgId", request.getSession().getAttribute("orgId"));
+		return param;
+	}
+
+	@Override
+	public PageInfo<Map<String, Object>> view(HttpServletRequest request, Integer pageNum, Integer pageSize, String json, String pzlx) {
+		Map<String, Object> param = objectToMap(request, json);
+
+		PageInfo<Map<String, Object>> pageInfo = null;
+		List<Map<String, Object>> list = null;
+		Map<String, Object> params = null;
+		Map<String, Object> resultobj = null;
+		try {
+			if(null != pageNum && null != pageSize){
+				PageHelper.startPage(pageNum, pageSize);
+			}
+			if (RecordUtils.TYPE_ONE.equals(pzlx)) {
+				list = recordWheatInfoMapper.queryGroupSumRksl(param);
+			} else if (RecordUtils.TYPE_TWO.equals(pzlx)) {
+				list = recordCornInfoMapper.queryGroupSumRksl(param);
+			} else if (RecordUtils.TYPE_THREE.equals(pzlx)) {
+				list = recordSoybeanInfoMapper.queryGroupSumRksl(param);
+			} else if (RecordUtils.TYPE_FOUR.equals(pzlx)) {
+				list = recordRiceInfoMapper.queryGroupSumRksl(param);
+			} else if (RecordUtils.TYPE_FIVE.equals(pzlx)) {
+				list = recordCrudeoilInfoMapper.queryGroupSumRksl(param);
+			}
+			pageInfo = new PageInfo<Map<String, Object>>(list);
+			if (null != pageInfo && pageInfo.getList().size() > 0) {
+				String kcsl = "0";
+				for (int i = 0; i < pageInfo.getList().size(); i++) {
+					resultobj = pageInfo.getList().get(i);
+					params = new HashMap<String, Object>();
+					params.put("houseId", ObjectUtils.toString(resultobj.get("ch"), ""));
+					params.put("warehouseId", ObjectUtils.toString(resultobj.get("hwh"), ""));
+					params.put("pz", ObjectUtils.toString(resultobj.get("enumid"), ""));
+					params.put("orgId", ObjectUtils.toString(param.get("orgId"), ""));
+					kcsl = recordWheatInfoMapper.queryCrkQckcSum(params);
+					resultobj.put("kcsl", kcsl);
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return pageInfo;
+	}
+
 }

src/main/java/com/chinaitop/depot/registrationTable/util/RecordUtils.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.registrationTable.util;
+
+public class RecordUtils {
+
+	//小麦
+	public final static String TYPE_ONE = "1";
+
+	//玉米
+	public final static String TYPE_TWO = "2";
+
+	//大豆
+	public final static String TYPE_THREE = "3";
+
+	//稻谷
+	public final static String TYPE_FOUR = "4";
+
+	//大豆原油
+	public final static String TYPE_FIVE = "5";
+}