Commit b99f5671 authored by wangzb's avatar wangzb

feature-wzb :公积金表格修改

parent 3da51e4c
......@@ -6042,7 +6042,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<Integer> columnIndexes = Arrays.asList(0,7);
CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
CustomCellStyleFourStrategy customCellStyleStrategyFour= new CustomCellStyleFourStrategy(columnIndexes);
CustomCellStyleFiveStrategy customCellStyleStrategyFive= new CustomCellStyleFiveStrategy(columnIndexes);
......@@ -6295,7 +6294,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//派增的数据
long count = getFCount(searchVo);
if (count > CommonConstants.ZERO_INT){
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName(),searchVo);
list = getDispatchFundSupplementary(searchVo);
if (Common.isNotNull(list)) {
//判断list的大小是否大于10
......@@ -6830,7 +6828,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
/**
* @return
* @Author huyc
* @Author wzb
* @Description 导出社保派单花名册
* @Date 11:12 2023/7/21
*/
......@@ -6877,13 +6875,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
*/
public List<List<String>> headQOne(String houseName) {
List<List<String>> list = new ArrayList<>();
//表头数据
String a = "项目合计";
String aa = "本月小计";
String b = "本月增加汇款";
String c = "本月减少汇款";
String d = "本月汇款";
//第一列
list.add(Lists.newArrayList("单位名称(公章)", "单位名称(公章)"));
//第二列
......@@ -6914,42 +6905,50 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
public List<List<String>> headQTwo(String houseName,SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>();
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(houseName, searchVo);
//表头数据
String a = "项目合计";
String aa = "本月小计";
String b = "本月增加汇款";
String c = "本月减少汇款";
String d = "本月汇款";
//第一列
if(houseNameConfigVo.getFundBank()==null){
houseNameConfigVo.setFundBank("");
if(Common.isNotNull(houseNameConfigVo)) {
if (houseNameConfigVo.getFundBank() == null) {
houseNameConfigVo.setFundBank("");
}
list.add(Lists.newArrayList("公积金承办银行", "公积金承办银行"));
list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
//第二列
//第三列
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
}
if (houseNameConfigVo.getCustomerNo() == null) {
houseNameConfigVo.setCustomerNo("");
}
String h = houseNameConfigVo.getCompanyPro() + "%";
if (houseNameConfigVo.getCompanyPro() == null) {
h = "";
}
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
list.add(Lists.newArrayList("公积金承办银行", "公积金承办银行"));
list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
//第二列
//第三列
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
if(houseNameConfigVo.getCustomerNo()==null){
houseNameConfigVo.setCustomerNo("");
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
}
String h=houseNameConfigVo.getCompanyPro()+"%";
if(houseNameConfigVo.getCompanyPro()==null){
h="";
}
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
}else {
list.add(Lists.newArrayList("公积金承办银行", "公积金承办银行"));
list.add(Lists.newArrayList("", ""));
list.add(Lists.newArrayList("", ""));
//第二列
//第三列
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
list.add(Lists.newArrayList("单位公积金账号", "单边缴存比例"));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
list.add(Lists.newArrayList("", " "));
list.add(Lists.newArrayList("", " "));
}
return list;
}
......@@ -7000,6 +6999,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
.replaceAll("零+", "零").replaceAll("零圆", "圆");
}
/**
* @return
* @Author wzb
* @Description 导出公积金派单花名册
* @Date 09:05 2023/7/21
*/
public List<List<String>> headQThree(SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>();
//表头数据
......@@ -7007,14 +7012,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String a="";
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName(),searchVo);
if(houseNameConfigVo!=null) {
TDispatchFundSumVo tDispatchFundSumVo = getFundSumVo(searchVo);
if (tDispatchFundSumVo.getSupplementaryAmountSum()!= null) {
a = tDispatchFundSumVo.getSupplementaryAmountSum().toString();
} else {
a = "0";
if (tDispatchFundSumVo != null) {
if (tDispatchFundSumVo.getSupplementaryAmountSum() != null) {
a = tDispatchFundSumVo.getSupplementaryAmountSum().toString();
} else {
a = "0";
}
}
}
else {
a = "0";
}
list.add(Lists.newArrayList("", ""));
//第二列
......@@ -7036,7 +7047,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return list;
}
/**
* @return
* @Author wzb
* @Description 导出公积金派单花名册
* @Date 09:05 2023/7/21
*/
public List<List<String>> headQFour(SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>();
//表头数据
......@@ -7071,6 +7087,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return list;
}
/**
* @return
* @Author wzb
* @Description 导出公积金派单花名册
* @Date 09:05 2023/7/21
*/
public List<List<String>> headQFive() {
List<List<String>> list = new ArrayList<>();
//表头数据
......@@ -7101,6 +7124,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return list;
}
/**
* @return
* @Author wzb
* @Description 导出公积金派单花名册
* @Date 09:05 2023/7/21
*/
public List<List<String>> FundSix() {
List<List<String>> list = new ArrayList<>();
//表头数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment