小麦登统表需求改造

src/main/java/com/chinaitop/agile/controller/RegistrationController.java

@@ -259,11 +259,13 @@ public class RegistrationController {
 			@ApiImplicitParam(name = "zbr", value = "制表人", paramType = "query"),
 			@ApiImplicitParam(name = "shdw", value = "收货单位", paramType = "query"),
 			@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query"),
-			@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
+			@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
+			@ApiImplicitParam(name = "banben", value = "版本(0:新标准,1:旧标准)", paramType = "query"),
+			@ApiImplicitParam(name = "sfdcqb", value = "是否导出全部(0:是,1:否)", paramType = "query")
 	})
 	public void  exportWheatListPageInfo(HttpServletResponse response,HttpServletRequest request,
 										 String houseId, String warehouseId, String startDate, String endDate,
-										 String zbr, String shdw, String dwfzr, String orgId){
+										 String zbr, String shdw, String dwfzr, String orgId, String banben, String sfdcqb){
 		Map<String,Object> map = new HashMap<String,Object>();
 		try {
 			if (null != houseId && !"".equals(houseId)) {
@@ -283,8 +285,11 @@ public class RegistrationController {
 			if (null != endDate && !"".equals(endDate)) {
 				map.put("endDate", endDate);
 			}
+			if (StringUtils.isBlank(banben)) {
+				banben = "0";
+			}
 			List<Map<String,Object>> list = registrationService.getWheatListPageInfo(map);
-			HSSFWorkbook workbook = registrationService.wheatdataTransfor(list,zbr,shdw,dwfzr);
+			HSSFWorkbook workbook = registrationService.wheatdataTransfor(list, zbr, shdw, dwfzr, banben, sfdcqb);
 			String fileName = "小麦登统表";
 			// 获取输出流
 			OutputStream os = response.getOutputStream();
@@ -361,7 +366,63 @@ public class RegistrationController {
 			e.printStackTrace();
 		}
 	}
-	
+
+	@RequestMapping(value="/exportCrudeOilListPageInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="条件导出原油入库情况数据", notes = "条件查询和列表一致")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "tankId", value = "油罐id", paramType = "query"),
+		@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
+		@ApiImplicitParam(name = "zbr", value = "制表人", paramType = "query"),
+		@ApiImplicitParam(name = "shdw", value = "收货单位", paramType = "query"),
+		@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query")
+	})
+	public void exportCrudeOilListPageInfo(HttpServletResponse response, HttpServletRequest request, Integer pageNum, Integer pageSize,
+			String tankId, String startDate, String endDate, String orgId, String zbr, String shdw, String dwfzr){
+		Map<String,Object> map = new HashMap<String,Object>();
+		try {
+			if (null != tankId && !"".equals(tankId)) {
+				map.put("tankId", tankId);
+			}
+
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
+
+			if (null != startDate && !"".equals(startDate)) {
+				map.put("startDate", startDate);
+			}
+			if (null != endDate && !"".equals(endDate)) {
+				map.put("endDate", endDate);
+			}
+			if(null != pageNum && null != pageSize){
+				PageHelper.startPage(pageNum, pageSize);
+			}
+			List<Map<String,Object>> list = registrationService.getCrudeOilListPageInfo(map);
+			HSSFWorkbook workbook = registrationService.crudeOilTransfor(list,zbr,shdw,dwfzr);
+			String fileName = "原油登统表";
+			// 获取输出流
+			OutputStream os = response.getOutputStream();
+			// 重置输出流
+			response.reset();
+			// 设定输出文件头
+			response.setHeader("Content-disposition", "attachment; filename=" + new String(fileName.getBytes("GB2312"), "8859_1") + ".xlsx");
+			//name属性设置和跨服访问有关
+			response.setHeader("Access-Control-Allow-Origin", "*");
+			// 定义输出内容类型
+			response.setContentType("application/vnd.ms-excel;charset=gb2312");
+			workbook.write(os);
+			//关闭流
+			os.close();
+			return;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	@RequestMapping(value="/test", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="测试")
 	@ApiImplicitParams({

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -530,7 +530,7 @@
             a.cph as cphm, b.sjcfbh as cf, b.sjhwbh as hw, c.enumname as lspz, d.enumname scnf,
             b.cpzsj as rq, b.xzklhjz as rksl, e.enumname lsdj, sf.sf, rz.rz, zzzl.zzzl, 
             kwz.kwz, wjzz.wjzz, yjzz.yjzz, sxw.sxw, bwslzl.bwslzl, csl.csl, bblzl.bblzl, hpl.hpl, 
-            cmbl.cmbl, psl.psl, syl.syl, sml.sml, szqw.szqw, ydzs.ydzs, substr(be.enumname,0,2) ccfs   
+            cmbl.cmbl, psl.psl, syl.syl, sml.sml, szqw.szqw, ydzs.ydzs, rssl.rssl, substr(be.enumname,0,2) ccfs   
         FROM (select * from (select *,row_number() over(partition by BizNo order by 1) rn
               from data_crkyw_rmdj_default)t1 where t1.rn = 1) a
         inner JOIN data_crkyw_cpz_default b ON a.BizNo = b.BizNo
@@ -711,6 +711,16 @@
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) ydzs on ydzs.bizno = a.bizno
+        left join(
+             select jyxx.bizno,flt.jyz as rssl
+             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+              from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
+             left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
+             where flt.zbxmc = '402882e87318022e017318e470090045'
+			 <if test="orgId != null">
+            	and jyxx.unitid = #{orgId} 
+		     </if>
+        ) rssl on rssl.bizno = a.bizno
         WHERE nvl(a.BizNo,'-1') != '-1' and  a.lspz = '3164'
 		<if test="orgId != null">
         	and jyxx.unitid = #{orgId} 
@@ -733,7 +743,7 @@
 		select wheat.clbh cphm,wheat.cfmc cf,wheat.hwmc hw,wheat.pzmc lspz,wheat.scnd scnf,
 			wheat.rkrq rq,wheat.rksl*1000 rksl,wheat.dj lsdj,wheat.sf,wheat.rz,wheat.zzzl,
 			wheat.zzkwz kwz,wheat.wjzz,wheat.yjzz, wheat.sxw, wheat.bwslzl,wheat.csl,wheat.bblzl,wheat.hpl,
-			wheat.cmbl,wheat.psl,wheat.syl,wheat.sml,wheat.szqw,wheat.ydzs,wheat.ccfs
+			wheat.cmbl,wheat.psl,wheat.syl,wheat.sml,wheat.szqw,wheat.ydzs, wheat.rssl, wheat.ccfs
 		from depot:record_wheat_info wheat
 		left join depot: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
@@ -1446,70 +1456,67 @@
         inner JOIN data_crkyw_cpz_default b ON a.BizNo = b.BizNo
         LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
         LEFT JOIN depot:basic_enum d on a.scnf = d.enumid
-        <!-- left join (select * from (select *,row_number() over(partition by BizNo order by 1) rn
-              from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx on jyxx.bizno = a.bizno -->
-        <!-- left join depot:basic_tank bs on bs.id = b.sjchID -->
         left join(
              select jyxx.bizno,flt.jyz as qwzw
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = '402882e87321dc72017321f9314f000e' 
+             where flt.zbxmc = 'cf5b3dabd8b511ec81ac00ff2bc9e548' 
              <if test="orgId != null">
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) qwzw on qwzw.bizno = a.bizno
         left join(
              select jyxx.bizno,flt.jyz as sfhfw
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = 'c8baedcc732711eabc7300ff188bbfa4'
+             where flt.zbxmc = 'cf5b37a3d8b511ec81ac00ff2bc9e548'
 			 <if test="orgId != null">
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) sfhfw on sfhfw.bizno = a.bizno
         left join(
              select jyxx.bizno,flt.jyz as brxzz
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = 'c8bdddc4732711eabc7300ff188bbfa4'
+             where flt.zbxmc = 'cf5b3864d8b511ec81ac00ff2bc9e548'
 			 <if test="orgId != null">
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) brxzz on brxzz.bizno = a.bizno
         left join(
              select jyxx.bizno,flt.jyz as sj
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = 'c8c0bbf7732711eabc7300ff188bbfa4'
+             where flt.zbxmc = 'cf5b392ed8b511ec81ac00ff2bc9e548'
              <if test="orgId != null">
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) sj on sj.bizno = a.bizno
         left join(
              select jyxx.bizno,flt.jyz as gyhz
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = 'c8c3c8f4732711eabc7300ff188bbfa4'
+             where flt.zbxmc = 'cf5b39d6d8b511ec81ac00ff2bc9e548'
 			 <if test="orgId != null">
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) gyhz on gyhz.bizno = a.bizno
         left join(
              select jyxx.bizno,flt.jyz as rjcll
-             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+             from (select * from (select dataid, bizno, unitid, row_number() over(partition by BizNo order by modifydate desc) rn
               from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
              left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
-             where flt.zbxmc = 'c8c3c8f4732711eabc7300ff188bbfa5'
+             where flt.zbxmc = 'cf5b3a79d8b511ec81ac00ff2bc9e548'
 			 <if test="orgId != null">
             	and jyxx.unitid=#{orgId} 
 		     </if>
         ) rjcll on rjcll.bizno = a.bizno
-        WHERE nvl(a.BizNo,'-1') != '-1' and  a.lspz = '7052'
+        WHERE nvl(a.BizNo,'-1') != '-1' and  a.lspz = '7144'
 		<if test="orgId != null">
         	and a.unitid = #{orgId} 
 		</if>  

src/main/java/com/chinaitop/agile/service/RegistrationService.java

@@ -17,8 +17,10 @@ public interface RegistrationService {
 	
 	List<Map<String, Object>> getCrudeOilListPageInfo(Map<String, Object> map);
 
-	HSSFWorkbook wheatdataTransfor(List<Map<String, Object>> list, String zbr, String shdw, String dwfzr);
+	HSSFWorkbook wheatdataTransfor(List<Map<String, Object>> list, String zbr, String shdw, String dwfzr, String banben, String sfdcqb);
 
     HSSFWorkbook ricedataTransfor(List<Map<String, Object>> list, String zbr, String shdw, String dwfzr);
 
+	HSSFWorkbook crudeOilTransfor(List<Map<String, Object>> list, String zbr, String shdw, String dwfzr);
+
 }