Commit c989153d authored by fangxinjiang's avatar fangxinjiang

统一信用编码或单位编码添加-fxj

parent 74b7b8e7
...@@ -7573,11 +7573,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7573,11 +7573,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String filePath = projectRoot+CommonConstants.DOUBLE_LINE+fileName; String filePath = projectRoot+CommonConstants.DOUBLE_LINE+fileName;
//社保增减 //社保增减
if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)){ if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)){
return doExportRosterSocial(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc()); return doExportRosterSocial(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc(),unitCreditCode);
} }
//医保增减 //医保增减
if (CommonConstants.THREE_STRING.equals(type) || CommonConstants.FOUR_STRING.equals(type)){ if (CommonConstants.THREE_STRING.equals(type) || CommonConstants.FOUR_STRING.equals(type)){
return doExportRosterMedical(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc()); return doExportRosterMedical(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc(),unitCreditCode);
} }
return null; return null;
} }
...@@ -7593,7 +7593,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7593,7 +7593,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String fileName, String fileName,
String projectRoot, String projectRoot,
String filePath, String filePath,
String src){ String src,
String unitCreditCode){
//获取要导出的列表 //获取要导出的列表
List<TDispatchSocialExportVo> list = new ArrayList<>(); List<TDispatchSocialExportVo> list = new ArrayList<>();
...@@ -7623,7 +7624,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7623,7 +7624,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(headTwo(searchVo.getSocialHouseholdName(),searchVo.getUnitCreditCode())). head(headTwo(searchVo.getSocialHouseholdName(),unitCreditCode)).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)).
build(); build();
...@@ -7827,7 +7828,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7827,7 +7828,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String fileName, String fileName,
String projectRoot, String projectRoot,
String filePath, String filePath,
String src){ String src,
String unitCreditCode){
//获取要导出的列表 //获取要导出的列表
List<TDispatchSocialPersionExportVo> list = new ArrayList<>(); List<TDispatchSocialPersionExportVo> list = new ArrayList<>();
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
...@@ -7860,7 +7862,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7860,7 +7862,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(persionHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())). head(persionHeadTwo(searchVo.getSocialHouseholdName(),unitCreditCode)).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)).
build(); build();
...@@ -7937,7 +7939,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7937,7 +7939,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(persionReduceHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())). head(persionReduceHeadTwo(searchVo.getSocialHouseholdName(),unitCreditCode)).
registerWriteHandler(customCellStyleStrategy2). registerWriteHandler(customCellStyleStrategy2).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)).
build(); build();
......
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