Commit e6075ed0 authored by wangzb's avatar wangzb

feature-wzb :公积金表格修改

parent 045cf0a7
......@@ -15,6 +15,6 @@ public class HouseNameConfigVo {
private String fundBank ;
@Schema(description = "比例")
private Double companyPro;
private String companyPro;
}
......@@ -6052,7 +6052,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)100)).
build();
writeTable1 = EasyExcel.writerTable(1).
head(headSecond(searchVo.getProvidentHouseholdName(),searchVo.getCustomerNo())).
head(headSecond(searchVo.getProvidentHouseholdName())).
registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)100)).
build();
......@@ -6689,14 +6689,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Description 导出公积金派单花名册
* @Date 09:05 2023/7/19
*/
public List<List<String>> headSecond(String houseName, String fundAccount) {
public List<List<String>> headSecond(String houseName) {
List<List<String>> list = new ArrayList<>();
//表头数据
if(houseName!=null) {
CompanyProVo companyProVo = companyProVo(houseName);
HouseNameConfigVo vo =getFundSumExportVoTwo(houseName);
String a = "单位名称(签章): " + houseName + " 单位公积金账号:" + vo.getCustomerNo() + " 单边缴纳比例:" + companyProVo.getCompanyPro()+"%";
if(vo.getCustomerNo()==null){
vo.setCustomerNo("");
}
if(vo.getCompanyPro()==null){
vo.setCompanyPro("");
}
String a = "单位名称(签章): " + houseName + " 单位公积金账号:" + vo.getCustomerNo() + " 单边缴纳比例:" + vo.getCompanyPro()+"%";
//第一列-第十八列
for (int i = 1; i <= 8; i++) {
......@@ -6774,6 +6783,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
b = " ";
}
if (dispatchFundSumExportVo.getMonenyOne() == null) {
c = "";
}
if (dispatchFundSumExportVo.getMonenyTwo() == null) {
d= " ";
}
}
list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计"));
......@@ -6883,9 +6900,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(Lists.newArrayList("经 办 人", "电话"));
list.add(Lists.newArrayList("赵云(默认)", "63432400(默认)"));
list.add(Lists.newArrayList("赵云", "63432400"));
list.add(Lists.newArrayList("赵云(默认)", "63432400(默认)"));
list.add(Lists.newArrayList("赵云", "63432400"));
return list;
}
......@@ -6922,8 +6939,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
houseNameConfigVo.setCustomerNo("");
}
String k=houseNameConfigVo.getCompanyPro().toString();
String m=houseNameConfigVo.getCompanyPro().toString();
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), k+"%"));
list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), m+"%"));
......@@ -6995,12 +7011,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
list.add(Lists.newArrayList("", ""));
//第二列
list.add(Lists.newArrayList("", ""));
list.add(Lists.newArrayList("合计补缴金额(大写):", "合计补缴金额(大写):"));
//第三列
//第四列
int b=Double.valueOf(a).intValue();
String c=int2big(b);
list.add(Lists.newArrayList(a, a));
//第五列
list.add(Lists.newArrayList(c, c));
list.add(Lists.newArrayList(c, c));
......
......@@ -1978,8 +1978,9 @@
a.DELETE_FLAG = 0
AND a.fund_id is not null
AND a.STATUS in ('2','4')
AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1)>=0
AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0
AND a.DISPATCH_ITEM like concat('%','公积金','%')
AND a.Type=0
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
......@@ -2043,40 +2044,22 @@
<!--tDispatchInfo 社保医疗花名册派单数据-->
<select id="getFundPersionExportVo" resultMap="FundExport">
SELECT
( @i := @i + 1 ) AS NUM,
h.EMP_NAME,
h.EMP_IDCARD,
h.DEPOSIT_BASE,
h.MOTHLY_INCREASE,
h.MOTHLY_DECREASE,
h.CAUSE_CHANGE
FROM
(
SELECT
a.EMP_NAME,
a.EMP_IDCARD,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE,
IF
( a.TYPE = 0, s.UNIT_PROVIDENT_FEE * 2, NULL ) AS MOTHLY_INCREASE,
IF
( a.TYPE = 1, s.UNIT_PROVIDENT_FEE * 2, NULL ) AS MOTHLY_DECREASE,
CASE
WHEN a.TYPE = 0 THEN
"新增" ELSE "减少"
END AS CAUSE_CHANGE
FROM
t_dispatch_info a
LEFT JOIN t_provident_fund s ON s.id = a.FUND_ID
(@i :=@i+1) as NUM,
a.EMP_NAME,
a.EMP_IDCARD,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE ,
IF(a.TYPE=0 ,s.UNIT_PROVIDENT_FEE*2,NULL) as MOTHLY_INCREASE,
IF(a.TYPE=1 ,s.UNIT_PROVIDENT_FEE*2,NULL) as MOTHLY_DECREASE,
case when a.TYPE=0 then "新增"
else "减少" end as CAUSE_CHANGE
FROM t_dispatch_info a
left join t_provident_fund s on s.id=a.FUND_ID
<where>
<include refid="where_getFundDisRecord"/>
</where>
GROUP BY
a.EMP_IDCARD,
a.TYPE
ORDER BY
a.TYPE
) h,(select @i:=0) as itable
ORDER BY
a.TYPE
</select>
<!--tDispatchInfo 社保医疗花名册派单数据-->
......@@ -2102,15 +2085,27 @@
</select>
<select id="getFundSumExportVo" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumExportVo">
SELECT
SUM(IF(a.TYPE=1, 1,0)) as NUM_ONE,
SUM(IF(a.TYPE=0, 1,0)) as NUM_TWO,
SUM(IF(a.TYPE=0 ,s.UNIT_PROVIDENT_FEE*2,NULL)) AS MONENY_ONE ,
SUM(IF(a.TYPE=1 ,s.UNIT_PROVIDENT_FEE*2,NULL)) AS MONENY_TWO
sum(h.NUM_ONE) as NUM_ONE,
sum(h.NUM_TWO) as NUM_TWO,
sum(h.MONENY_ONE) AS MONENY_ONE ,
sum(h.MONENY_TWO) AS MONENY_TWO
FROM(
SELECT
IF(a.TYPE=1, 1,0) as NUM_ONE ,
IF(a.TYPE=0, 1,0) as NUM_TWO,
SUM(IF(a.TYPE=0 ,s.UNIT_PROVIDENT_FEE*2,NULL)) AS MONENY_ONE ,
SUM(IF(a.TYPE=1 ,s.UNIT_PROVIDENT_FEE*2,NULL)) AS MONENY_TWO
FROM t_dispatch_info a
left join t_provident_fund s on s.id=a.FUND_ID
<where>
<include refid="where_getFundDisRecord"/>
</where>
GROUP BY
a.EMP_IDCARD,
a.TYPE
ORDER BY
a.TYPE
)h, (select @i:=0) as itable
</select>
<select id="getFundSumExportVoOne" resultMap="FundSupplementary">
SELECT
......@@ -2125,7 +2120,7 @@
<select id="getFundPersionExportVoOne" resultMap="CompanyProVo">
SELECT
GROUP_CONCAT(DISTINCT F.COMPANY_PRO) AS COMPANY_PRO
F.COMPANY_PRO AS COMPANY_PRO
FROM `sys_house_hold_info` A
LEFT JOIN sys_area B ON A.PROVINCE = B.ID
LEFT JOIN sys_area C ON A.CITY = C.ID
......@@ -2140,7 +2135,7 @@
<select id="getFundSumExportVoTwo" resultMap="HouseNameConfigVo">
SELECT
A.CUSTOMER_NO ,A.FUND_BANK ,
GROUP_CONCAT(DISTINCT F.COMPANY_PRO) AS COMPANY_PRO
F.COMPANY_PRO AS COMPANY_PRO
FROM `sys_house_hold_info` A
LEFT JOIN sys_area B ON A.PROVINCE = B.ID
LEFT JOIN sys_area C ON A.CITY = C.ID
......
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