Commit 39945f01 authored by wangzb's avatar wangzb

feature-wzb :公积金表格导出及代发户添加

parent eb04ba3b
...@@ -8,7 +8,6 @@ spring: ...@@ -8,7 +8,6 @@ spring:
redis: redis:
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: '@yf_2017'
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
......
...@@ -6020,10 +6020,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6020,10 +6020,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override @Override
public void doexportFundInfo(HttpServletResponse response, SocialHandleSearchVo searchVo) { public void doexportFundInfo(HttpServletResponse response, SocialHandleSearchVo searchVo) {
String fileName = DispatchConstants.FUND_RECORD_EXPORT + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = DispatchConstants.FUND_RECORD_EXPORT + "_"+searchVo.getProvidentHouseholdName() + "_" + searchVo.getDisMonth() + CommonConstants.XLSX;
//获取要导出的列表 //获取要导出的列表
List<TDispatchFundPersionExportVo> list = new ArrayList<>(); List<TDispatchFundPersionExportVo> list = new ArrayList<>();
List<TDispatchFundSumExportVo> listOne = new ArrayList<>();
try (ServletOutputStream out = response.getOutputStream()){ try (ServletOutputStream out = response.getOutputStream()){
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8)); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
...@@ -6072,7 +6071,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6072,7 +6071,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//但是这里的设值是8648,具体原因请看下面的计算逻辑 //但是这里的设值是8648,具体原因请看下面的计算逻辑
sheet.setColumnWidth(0, 3000); sheet.setColumnWidth(0, 3000);
sheet.setColumnWidth(1, 4000); sheet.setColumnWidth(1, 4000);
sheet.setColumnWidth(2, 2000); sheet.setColumnWidth(2, 3000);
sheet.setColumnWidth(3, 6000); sheet.setColumnWidth(3, 6000);
sheet.setColumnWidth(4, 4000); sheet.setColumnWidth(4, 4000);
sheet.setColumnWidth(6, 5000); sheet.setColumnWidth(6, 5000);
...@@ -6116,7 +6115,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6116,7 +6115,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo); list.add(vo);
} }
} }
writeSheet = EasyExcel.writerSheet("变更清册").build(); writeSheet = EasyExcel.writerSheet(searchVo.getDisMonth()).build();
// 第一次写入会创建头 // 第一次写入会创建头
excelWriter.write(new ArrayList<>(), writeSheet, writeTable0); excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable1); excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
...@@ -6654,9 +6653,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6654,9 +6653,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if(houseName!=null) { if(houseName!=null) {
CompanyProVo companyProVo = companyProVo(houseName); CompanyProVo companyProVo = companyProVo(houseName);
HouseNameConfigVo vo =getFundSumExportVoTwo(houseName); HouseNameConfigVo vo =getFundSumExportVoTwo(houseName);
if (fundAccount == null) {
fundAccount = "";
}
String a = "单位名称(签章): " + houseName + " 单位公积金账号:" + vo.getCustomerNo() + " 单边缴纳比例:" + companyProVo.getCompanyPro()+"%"; String a = "单位名称(签章): " + houseName + " 单位公积金账号:" + vo.getCustomerNo() + " 单边缴纳比例:" + companyProVo.getCompanyPro()+"%";
//第一列-第十八列 //第一列-第十八列
...@@ -6708,12 +6705,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6708,12 +6705,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a =""; String a ="";
String b =""; String b =" ";
String c =""; String c =" ";
String d =""; String d =" ";
//第一列 //第一列
TDispatchFundSumExportVo dispatchFundSumExportVo =getFundSumExportVo(searchVo); TDispatchFundSumExportVo dispatchFundSumExportVo =getFundSumExportVo(searchVo);
if(Common.isNotNull(dispatchFundSumExportVo)) { if(Common.isNotNull(dispatchFundSumExportVo)) {
if(dispatchFundSumExportVo.getNumOne()!=null) { if(dispatchFundSumExportVo.getNumOne()!=null) {
a = dispatchFundSumExportVo.getNumOne().toString(); a = dispatchFundSumExportVo.getNumOne().toString();
} }
...@@ -6728,17 +6727,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6728,17 +6727,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
d = dispatchFundSumExportVo.getMonenyTwo().toString(); d = dispatchFundSumExportVo.getMonenyTwo().toString();
} }
if(dispatchFundSumExportVo.getNumOne()==0){
a="";
}
if(dispatchFundSumExportVo.getNumTwo()==0){
b=" ";
}
list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计")); list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计"));
//第二列 //第二列
list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计")); list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计"));
//第三列 //第三列
list.add(Lists.newArrayList("本月增加汇款", "人数", a)); list.add(Lists.newArrayList("本月增加汇款", "人数", b));
list.add(Lists.newArrayList("本月增加汇款", "金额", c)); list.add(Lists.newArrayList("本月增加汇款", "金额", c));
//第四列 //第四列
list.add(Lists.newArrayList("本月减少汇款", "人数", b)); list.add(Lists.newArrayList("本月减少汇款", "人数", a));
//第五列 //第五列
list.add(Lists.newArrayList("本月减少汇款", "金额", d)); list.add(Lists.newArrayList("本月减少汇款", "金额", d));
//第六列 //第六列
...@@ -6777,10 +6784,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6777,10 +6784,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//表头数据 //表头数据
list.add(Lists.newArrayList("备注", "备注")); list.add(Lists.newArrayList("备注", "备注"));
list.add(Lists.newArrayList("备注", "备注")); list.add(Lists.newArrayList("备注", "备注"));
String a="1新增人员必须填写身份证号码。\n"+ String a="1.新增人员必须填写身份证号码。\n"+
"2本表只提供单位缴存人数变动使用。\n"+ "2.本表只提供单位缴存人数变动使用。\n"+
"3对于工资基数调整及个人补缴业务不得使用此表。\n"+ "3.对于工资基数调整及个人补缴业务不得使用此表。\n"+
"4.单位封存人员启封时,如缴存基数发生变化须附基数调整清册。 本单位承诺变更清册中所填内容均真实、 \n" +"合法、有效,如有不实之处,单位承担相应的法律责任及由此产生的一切后果。"; "4.单位封存人员启封时,如缴存基数发生变化须附基数调整清册。 本单位承诺\n" +"变更清册中所填内容均真实、合法、有效,如有不实之处,单位承担相应的法律责任及由此产生的一切后果。";
for (int i = 2; i <= 7; i++) { for (int i = 2; i <= 7; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
......
...@@ -1934,7 +1934,7 @@ ...@@ -1934,7 +1934,7 @@
<sql id="where_getFundDisRecord"> <sql id="where_getFundDisRecord">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.fund_id is not null AND a.fund_id is not null
AND a.STATUS = "2" AND a.STATUS in ('2','4')
AND a.DISPATCH_ITEM like concat('%','公积金','%') AND a.DISPATCH_ITEM like concat('%','公积金','%')
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"> <if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
......
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