1

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

@@ -534,7 +534,7 @@
         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
-        LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
+        LEFT JOIN depot:basic_enum c on a.mxpz = 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
@@ -779,7 +779,7 @@
         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
-        LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
+        LEFT JOIN depot:basic_enum c on a.mxpz = 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
@@ -994,7 +994,7 @@
         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
-        LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
+        LEFT JOIN depot:basic_enum c on a.mxpz = 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
@@ -1219,7 +1219,7 @@
         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
-        LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
+        LEFT JOIN depot:basic_enum c on a.mxpz = 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
@@ -1454,7 +1454,7 @@
         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
-        LEFT JOIN depot:basic_enum c on a.lspz = c.enumid
+        LEFT JOIN depot:basic_enum c on a.mxpz = c.enumid
         LEFT JOIN depot:basic_enum d on a.scnf = d.enumid
         left join(
              select jyxx.bizno,flt.jyz as qwzw

src/main/java/com/chinaitop/agile/service/impl/RegistrationServiceImpl.java

@@ -578,30 +578,33 @@ public class RegistrationServiceImpl implements RegistrationService{
 			HSSFSheet sheet = wb.createSheet(name);
 			// 表格合并单元格的样式：参数分别为[起始行、结束行、起始列、结束列],0代表第一行或者第一列
 			//不需要合并的格子不需要专门设置单元格的样式
-			CellRangeAddress rangeAddress = new CellRangeAddress(0,0,0,19);//第一行:天津市粮食储备有限公司市级储备小麦轮换入库情况登统表
-			CellRangeAddress rangeAddress1 = new CellRangeAddress(2,4,1,1);//车号
-			CellRangeAddress rangeAddress2 = new CellRangeAddress(2,4,2,2);//仓号
-			CellRangeAddress rangeAddress3 = new CellRangeAddress(2,4,3,3);//品名
-			CellRangeAddress rangeAddress4 = new CellRangeAddress(2,4,4,4);//生产年度
-			CellRangeAddress rangeAddress5 = new CellRangeAddress(2,4,5,5);//入库日期
-			CellRangeAddress rangeAddress6 = new CellRangeAddress(2,4,6,6);//入库数量
-			CellRangeAddress rangeAddress7 = new CellRangeAddress(2,2,7,16);//入库质量指标
-			CellRangeAddress rangeAddress8 = new CellRangeAddress(2,4,17,17);//硬度指数
-			CellRangeAddress rangeAddress9 = new CellRangeAddress(2,4,18,18);//存储方式
-			CellRangeAddress rangeAddress10 = new CellRangeAddress(2,4,19,19);//备注
-			CellRangeAddress rangeAddress11 = new CellRangeAddress(3,4,7,7);//等级
-			CellRangeAddress rangeAddress12 = new CellRangeAddress(3,4,8,8);//容重
-			CellRangeAddress rangeAddress13 = new CellRangeAddress(3,4,9,9);//不完善粒
-			CellRangeAddress rangeAddress14 = new CellRangeAddress(3,3,10,11);//杂质
-			CellRangeAddress rangeAddress15 = new CellRangeAddress(1,1,0,5);//收货单位
-			CellRangeAddress rangeAddress16 = new CellRangeAddress(1,1,6,15);//填报日期
-			CellRangeAddress rangeAddress17 = new CellRangeAddress(3,3,10,14);//杂质
-			CellRangeAddress rangeAddress18 = new CellRangeAddress(2,4,0,0);//序号
-			CellRangeAddress rangeAddress22 = new CellRangeAddress(1,1,16,19);//计量单位
-			CellRangeAddress rangeAddress23 = new CellRangeAddress(3,4,15,15);//水分
-			CellRangeAddress rangeAddress24 = new CellRangeAddress(3,4,16,16);//色泽气味
+			CellRangeAddress rangeAddress1 = new CellRangeAddress(0,0,0,18);//第一行:天津市粮食储备有限公司市级储备小麦轮换入库情况登统表
+			CellRangeAddress rangeAddress2 = new CellRangeAddress(1,1,0,5);//收货单位
+			CellRangeAddress rangeAddress3 = new CellRangeAddress(1,1,6,14);//填报日期
+			CellRangeAddress rangeAddress4 = new CellRangeAddress(1,1,15,18);//计量单位
+			CellRangeAddress rangeAddress5 = new CellRangeAddress(2,4,0,0);//序号
+			CellRangeAddress rangeAddress6 = new CellRangeAddress(2,4,1,1);//车号
+			CellRangeAddress rangeAddress7 = new CellRangeAddress(2,4,2,2);//仓号
+			CellRangeAddress rangeAddress8 = new CellRangeAddress(2,4,3,3);//品名
+			CellRangeAddress rangeAddress9 = new CellRangeAddress(2,4,4,4);//生产年度
+			CellRangeAddress rangeAddress10 = new CellRangeAddress(2,4,5,5);//入库日期
+			CellRangeAddress rangeAddress11 = new CellRangeAddress(2,4,6,6);//入库数量
+			CellRangeAddress rangeAddress12 = new CellRangeAddress(2,2,7,15);//入库质量指标
+			CellRangeAddress rangeAddress13 = new CellRangeAddress(2,4,16,16);//硬度指数
+			CellRangeAddress rangeAddress14 = new CellRangeAddress(2,4,17,17);//存储方式
+			CellRangeAddress rangeAddress15 = new CellRangeAddress(2,4,18,18);//备注
+			CellRangeAddress rangeAddress16 = new CellRangeAddress(3,4,7,7);//等级
+			CellRangeAddress rangeAddress17 = new CellRangeAddress(3,4,8,8);//容重
+			CellRangeAddress rangeAddress18 = new CellRangeAddress(3,4,9,9);//不完善粒
+			CellRangeAddress rangeAddress19 = new CellRangeAddress(3,3,10,13);//杂质
+			CellRangeAddress rangeAddress20 = new CellRangeAddress(3,4,14,14);//水分
+			CellRangeAddress rangeAddress21 = new CellRangeAddress(3,4,15,15);//色泽气味
+			CellRangeAddress rangeAddress22 = new CellRangeAddress(4,4,10,10);//杂质总量
+			CellRangeAddress rangeAddress23 = new CellRangeAddress(4,4,11,11);//有机杂质
+			CellRangeAddress rangeAddress24 = new CellRangeAddress(4,4,12,12);//无机杂质
+			CellRangeAddress rangeAddress25 = new CellRangeAddress(4,4,13,13);//筛下物
 
-			sheet.addMergedRegion(rangeAddress);
+			sheet.addMergedRegion(rangeAddress1);
 			sheet.addMergedRegion(rangeAddress1);
 			sheet.addMergedRegion(rangeAddress2);
 			sheet.addMergedRegion(rangeAddress3);
@@ -620,9 +623,13 @@ public class RegistrationServiceImpl implements RegistrationService{
 			sheet.addMergedRegion(rangeAddress16);
 			sheet.addMergedRegion(rangeAddress17);
 			sheet.addMergedRegion(rangeAddress18);
+			sheet.addMergedRegion(rangeAddress19);
+			sheet.addMergedRegion(rangeAddress20);
+			sheet.addMergedRegion(rangeAddress21);
 			sheet.addMergedRegion(rangeAddress22);
 			sheet.addMergedRegion(rangeAddress23);
 			sheet.addMergedRegion(rangeAddress24);
+			sheet.addMergedRegion(rangeAddress25);
 
 			HSSFCellStyle headStyle = wb.createCellStyle();
 			HSSFFont headFont = wb.createFont();
@@ -651,15 +658,17 @@ public class RegistrationServiceImpl implements RegistrationService{
 			contentStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
 			contentStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
 
+			//第一行
 			HSSFRow sheetRow = sheet.createRow(0);
 			HSSFCell cell = sheetRow.createCell(0);
 			cell.setCellValue("天津市粮食储备有限公司市级储备小麦轮换入库情况登统表");
 			cell.setCellStyle(headStyle);
 
+			//第二行
 			HSSFRow sheetRow1 = sheet.createRow(1);
 			HSSFCell cell1 = sheetRow1.createCell(0);
 			HSSFCell cell2 = sheetRow1.createCell(6);
-			HSSFCell cell3 = sheetRow1.createCell(16);
+			HSSFCell cell3 = sheetRow1.createCell(15);
 			cell1.setCellValue("收货单位："+ (shdw==null?"":shdw));
 			cell1.setCellStyle(titleStyle);
 			SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
@@ -668,8 +677,8 @@ public class RegistrationServiceImpl implements RegistrationService{
 			cell3.setCellValue("计量单位：吨（保留小数）");
 			cell3.setCellStyle(titleStyle);
 
-			//在表格的第一行设置与数据库列名对应的列的名称
-			int rowNum = 2;//第三行
+			//第三行：在表格的第一行设置与数据库列名对应的列的名称
+			int rowNum = 2;
 			HSSFRow row = sheet.createRow(rowNum);
 			HSSFCell rowCell1 = row.createCell(0);
 			HSSFCell rowCell2 = row.createCell(1);
@@ -690,7 +699,6 @@ public class RegistrationServiceImpl implements RegistrationService{
 			HSSFCell rowCell17 = row.createCell(16);
 			HSSFCell rowCell18 = row.createCell(17);
 			HSSFCell rowCell19 = row.createCell(18);
-			HSSFCell rowCell20 = row.createCell(19);
 
 			rowCell1.setCellValue("序号");
 			rowCell2.setCellValue("车号");
@@ -700,9 +708,9 @@ public class RegistrationServiceImpl implements RegistrationService{
 			rowCell6.setCellValue("入库日期");
 			rowCell7.setCellValue("入库数量");
 			rowCell8.setCellValue("入库质量指标");
-			rowCell18.setCellValue("硬度指数H1");
-			rowCell19.setCellValue("存储方式");
-			rowCell20.setCellValue("备注");
+			rowCell17.setCellValue("硬度指数H1");
+			rowCell18.setCellValue("存储方式");
+			rowCell19.setCellValue("备注");
 			rowCell1.setCellStyle(contentStyle);
 			rowCell2.setCellStyle(contentStyle);
 			rowCell3.setCellStyle(contentStyle);
@@ -722,7 +730,6 @@ public class RegistrationServiceImpl implements RegistrationService{
 			rowCell17.setCellStyle(contentStyle);
 			rowCell18.setCellStyle(contentStyle);
 			rowCell19.setCellStyle(contentStyle);
-			rowCell20.setCellStyle(contentStyle);
 
 			rowNum+=1;//第四行
 			HSSFRow row1 = sheet.createRow(rowNum);
@@ -745,14 +752,13 @@ public class RegistrationServiceImpl implements RegistrationService{
 			HSSFCell row1Cell17 = row1.createCell(16);
 			HSSFCell row1Cell18 = row1.createCell(17);
 			HSSFCell row1Cell19 = row1.createCell(18);
-			HSSFCell row1Cell20 = row1.createCell(19);
 
 			row1Cell8.setCellValue("等级");
 			row1Cell9.setCellValue("容重g/L");
 			row1Cell10.setCellValue("不完善粒%");
 			row1Cell11.setCellValue("杂质%");
-			row1Cell16.setCellValue("水分%");
-			row1Cell17.setCellValue("色泽气味");
+			row1Cell15.setCellValue("水分%");
+			row1Cell16.setCellValue("色泽气味");
 			row1Cell1.setCellStyle(contentStyle);
 			row1Cell2.setCellStyle(contentStyle);
 			row1Cell3.setCellStyle(contentStyle);
@@ -772,7 +778,6 @@ public class RegistrationServiceImpl implements RegistrationService{
 			row1Cell17.setCellStyle(contentStyle);
 			row1Cell18.setCellStyle(contentStyle);
 			row1Cell19.setCellStyle(contentStyle);
-			row1Cell20.setCellStyle(contentStyle);
 
 			rowNum+=1;//第五行
 			HSSFRow row2 = sheet.createRow(rowNum);
@@ -795,12 +800,10 @@ public class RegistrationServiceImpl implements RegistrationService{
 			HSSFCell row2Cell17 = row2.createCell(16);
 			HSSFCell row2Cell18 = row2.createCell(17);
 			HSSFCell row2Cell19 = row2.createCell(18);
-			HSSFCell row2Cell20 = row2.createCell(19);
 			row2Cell11.setCellValue("总量");
-			row2Cell12.setCellValue("矿物质");
-			row2Cell13.setCellValue("有机杂质");
-			row2Cell14.setCellValue("无机杂质");
-			row2Cell15.setCellValue("筛下物%");
+			row2Cell12.setCellValue("有机杂质");
+			row2Cell13.setCellValue("无机杂质");
+			row2Cell14.setCellValue("筛下物%");
 			row2Cell1.setCellStyle(contentStyle);
 			row2Cell2.setCellStyle(contentStyle);
 			row2Cell3.setCellStyle(contentStyle);
@@ -820,8 +823,6 @@ public class RegistrationServiceImpl implements RegistrationService{
 			row2Cell17.setCellStyle(contentStyle);
 			row2Cell18.setCellStyle(contentStyle);
 			row2Cell19.setCellStyle(contentStyle);
-			row2Cell20.setCellStyle(contentStyle);
-
 
 			Integer xh=1;
 			double rksl = 0d;
@@ -846,7 +847,6 @@ public class RegistrationServiceImpl implements RegistrationService{
 				HSSFCell hssfCell17 = hssfRow.createCell(16);
 				HSSFCell hssfCell18 = hssfRow.createCell(17);
 				HSSFCell hssfCell19 = hssfRow.createCell(18);
-				HSSFCell hssfCell20 = hssfRow.createCell(19);
 				hssfCell1.setCellValue(xh);
 				hssfCell2.setCellValue((String)list.get(i).get("cphm"));
 				hssfCell3.setCellValue((String)list.get(i).get("cf"));
@@ -864,15 +864,14 @@ public class RegistrationServiceImpl implements RegistrationService{
 				hssfCell9.setCellValue((String)list.get(i).get("rz"));
 				hssfCell10.setCellValue((String)list.get(i).get("bwslzl"));
 				hssfCell11.setCellValue((String)list.get(i).get("zzzl"));
-				hssfCell12.setCellValue((String)list.get(i).get("kwz"));
-				hssfCell13.setCellValue((String)list.get(i).get("yjzz"));
-				hssfCell14.setCellValue((String)list.get(i).get("wjzz"));
-				hssfCell15.setCellValue((String)list.get(i).get("sxw"));
-				hssfCell16.setCellValue((String)list.get(i).get("sf"));
-				hssfCell17.setCellValue((String)list.get(i).get("szqw"));
-				hssfCell18.setCellValue((String)list.get(i).get("ydzs"));
-				hssfCell19.setCellValue((String)list.get(i).get("ccfs"));
-				hssfCell20.setCellValue("");
+				hssfCell12.setCellValue((String)list.get(i).get("yjzz"));
+				hssfCell13.setCellValue((String)list.get(i).get("wjzz"));
+				hssfCell14.setCellValue((String)list.get(i).get("sxw"));
+				hssfCell15.setCellValue((String)list.get(i).get("sf"));
+				hssfCell16.setCellValue((String)list.get(i).get("szqw"));
+				hssfCell17.setCellValue((String)list.get(i).get("ydzs"));
+				hssfCell18.setCellValue((String)list.get(i).get("ccfs"));
+				hssfCell19.setCellValue("");
 				hssfCell1.setCellStyle(contentStyle);
 				hssfCell2.setCellStyle(contentStyle);
 				hssfCell3.setCellStyle(contentStyle);
@@ -892,19 +891,18 @@ public class RegistrationServiceImpl implements RegistrationService{
 				hssfCell17.setCellStyle(contentStyle);
 				hssfCell18.setCellStyle(contentStyle);
 				hssfCell19.setCellStyle(contentStyle);
-				hssfCell20.setCellStyle(contentStyle);
 				++xh;
 			}
 			HSSFRow hssfRow = sheet.createRow(rowNum+1);
 			hssfRow.createCell(0).setCellValue("单位负责人：" + (dwfzr==null?"":dwfzr));
 			hssfRow.createCell(6).setCellValue("科长：");
 			hssfRow.createCell(13).setCellValue("制表人："+ (zbr==null?"":zbr));
-			CellRangeAddress rangeAddress19 = new CellRangeAddress(rowNum+1,rowNum+1,0,5);//单位负责人
-			CellRangeAddress rangeAddress20 = new CellRangeAddress(rowNum+1,rowNum+1,6,12);//科长
-			CellRangeAddress rangeAddress21 = new CellRangeAddress(rowNum+1,rowNum+1,13,19);//制表人
-			sheet.addMergedRegion(rangeAddress19);
-			sheet.addMergedRegion(rangeAddress20);
-			sheet.addMergedRegion(rangeAddress21);
+			CellRangeAddress rangeAddress26 = new CellRangeAddress(rowNum+1,rowNum+1,0,5);//单位负责人
+			CellRangeAddress rangeAddress27 = new CellRangeAddress(rowNum+1,rowNum+1,6,12);//科长
+			CellRangeAddress rangeAddress28 = new CellRangeAddress(rowNum+1,rowNum+1,13,18);//制表人
+			sheet.addMergedRegion(rangeAddress26);
+			sheet.addMergedRegion(rangeAddress27);
+			sheet.addMergedRegion(rangeAddress28);
 		}
 		
 		return wb;