Commit cc8c252f authored by wangzb's avatar wangzb

feature-wzb :公积金表格修改

parent dd6a37af
...@@ -246,7 +246,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> { ...@@ -246,7 +246,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
TDispatchFundSumVo getFundSumExportVoOne(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo); TDispatchFundSumVo getFundSumExportVoOne(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
CompanyProVo getFundPersionExportVoOne(@Param("houseName") String houseName); CompanyProVo getFundPersionExportVoOne(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName); HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
} }
...@@ -5447,13 +5447,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5447,13 +5447,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private TDispatchFundSumVo getFundSumVo(SocialHandleSearchVo searchVo ) { private TDispatchFundSumVo getFundSumVo(SocialHandleSearchVo searchVo ) {
return baseMapper.getFundSumExportVoOne(searchVo); return baseMapper.getFundSumExportVoOne(searchVo);
} }
private CompanyProVo companyProVo(String houseName) { private CompanyProVo companyProVo(String houseName,SocialHandleSearchVo searchVo) {
return baseMapper.getFundPersionExportVoOne(houseName); return baseMapper.getFundPersionExportVoOne(houseName,searchVo);
} }
private HouseNameConfigVo getFundSumExportVoTwo(String houseName){ private HouseNameConfigVo getFundSumExportVoTwo(String houseName,SocialHandleSearchVo searchVo ){
return baseMapper.getFundSumExportVoTwo(houseName); return baseMapper.getFundSumExportVoTwo(houseName,searchVo );
} }
private long getSocialPersionDisCount(SocialHandleSearchVo searchVo) { private long getSocialPersionDisCount(SocialHandleSearchVo searchVo) {
return baseMapper.getSocialPersionDisCount(searchVo); return baseMapper.getSocialPersionDisCount(searchVo);
...@@ -6052,7 +6052,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6052,7 +6052,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)100)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)100)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(headSecond(searchVo.getProvidentHouseholdName())). head(headSecond(searchVo.getProvidentHouseholdName(),searchVo)).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)100)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)100)).
build(); build();
...@@ -6217,7 +6217,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6217,7 +6217,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)25)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)25)).
build(); build();
writeTable2 = EasyExcel.writerTable(2). writeTable2 = EasyExcel.writerTable(2).
head(headQTwo(searchVo.getProvidentHouseholdName())). head(headQTwo(searchVo.getProvidentHouseholdName(),searchVo)).
registerWriteHandler(customCellStyleStrategyThree). registerWriteHandler(customCellStyleStrategyThree).
registerWriteHandler(new CustomCellWriteWidthConfig(){ registerWriteHandler(new CustomCellWriteWidthConfig(){
@Override @Override
...@@ -6295,7 +6295,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6295,7 +6295,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//派增的数据 //派增的数据
long count = getFCount(searchVo); long count = getFCount(searchVo);
if (count > CommonConstants.ZERO_INT){ if (count > CommonConstants.ZERO_INT){
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName()); HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName(),searchVo);
list = getDispatchFundSupplementary(searchVo); list = getDispatchFundSupplementary(searchVo);
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
//判断list的大小是否大于10 //判断list的大小是否大于10
...@@ -6345,7 +6345,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6345,7 +6345,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
excelWriter.write(new ArrayList<>(),writeSheet, writeTable5); excelWriter.write(new ArrayList<>(),writeSheet, writeTable5);
excelWriter.write(new ArrayList<>(),writeSheet, writeTable6); excelWriter.write(new ArrayList<>(),writeSheet, writeTable6);
excelWriter.write(new ArrayList<>(),writeSheet, writeTable7); excelWriter.write(new ArrayList<>(),writeSheet, writeTable7);
excelWriter.write(list,writeSheet);
} }
if (excelWriter!= null) { if (excelWriter!= null) {
excelWriter.finish(); excelWriter.finish();
...@@ -6689,12 +6688,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6689,12 +6688,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Description 导出公积金派单花名册 * @Description 导出公积金派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
*/ */
public List<List<String>> headSecond(String houseName) { public List<List<String>> headSecond(String houseName,SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
if(houseName!=null) { if(houseName!=null) {
CompanyProVo companyProVo = companyProVo(houseName); CompanyProVo companyProVo = companyProVo(houseName,searchVo);
HouseNameConfigVo vo =getFundSumExportVoTwo(houseName); HouseNameConfigVo vo =getFundSumExportVoTwo(houseName,searchVo);
if(vo.getCustomerNo()==null){ if(vo.getCustomerNo()==null){
vo.setCustomerNo(""); vo.setCustomerNo("");
...@@ -6912,9 +6911,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6912,9 +6911,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Description 导出公积金派单花名册 * @Description 导出公积金派单花名册
* @Date 09:05 2023/7/21 * @Date 09:05 2023/7/21
*/ */
public List<List<String>> headQTwo(String houseName) { public List<List<String>> headQTwo(String houseName,SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(houseName); HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(houseName, searchVo);
//表头数据 //表头数据
String a = "项目合计"; String a = "项目合计";
String aa = "本月小计"; String aa = "本月小计";
...@@ -6939,13 +6938,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6939,13 +6938,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
houseNameConfigVo.setCustomerNo(""); houseNameConfigVo.setCustomerNo("");
} }
if(houseNameConfigVo.getCompanyPro()==null){
houseNameConfigVo.setCompanyPro(""); String h=houseNameConfigVo.getCompanyPro()+"%";
if(houseNameConfigVo.getCompanyPro()==null){
h="";
} }
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro()));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro()));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), h));
return list; return list;
...@@ -7002,7 +7005,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -7002,7 +7005,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//表头数据 //表头数据
//第一列 //第一列
String a=""; String a="";
HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName()); HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName(),searchVo);
if(houseNameConfigVo!=null) { if(houseNameConfigVo!=null) {
TDispatchFundSumVo tDispatchFundSumVo = getFundSumVo(searchVo); TDispatchFundSumVo tDispatchFundSumVo = getFundSumVo(searchVo);
if (tDispatchFundSumVo.getSupplementaryAmountSum()!= null) { if (tDispatchFundSumVo.getSupplementaryAmountSum()!= null) {
......
...@@ -2134,15 +2134,26 @@ ...@@ -2134,15 +2134,26 @@
<select id="getFundSumExportVoTwo" resultMap="HouseNameConfigVo"> <select id="getFundSumExportVoTwo" resultMap="HouseNameConfigVo">
SELECT SELECT
A.CUSTOMER_NO ,A.FUND_BANK , A.CUSTOMER_NO,
A.FUND_BANK,
F.COMPANY_PRO AS COMPANY_PRO F.COMPANY_PRO AS COMPANY_PRO
FROM `sys_house_hold_info` A FROM
`sys_house_hold_info` A
LEFT JOIN sys_area B ON A.PROVINCE = B.ID LEFT JOIN sys_area B ON A.PROVINCE = B.ID
LEFT JOIN sys_area C ON A.CITY = C.ID LEFT JOIN sys_area C ON A.CITY = C.ID
LEFT JOIN sys_area D ON A.TOWN = D.ID LEFT JOIN sys_area D ON A.TOWN = D.ID
LEFT JOIN sys_base_set_info E ON A.ID = E.DEPART_ID LEFT JOIN sys_base_set_info E ON A.ID = E.DEPART_ID
LEFT JOIN sys_pay_proportion F ON E.ID = F.SYS_BASE_SET_ID LEFT JOIN sys_pay_proportion F ON E.ID = F.SYS_BASE_SET_ID
WHERE A.TYPE = '1' AND A.`NAME` IN (#{houseName}) WHERE
A.TYPE = '1'
AND A.`NAME` IN (#{houseName})
AND E.`STATUS` = '0'
GROUP BY A.`NAME` GROUP BY A.`NAME`
AND
(PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( E.APPLY_START_DATE , "%Y-%m" ), '-', '' )))>0
and
(PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( E.APPLY_END_DATE , "%Y-%m" ), '-', '' ))) &lt;0
OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' )
</select> </select>
</mapper> </mapper>
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