feature-wzb :公积金表格修改

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -6184,7 +6184,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
 			CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
 			CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
-
+			CustomCellStyleFourStrategy customCellStyleStrategyFour = new CustomCellStyleFourStrategy(columnIndexes);
 			writeTable0 = EasyExcel.writerTable(0).
 					head(headFisrtOne()).
 					registerWriteHandler(customCellStyleStrategy).
@@ -6274,12 +6274,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					.build();
 			writeTable4 = EasyExcel.writerTable(4).
 					head(headQThree(searchVo)).
-					registerWriteHandler(customCellStyleStrategyThree).
+					registerWriteHandler(customCellStyleStrategyFour).
 					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)25)).
 					build();
 			writeTable5 = EasyExcel.writerTable(5).
 					head(headQFour(searchVo)).
-					registerWriteHandler(customCellStyleStrategyThree).
+					registerWriteHandler(customCellStyleStrategyFour).
 					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)25)).
 					build();
 			writeTable6 = EasyExcel.writerTable(6).
@@ -6939,10 +6939,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			houseNameConfigVo.setCustomerNo("");
 
 		}
+       if(houseNameConfigVo.getCompanyPro()==null){
 
-		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), k+"%"));
+         houseNameConfigVo.setCompanyPro("");
+	   }
+		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro()));
 
-		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), m+"%"));
+		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro()));
 
 
 		return list;
@@ -7038,17 +7041,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 		TDispatchFundSumVo dispatchFundSumVo=getFundSumVo(searchVo);
 		String F=dispatchFundSumVo.getNumber();
-		list.add(Lists.newArrayList("单位申请\n" +"补缴意见"));
+		list.add(Lists.newArrayList("         单位申请\n" +"         补缴意见"));
 
-		list.add(Lists.newArrayList("单位申请\n" +"补缴意见"));
+		list.add(Lists.newArrayList("         单位申请\n" +"         补缴意见"));
 
 		//第二列
-		list.add(Lists.newArrayList("", "","","","","负责人：","      年    月    日"));
+		list.add(Lists.newArrayList("", "","","","","         负责人：","           年    月    日"));
 
-		list.add(Lists.newArrayList("", "","","","","负责人：","      年    月    日"));
+		list.add(Lists.newArrayList("", "","","","","         负责人：","           年    月    日"));
 		//第三列
 
-		list.add(Lists.newArrayList("补缴合计", "补缴合计","补缴合计","补缴原因","补缴原因","补缴原因"));
+		list.add(Lists.newArrayList("        补缴合计", "        补缴合计","        补缴合计","        补缴原因","        补缴原因","        补缴原因"));
 		if(dispatchFundSumVo.getNumber()==null){
 			dispatchFundSumVo.setNumber("0");
 		}
@@ -7084,8 +7087,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 
 		list.add(Lists.newArrayList("承办银行\n" +"审核意见"));
-		list.add(Lists.newArrayList("", "","","","","审批人","      年    月    日"));
-		list.add(Lists.newArrayList("", "","","","","审批人","      年    月    日"));
+		list.add(Lists.newArrayList("", "","","","","审批人:","      年    月    日"));
+		list.add(Lists.newArrayList("", "","","","","审批人:","      年    月    日"));
 
 		//第四列