Commit 2593a2b1 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 81228113
...@@ -359,6 +359,14 @@ public class TPaymentInfoNewVo extends RowIndex implements Serializable { ...@@ -359,6 +359,14 @@ public class TPaymentInfoNewVo extends RowIndex implements Serializable {
@ExcelProperty("个人公积金费用") @ExcelProperty("个人公积金费用")
private BigDecimal personalProvidentSum; private BigDecimal personalProvidentSum;
/**
* 个人公积金比例
*/
@ExcelAttribute(name = "个人公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金比例")
private BigDecimal personalProvidentPercent;
/** /**
* 公积金户 * 公积金户
*/ */
......
...@@ -302,6 +302,7 @@ ...@@ -302,6 +302,7 @@
<result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/> <result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/>
<result property="personalProidentSet" column="PERSONAL_PROIDENT_SET"/> <result property="personalProidentSet" column="PERSONAL_PROIDENT_SET"/>
<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/> <result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
<result property="personalProvidentPercent" column="PERSONAL_PROVIDENT_PERCENT"/>
<result property="unitSocialFundSum" column="UNIT_SOCIAL_FUND_SUM"/> <result property="unitSocialFundSum" column="UNIT_SOCIAL_FUND_SUM"/>
<result property="socialFundPersonalSum" column="SOCIAL_FUND_PERSONAL_SUM"/> <result property="socialFundPersonalSum" column="SOCIAL_FUND_PERSONAL_SUM"/>
<result property="keyGroup" column="keyGroup"/> <result property="keyGroup" column="keyGroup"/>
...@@ -1785,6 +1786,7 @@ ...@@ -1785,6 +1786,7 @@
a.UNIT_PROVIDENT_SET, a.UNIT_PROVIDENT_SET,
a.PROVIDENT_PERCENT, a.PROVIDENT_PERCENT,
a.PERSONAL_PROIDENT_SET, a.PERSONAL_PROIDENT_SET,
a.PERSONAL_PROVIDENT_PERCENT,
a.UNIT_PROVIDENT_SUM, a.UNIT_PROVIDENT_SUM,
if(null = a.UNIT_PENSION_MONEY,'',round(SUM(a.UNIT_PENSION_MONEY)/MAX(a.UNIT_PENSION_SET),4)) as UNIT_PENSION_PER, if(null = a.UNIT_PENSION_MONEY,'',round(SUM(a.UNIT_PENSION_MONEY)/MAX(a.UNIT_PENSION_SET),4)) as UNIT_PENSION_PER,
if(null = a.UNIT_MEDICAL_MONEY,'',round(SUM(a.UNIT_MEDICAL_MONEY)/MAX(a.UNIT_MEDICAL_SET),4)) as UNIT_MEDICAL_PER, if(null = a.UNIT_MEDICAL_MONEY,'',round(SUM(a.UNIT_MEDICAL_MONEY)/MAX(a.UNIT_MEDICAL_SET),4)) as UNIT_MEDICAL_PER,
...@@ -1848,6 +1850,7 @@ ...@@ -1848,6 +1850,7 @@
a.UNIT_PROVIDENT_SET, a.UNIT_PROVIDENT_SET,
a.PROVIDENT_PERCENT, a.PROVIDENT_PERCENT,
a.PERSONAL_PROIDENT_SET, a.PERSONAL_PROIDENT_SET,
a.PERSONAL_PROVIDENT_PERCENT,
SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM, SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM,
'' as UNIT_PENSION_PER, '' as UNIT_PENSION_PER,
'' as UNIT_MEDICAL_PER, '' as UNIT_MEDICAL_PER,
......
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