Skip to content

Y
yifu-mvp
Commit db86ee4f authored by hongguangwu's avatar hongguangwu
Browse files
Options

专项加养老金

parent 48ca82f8
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 5 deletions
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount2022.java
View file @ db86ee4f
...@@ -297,4 +297,10 @@ public class TSalaryAccount2022 { ...@@ -297,4 +297,10 @@ public class TSalaryAccount2022 {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号码") @ExcelProperty("手机号码")
private String empPhone; private String empPhone;
@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "累计个人养老金")
private BigDecimal sumPrivatePension;
} }
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsCurrentReport.java
View file @ db86ee4f
...@@ -299,5 +299,9 @@ public class TStatisticsCurrentReport { ...@@ -299,5 +299,9 @@ public class TStatisticsCurrentReport {
@ExcelProperty("专项汇总") @ExcelProperty("专项汇总")
private BigDecimal specialDeduMoney; private BigDecimal specialDeduMoney;
@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "累计个人养老金")
private BigDecimal sumPrivatePension;
} }
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsCurrentReportMarket.java
View file @ db86ee4f
...@@ -387,4 +387,9 @@ public class TStatisticsCurrentReportMarket { ...@@ -387,4 +387,9 @@ public class TStatisticsCurrentReportMarket {
@ExcelProperty("累计婴幼儿照护费用") @ExcelProperty("累计婴幼儿照护费用")
private BigDecimal sumBabyMoney; private BigDecimal sumBabyMoney;
@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "累计个人养老金")
private BigDecimal sumPrivatePension;
} }
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsTaxSalary.java
View file @ db86ee4f
...@@ -294,4 +294,9 @@ public class TStatisticsTaxSalary { ...@@ -294,4 +294,9 @@ public class TStatisticsTaxSalary {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号码") @ExcelProperty("手机号码")
private String empPhone; private String empPhone;
@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "累计个人养老金")
private BigDecimal sumPrivatePension;
} }
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccount2022Mapper.xml
View file @ db86ee4f
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/> <result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/>
<result property="createMonth" column="CREATE_MONTH"/> <result property="createMonth" column="CREATE_MONTH"/>
<result property="empPhone" column="EMP_PHONE"/> <result property="empPhone" column="EMP_PHONE"/>
<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -95,7 +96,8 @@ ...@@ -95,7 +96,8 @@
a.sum_baby_money, a.sum_baby_money,
a.IS_NEW_EMPLOYEE, a.IS_NEW_EMPLOYEE,
a.CREATE_MONTH, a.CREATE_MONTH,
a.EMP_PHONE a.EMP_PHONE,
a.SUM_PRIVATE_PENSION
</sql> </sql>
<sql id="tSalaryAccount2022_where"> <sql id="tSalaryAccount2022_where">
<if test="tSalaryAccount2022 != null"> <if test="tSalaryAccount2022 != null">
...@@ -195,6 +197,9 @@ ...@@ -195,6 +197,9 @@
<if test="tSalaryAccount2022.sumBabyMoney != null"> <if test="tSalaryAccount2022.sumBabyMoney != null">
AND a.sum_baby_money = #{tSalaryAccount2022.sumBabyMoney} AND a.sum_baby_money = #{tSalaryAccount2022.sumBabyMoney}
</if> </if>
<if test="tSalaryAccount2022.sumPrivatePension != null">
AND a.SUM_PRIVATE_PENSION = #{tSalaryAccount2022.sumPrivatePension}
</if>
</if> </if>
</sql> </sql>
<!--tSalaryAccount2022简单分页查询--> <!--tSalaryAccount2022简单分页查询-->
...@@ -243,6 +248,7 @@ ...@@ -243,6 +248,7 @@
`unit_no` varchar(50) DEFAULT NULL COMMENT '单位no', `unit_no` varchar(50) DEFAULT NULL COMMENT '单位no',
`unit_name` varchar(50) DEFAULT NULL COMMENT '单位name', `unit_name` varchar(50) DEFAULT NULL COMMENT '单位name',
`sum_baby_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计婴幼儿照护费用', `sum_baby_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计婴幼儿照护费用',
`SUM_PRIVATE_PENSION` decimal(12,2) DEFAULT '0.00' COMMENT '累计个人养老金',
`IS_NEW_EMPLOYEE` varchar(1) DEFAULT NULL COMMENT '是否当月新增人员（0否1是）', `IS_NEW_EMPLOYEE` varchar(1) DEFAULT NULL COMMENT '是否当月新增人员（0否1是）',
`CREATE_MONTH` varchar(6) DEFAULT NULL COMMENT '入职年月', `CREATE_MONTH` varchar(6) DEFAULT NULL COMMENT '入职年月',
`EMP_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '手机号码', `EMP_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '手机号码',
...@@ -286,6 +292,7 @@ ...@@ -286,6 +292,7 @@
ifnull(sum(exemptionPersionTax.SALARY_MONEY),0) exemption_persion_tax, ifnull(sum(exemptionPersionTax.SALARY_MONEY),0) exemption_persion_tax,
s.unit_id,s.unit_no,s.unit_name, s.unit_id,s.unit_no,s.unit_name,
ifnull(max(sumBabyMoney.SALARY_MONEY),0) sum_baby_money, ifnull(max(sumBabyMoney.SALARY_MONEY),0) sum_baby_money,
ifnull(max(sumPrivatePension.SALARY_MONEY),0) SUM_PRIVATE_PENSION,
if(#{lastMonth} = DATE_FORMAT(e.CREATE_TIME,'%Y%m'),1,0) IS_NEW_EMPLOYEE, if(#{lastMonth} = DATE_FORMAT(e.CREATE_TIME,'%Y%m'),1,0) IS_NEW_EMPLOYEE,
DATE_FORMAT(e.CREATE_TIME,'%Y%m') CREATE_MONTH, DATE_FORMAT(e.CREATE_TIME,'%Y%m') CREATE_MONTH,
e.EMP_PHONE e.EMP_PHONE
...@@ -301,6 +308,7 @@ ...@@ -301,6 +308,7 @@
left join t_salary_account_item sumSupportElderlyMoney on sumSupportElderlyMoney.SALARY_ACCOUNT_ID = a.id and sumSupportElderlyMoney.JAVA_FIED_NAME='sumSupportElderlyMoney' left join t_salary_account_item sumSupportElderlyMoney on sumSupportElderlyMoney.SALARY_ACCOUNT_ID = a.id and sumSupportElderlyMoney.JAVA_FIED_NAME='sumSupportElderlyMoney'
left join t_salary_account_item sumContinuingEducationMoney on sumContinuingEducationMoney.SALARY_ACCOUNT_ID = a.id and sumContinuingEducationMoney.JAVA_FIED_NAME='sumContinuingEducationMoney' left join t_salary_account_item sumContinuingEducationMoney on sumContinuingEducationMoney.SALARY_ACCOUNT_ID = a.id and sumContinuingEducationMoney.JAVA_FIED_NAME='sumContinuingEducationMoney'
left join t_salary_account_item sumBabyMoney on sumBabyMoney.SALARY_ACCOUNT_ID = a.id and sumBabyMoney.JAVA_FIED_NAME='sumBabyMoney' left join t_salary_account_item sumBabyMoney on sumBabyMoney.SALARY_ACCOUNT_ID = a.id and sumBabyMoney.JAVA_FIED_NAME='sumBabyMoney'
left join t_salary_account_item sumPrivatePension on sumPrivatePension.SALARY_ACCOUNT_ID = a.id and sumPrivatePension.JAVA_FIED_NAME='sumPrivatePension'
left join t_salary_account_item personalSocial on personalSocial.SALARY_ACCOUNT_ID = a.id and personalSocial.JAVA_FIED_NAME='personalSocial' left join t_salary_account_item personalSocial on personalSocial.SALARY_ACCOUNT_ID = a.id and personalSocial.JAVA_FIED_NAME='personalSocial'
left join t_salary_account_item personalFund on personalFund.SALARY_ACCOUNT_ID = a.id and personalFund.JAVA_FIED_NAME='personalFund' left join t_salary_account_item personalFund on personalFund.SALARY_ACCOUNT_ID = a.id and personalFund.JAVA_FIED_NAME='personalFund'
left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial' left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsCurrentReportMapper.xml
View file @ db86ee4f
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/> <result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/>
<result property="createMonth" column="CREATE_MONTH"/> <result property="createMonth" column="CREATE_MONTH"/>
<result property="empPhone" column="EMP_PHONE"/> <result property="empPhone" column="EMP_PHONE"/>
<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
...@@ -93,7 +94,8 @@ ...@@ -93,7 +94,8 @@
a.sum_baby_money, a.sum_baby_money,
a.IS_NEW_EMPLOYEE, a.IS_NEW_EMPLOYEE,
a.CREATE_MONTH, a.CREATE_MONTH,
a.EMP_PHONE a.EMP_PHONE,
a.SUM_PRIVATE_PENSION
</sql> </sql>
<sql id="tStatisticsCurrentReport_where"> <sql id="tStatisticsCurrentReport_where">
<if test="tStatisticsCurrentReport != null"> <if test="tStatisticsCurrentReport != null">
...@@ -190,6 +192,9 @@ ...@@ -190,6 +192,9 @@
<if test="tStatisticsCurrentReport.sumBabyMoney != null"> <if test="tStatisticsCurrentReport.sumBabyMoney != null">
AND a.sum_baby_money = #{tStatisticsCurrentReport.sumBabyMoney} AND a.sum_baby_money = #{tStatisticsCurrentReport.sumBabyMoney}
</if> </if>
<if test="tStatisticsCurrentReport.sumPrivatePension != null">
AND a.SUM_PRIVATE_PENSION = #{tStatisticsCurrentReport.sumPrivatePension}
</if>
</if> </if>
</sql> </sql>
<!--tStatisticsCurrentReport简单分页查询--> <!--tStatisticsCurrentReport简单分页查询-->
...@@ -239,6 +244,7 @@ ...@@ -239,6 +244,7 @@
s.UNIT_NAME, s.UNIT_NAME,
s.SPECIAL_DEDU_MONEY, s.SPECIAL_DEDU_MONEY,
s.sum_baby_money, s.sum_baby_money,
s.SUM_PRIVATE_PENSION,
if (#{lastMonth} = s.CREATE_MONTH,1,0) IS_NEW_EMPLOYEE, if (#{lastMonth} = s.CREATE_MONTH,1,0) IS_NEW_EMPLOYEE,
s.CREATE_MONTH, s.CREATE_MONTH,
s.EMP_PHONE s.EMP_PHONE
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsCurrentReportMarketMapper.xml
View file @ db86ee4f
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<result property="unitNo" column="UNIT_NO"/> <result property="unitNo" column="UNIT_NO"/>
<result property="unitName" column="UNIT_NAME"/> <result property="unitName" column="UNIT_NAME"/>
<result property="sumBabyMoney" column="sum_baby_money"/> <result property="sumBabyMoney" column="sum_baby_money"/>
<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
...@@ -119,7 +120,8 @@ ...@@ -119,7 +120,8 @@
a.UNIT_ID, a.UNIT_ID,
a.UNIT_NO, a.UNIT_NO,
a.UNIT_NAME, a.UNIT_NAME,
a.sum_baby_money a.sum_baby_money,
a.SUM_PRIVATE_PENSION
</sql> </sql>
<sql id="tStatisticsCurrentReportMarket_where"> <sql id="tStatisticsCurrentReportMarket_where">
<if test="tStatisticsCurrentReportMarket != null"> <if test="tStatisticsCurrentReportMarket != null">
...@@ -263,6 +265,9 @@ ...@@ -263,6 +265,9 @@
</if> </if>
<if test="tStatisticsCurrentReportMarket.sumBabyMoney != null"> <if test="tStatisticsCurrentReportMarket.sumBabyMoney != null">
AND a.sum_baby_money = #{tStatisticsCurrentReportMarket.sumBabyMoney} AND a.sum_baby_money = #{tStatisticsCurrentReportMarket.sumBabyMoney}
</if>
<if test="tStatisticsCurrentReportMarket.sumPrivatePension != null">
AND a.SUM_PRIVATE_PENSION = #{tStatisticsCurrentReportMarket.sumPrivatePension}
</if> </if>
</if> </if>
</sql> </sql>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsTaxSalaryMapper.xml
View file @ db86ee4f
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/> <result property="isNewEmployee" column="IS_NEW_EMPLOYEE"/>
<result property="createMonth" column="CREATE_MONTH"/> <result property="createMonth" column="CREATE_MONTH"/>
<result property="empPhone" column="EMP_PHONE"/> <result property="empPhone" column="EMP_PHONE"/>
<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
...@@ -93,7 +94,8 @@ ...@@ -93,7 +94,8 @@
a.sum_baby_money, a.sum_baby_money,
a.IS_NEW_EMPLOYEE, a.IS_NEW_EMPLOYEE,
a.CREATE_MONTH, a.CREATE_MONTH,
a.EMP_PHONE a.EMP_PHONE,
a.SUM_PRIVATE_PENSION
</sql> </sql>
<sql id="tStatisticsTaxSalary_where"> <sql id="tStatisticsTaxSalary_where">
<if test="tStatisticsTaxSalary != null"> <if test="tStatisticsTaxSalary != null">
...@@ -190,6 +192,9 @@ ...@@ -190,6 +192,9 @@
<if test="tStatisticsTaxSalary.sumBabyMoney != null"> <if test="tStatisticsTaxSalary.sumBabyMoney != null">
AND a.sum_baby_money = #{tStatisticsTaxSalary.sumBabyMoney} AND a.sum_baby_money = #{tStatisticsTaxSalary.sumBabyMoney}
</if> </if>
<if test="tStatisticsTaxSalary.sumPrivatePension != null">
AND a.SUM_PRIVATE_PENSION = #{tStatisticsTaxSalary.sumPrivatePension}
</if>
</if> </if>
</sql> </sql>
<!--tStatisticsTaxSalary简单分页查询--> <!--tStatisticsTaxSalary简单分页查询-->
...@@ -213,7 +218,7 @@ ...@@ -213,7 +218,7 @@
,a.REAL_SALARY,a.PERSONAL_PENSION_MONEY,a.PERSONAL_MEDICAL_MONEY,a.PERSONAL_UNEMPLOYMENT_MONEY ,a.REAL_SALARY,a.PERSONAL_PENSION_MONEY,a.PERSONAL_MEDICAL_MONEY,a.PERSONAL_UNEMPLOYMENT_MONEY
,a.PERSONAL_SOCIAL,a.PERSONAL_FUND,a.enterprise_annuity,a.taxable,ifnull(c.WITHHOLDING_RATE,0) tax_fee ,a.PERSONAL_SOCIAL,a.PERSONAL_FUND,a.enterprise_annuity,a.taxable,ifnull(c.WITHHOLDING_RATE,0) tax_fee
,ifnull(c.QUICK_DEDUCATION,0) QUICK_DEDUCATION,a.salary_tax,a.unit_id,a.unit_no,a.unit_name,a.SPECIAL_DEDU_MONEY ,ifnull(c.QUICK_DEDUCATION,0) QUICK_DEDUCATION,a.salary_tax,a.unit_id,a.unit_no,a.unit_name,a.SPECIAL_DEDU_MONEY
,a.sum_baby_money, ,a.sum_baby_money,a.SUM_PRIVATE_PENSION,
a.IS_NEW_EMPLOYEE, a.IS_NEW_EMPLOYEE,
a.CREATE_MONTH, a.CREATE_MONTH,
a.EMP_PHONE a.EMP_PHONE
...@@ -237,6 +242,7 @@ ...@@ -237,6 +242,7 @@
max(a.continuing_education_expense_money) continuing_education_expense_money, max(a.continuing_education_expense_money) continuing_education_expense_money,
max(a.support_elderly_expense_money) support_elderly_expense_money, max(a.support_elderly_expense_money) support_elderly_expense_money,
max(a.sum_baby_money) sum_baby_money, max(a.sum_baby_money) sum_baby_money,
max(a.SUM_PRIVATE_PENSION) SUM_PRIVATE_PENSION,
sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social) PERSONAL_SOCIAL, sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social) PERSONAL_SOCIAL,
round(((sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social)) * 0.75),2) PERSONAL_PENSION_MONEY, round(((sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social)) * 0.75),2) PERSONAL_PENSION_MONEY,
round(((sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social)) * 0.2),2) PERSONAL_MEDICAL_MONEY, round(((sum(a.PERSONAL_SOCIAL) + sum(a.withholiding_person_social)) * 0.2),2) PERSONAL_MEDICAL_MONEY,
......
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