Skip to content

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

MVP1.5.4-SALARY实发倒推应发初次提交

parent 15e3902b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 216 additions and 156 deletions
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccountItem.java
View file @ 01136f48
...@@ -113,4 +113,10 @@ public class TSalaryAccountItem extends Model<TSalaryAccountItem> { ...@@ -113,4 +113,10 @@ public class TSalaryAccountItem extends Model<TSalaryAccountItem> {
@TableField(exist = false) @TableField(exist = false)
private String salaryMonth; private String salaryMonth;
/**
* 年终奖扣税方案0：合并；1：单独
*/
@TableField(exist = false)
private String annualBonusType;
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryTaxConfigMapper.java
View file @ 01136f48
...@@ -42,5 +42,14 @@ public interface TSalaryTaxConfigMapper extends BaseMapper<TSalaryTaxConfig> { ...@@ -42,5 +42,14 @@ public interface TSalaryTaxConfigMapper extends BaseMapper<TSalaryTaxConfig> {
**/ **/
List<TSalaryTaxConfig> getTaxConfigByAnnualBonusList(@Param("tSalaryTaxConfig") TSalaryTaxConfig tSalaryTaxConfig); List<TSalaryTaxConfig> getTaxConfigByAnnualBonusList(@Param("tSalaryTaxConfig") TSalaryTaxConfig tSalaryTaxConfig);
/**
* @param tSalaryTaxConfig
* @Description: 实发倒推
* @Author: hgw
* @Date: 2023/5/16 10:33
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryTaxConfig>
**/
List<TSalaryTaxConfig> getTaxConfigByActualList(@Param("tSalaryTaxConfig") TSalaryTaxConfig tSalaryTaxConfig);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryTaxConfigService.java
View file @ 01136f48
...@@ -41,5 +41,7 @@ public interface TSalaryTaxConfigService extends IService<TSalaryTaxConfig> { ...@@ -41,5 +41,7 @@ public interface TSalaryTaxConfigService extends IService<TSalaryTaxConfig> {
**/ **/
List<TSalaryTaxConfig> getTaxConfigByAnnualBonusList(TSalaryTaxConfig tSalaryTaxConfig); List<TSalaryTaxConfig> getTaxConfigByAnnualBonusList(TSalaryTaxConfig tSalaryTaxConfig);
List<TSalaryTaxConfig> getTaxConfigByActualList(TSalaryTaxConfig tSalaryTaxConfig);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryTaxConfigServiceImpl.java
View file @ 01136f48
...@@ -55,4 +55,16 @@ public class TSalaryTaxConfigServiceImpl extends ServiceImpl<TSalaryTaxConfigMap ...@@ -55,4 +55,16 @@ public class TSalaryTaxConfigServiceImpl extends ServiceImpl<TSalaryTaxConfigMap
return baseMapper.getTaxConfigByAnnualBonusList(tSalaryTaxConfig); return baseMapper.getTaxConfigByAnnualBonusList(tSalaryTaxConfig);
} }
/**
* @param tSalaryTaxConfig
* @Description: 获取年终奖配置
* @Author: hgw
* @Date: 2019/10/8 14:40
* @return: java.util.List<com.yifu.cloud.v1.hrms.api.entity.TSalaryTaxConfig>
**/
@Override
public List<TSalaryTaxConfig> getTaxConfigByActualList(TSalaryTaxConfig tSalaryTaxConfig) {
return baseMapper.getTaxConfigByActualList(tSalaryTaxConfig);
}
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @ 01136f48
...@@ -155,6 +155,8 @@ public class SalaryConstants { ...@@ -155,6 +155,8 @@ public class SalaryConstants {
public static final String IS_PERSON = "个人承担全部税费"; public static final String IS_PERSON = "个人承担全部税费";
//个人代扣 //个人代扣
public static final String PDEDUCTION_JAVA = "pdeduction"; public static final String PDEDUCTION_JAVA = "pdeduction";
// 通讯补贴（不计税）
public static final String PHONE_SUBSIDY_JAVA = "phoneSubsidy";
// 代扣前缀 // 代扣前缀
public static final String WITHHOLIDING = "withholiding"; public static final String WITHHOLIDING = "withholiding";
//单位代扣 //单位代扣
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountItemMapper.xml
View file @ 01136f48
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="settlementMonth" column="SETTLEMENT_MONTH"/> <result property="settlementMonth" column="SETTLEMENT_MONTH"/>
<result property="formType" column="FORM_TYPE"/> <result property="formType" column="FORM_TYPE"/>
<result property="annualBonusType" column="ANNUAL_BONUS_TYPE"/>
</resultMap> </resultMap>
<!--tSalaryAccountItem简单分页查询--> <!--tSalaryAccountItem简单分页查询-->
...@@ -423,7 +424,8 @@ ...@@ -423,7 +424,8 @@
i.IS_TAX, i.IS_TAX,
a.EMP_IDCARD, a.EMP_IDCARD,
a.SETTLEMENT_MONTH, a.SETTLEMENT_MONTH,
a.FORM_TYPE a.FORM_TYPE,
a.ANNUAL_BONUS_TYPE
FROM FROM
t_salary_account_item i left join t_salary_account a on i.SALARY_ACCOUNT_ID = a.ID t_salary_account_item i left join t_salary_account a on i.SALARY_ACCOUNT_ID = a.ID
<where> <where>
...@@ -453,7 +455,8 @@ ...@@ -453,7 +455,8 @@
i.IS_TAX, i.IS_TAX,
a.EMP_IDCARD, a.EMP_IDCARD,
a.SETTLEMENT_MONTH, a.SETTLEMENT_MONTH,
a.FORM_TYPE a.FORM_TYPE,
a.ANNUAL_BONUS_TYPE
FROM FROM
t_salary_account_item i left join t_salary_account a on i.SALARY_ACCOUNT_ID = a.ID t_salary_account_item i left join t_salary_account a on i.SALARY_ACCOUNT_ID = a.ID
<where> <where>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryTaxConfigMapper.xml
View file @ 01136f48
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
<result property="startPoint" column="START_POINT"/> <result property="startPoint" column="START_POINT"/>
</resultMap> </resultMap>
<!--tSalaryTaxConfig简单分页查询--> <sql id="Base_Column_List">
<select id="getTSalaryTaxConfigPage" resultMap="tSalaryTaxConfigMap">
SELECT
ID, ID,
TAXABLE_INCOME_REMARK, TAXABLE_INCOME_REMARK,
WITHHOLDING_RATE, WITHHOLDING_RATE,
...@@ -28,9 +26,9 @@ ...@@ -28,9 +26,9 @@
LEVEL, LEVEL,
TYPE, TYPE,
START_POINT START_POINT
FROM t_salary_tax_config </sql>
<where> <sql id="tSalaryTaxConfig_where">
1=1 <if test="tSalaryTaxConfig != null">
<if test="tSalaryTaxConfig.id != null and tSalaryTaxConfig.id.trim() != ''"> <if test="tSalaryTaxConfig.id != null and tSalaryTaxConfig.id.trim() != ''">
AND ID = #{tSalaryTaxConfig.id} AND ID = #{tSalaryTaxConfig.id}
</if> </if>
...@@ -58,90 +56,50 @@ ...@@ -58,90 +56,50 @@
<if test="tSalaryTaxConfig.startPoint != null"> <if test="tSalaryTaxConfig.startPoint != null">
AND START_POINT = #{tSalaryTaxConfig.startPoint} AND START_POINT = #{tSalaryTaxConfig.startPoint}
</if> </if>
</if>
</sql>
<!--tSalaryTaxConfig简单分页查询-->
<select id="getTSalaryTaxConfigPage" resultMap="tSalaryTaxConfigMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_salary_tax_config
<where>
1=1
<include refid="tSalaryTaxConfig_where"/>
</where> </where>
</select> </select>
<!--tSalaryTaxConfig获取个税配置--> <!--tSalaryTaxConfig获取个税配置-->
<select id="getTaxConfigByPersonList" resultMap="tSalaryTaxConfigMap"> <select id="getTaxConfigByPersonList" resultMap="tSalaryTaxConfigMap">
SELECT SELECT
ID, <include refid="Base_Column_List"/>
TAXABLE_INCOME_REMARK,
WITHHOLDING_RATE,
QUICK_DEDUCATION,
MIN_INCOME,
MAX_INCOME,
LEVEL,
TYPE,
START_POINT
FROM t_salary_tax_config FROM t_salary_tax_config
<where> <where>
TYPE = 0 TYPE = 0
<if test="tSalaryTaxConfig.id != null and tSalaryTaxConfig.id.trim() != ''"> <include refid="tSalaryTaxConfig_where"/>
AND ID = #{tSalaryTaxConfig.id}
</if>
<if test="tSalaryTaxConfig.taxableIncomeRemark != null and tSalaryTaxConfig.taxableIncomeRemark.trim() != ''">
AND TAXABLE_INCOME_REMARK = #{tSalaryTaxConfig.taxableIncomeRemark}
</if>
<if test="tSalaryTaxConfig.withholdingRate != null">
AND WITHHOLDING_RATE = #{tSalaryTaxConfig.withholdingRate}
</if>
<if test="tSalaryTaxConfig.quickDeducation != null">
AND QUICK_DEDUCATION = #{tSalaryTaxConfig.quickDeducation}
</if>
<if test="tSalaryTaxConfig.minIncome != null">
AND MIN_INCOME = #{tSalaryTaxConfig.minIncome}
</if>
<if test="tSalaryTaxConfig.maxIncome != null">
AND MAX_INCOME = #{tSalaryTaxConfig.maxIncome}
</if>
<if test="tSalaryTaxConfig.level != null">
AND LEVEL = #{tSalaryTaxConfig.level}
</if>
<if test="tSalaryTaxConfig.startPoint != null">
AND START_POINT = #{tSalaryTaxConfig.startPoint}
</if>
</where> </where>
</select> </select>
<!--tSalaryTaxConfig获取年终奖配置--> <!--tSalaryTaxConfig获取年终奖配置-->
<select id="getTaxConfigByAnnualBonusList" resultMap="tSalaryTaxConfigMap"> <select id="getTaxConfigByAnnualBonusList" resultMap="tSalaryTaxConfigMap">
SELECT SELECT
ID, <include refid="Base_Column_List"/>
TAXABLE_INCOME_REMARK,
WITHHOLDING_RATE,
QUICK_DEDUCATION,
MIN_INCOME,
MAX_INCOME,
LEVEL,
TYPE,
START_POINT
FROM t_salary_tax_config FROM t_salary_tax_config
<where> <where>
TYPE = 1 TYPE = 1
<if test="tSalaryTaxConfig.id != null and tSalaryTaxConfig.id.trim() != ''"> <include refid="tSalaryTaxConfig_where"/>
AND ID = #{tSalaryTaxConfig.id} </where>
</if> </select>
<if test="tSalaryTaxConfig.taxableIncomeRemark != null and tSalaryTaxConfig.taxableIncomeRemark.trim() != ''">
AND TAXABLE_INCOME_REMARK = #{tSalaryTaxConfig.taxableIncomeRemark} <!--tSalaryTaxConfig获取实发倒推配置-->
</if> <select id="getTaxConfigByActualList" resultMap="tSalaryTaxConfigMap">
<if test="tSalaryTaxConfig.withholdingRate != null"> SELECT
AND WITHHOLDING_RATE = #{tSalaryTaxConfig.withholdingRate} <include refid="Base_Column_List"/>
</if> FROM t_salary_tax_config
<if test="tSalaryTaxConfig.quickDeducation != null"> <where>
AND QUICK_DEDUCATION = #{tSalaryTaxConfig.quickDeducation} TYPE = 2
</if> <include refid="tSalaryTaxConfig_where"/>
<if test="tSalaryTaxConfig.minIncome != null">
AND MIN_INCOME = #{tSalaryTaxConfig.minIncome}
</if>
<if test="tSalaryTaxConfig.maxIncome != null">
AND MAX_INCOME = #{tSalaryTaxConfig.maxIncome}
</if>
<if test="tSalaryTaxConfig.level != null">
AND LEVEL = #{tSalaryTaxConfig.level}
</if>
<if test="tSalaryTaxConfig.startPoint != null">
AND START_POINT = #{tSalaryTaxConfig.startPoint}
</if>
</where> </where>
</select> </select>
......
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