Commit c5748bcd authored by hongguangwu's avatar hongguangwu

找回代码

parent 3921a5f4
......@@ -74,13 +74,7 @@ public class TConfigSalary extends Model<TConfigSalary> implements Serializable
@ExcelAttribute(name = "工资月份", isNotEmpty = true,errorInfo = "工资月份不能为空" )
@ExcelProperty(value="工资月份")
private Integer salaryMonth;
/**
* 结算月份
*/
@NotNull(message = "结算月份不能为空")
@ExcelAttribute(name = "结算月份", isNotEmpty = true,errorInfo = "结算月份不能为空" )
@ExcelProperty(value="结算月份")
private Integer settleMonth;
/**
* 社保月份
*/
......@@ -116,12 +110,5 @@ public class TConfigSalary extends Model<TConfigSalary> implements Serializable
@ExcelAttribute(name = "发放方式", isNotEmpty = true,errorInfo = "发放方式不能为空" )
@ExcelProperty(value="发放方式(0:现金;1:转账)")
private Integer grantType;
/**
* 年终奖扣税方案
*/
@NotNull(message = "年终奖扣税方案不能为空")
@ExcelAttribute(name = "年终奖扣税方案", errorInfo = "年终奖扣税方案不能为空" )
@ExcelProperty(value="年终奖扣税方案(0:合并;1:单独;2:自动计算)")
private Integer annualBonusType;
}
......@@ -159,7 +159,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
Map<String, Integer> ownEmployeeMap = tOwnDeptService.getOwnEmpMap();
// 2.6.6:校验导入数据重复的Map格式:#身份证号_工资月份_报表类型_应发金额
Map<String, Integer> checkMap = tSalaryAccountService.getAccountCheckMap(dept.getId(), DateUtil.addMonth(configSalary.getSettleMonth()));
Map<String, Integer> checkMap = tSalaryAccountService.getAccountCheckMap(dept.getId(), DateUtil.addMonth(configSalary.getSalaryMonth()));
util1.getJsonStringToList(user, jsonString,
dept, configSalary, salaryConfigMap, isMustMap, empIdCardMap, empNameMap, isDuplicateName
, salaryType, invoiceTitle, employeeService, checkMap, repeatFlag, ownEmployeeMap, ownDeptMap, tSalaryAccountService);
......
......@@ -140,6 +140,7 @@ public class SalaryAccountUtil implements Serializable {
salaryStyle = SalaryConstants.SALARY_STYLE_BANK;
relaySalary = null;
actualSalarySum = null;
entity.setAnnualBonusType(SalaryConstants.ANNUAL_BONUS_TAX_TYPE_VALUE[0]);
for (Map.Entry<String, TSalaryConfigStandard> entry : salaryConfigMap.entrySet()) {
cellValueObj = getFieldValueByName(entry.getKey(), temp);
scs = entry.getValue();
......@@ -154,6 +155,9 @@ public class SalaryAccountUtil implements Serializable {
if (isMustMap.get(dbFiedName) != null && Boolean.TRUE.equals(isMustMap.get(dbFiedName))) {
isMustMap.put(dbFiedName, false);
}
if (SalaryConstants.ANNUAL_BONUS_TAX_TYPE.equals(scs.getJavaFiedName()) && SalaryConstants.ANNUAL_BONUS_ALONE.equals(cellValueStr)) {
entity.setAnnualBonusType(SalaryConstants.ANNUAL_BONUS_TAX_TYPE_VALUE[1]);
}
if (SalaryConstants.RELAY_SALARY_JAVA.equals(scs.getJavaFiedName())) {
try {
relaySalary = new BigDecimal(cellValueStr);
......
......@@ -479,12 +479,10 @@ public class SalaryCommonUtil implements Serializable {
public static void setConfigSalary(TConfigSalary configSalary, TSalaryAccountVo entity) {
if (configSalary != null && configSalary.getId() != null) {
entity.setSalaryMonth(DateUtil.addMonth(configSalary.getSalaryMonth()));
entity.setSettlementMonth(DateUtil.addMonth(configSalary.getSettleMonth()));
entity.setDeduSocialMonth(DateUtil.addMonth(configSalary.getSocialMonth()));
entity.setDeduProvidentMonth(DateUtil.addMonth(configSalary.getFundMonth()));
entity.setSocialPriority(String.valueOf(configSalary.getSocialPriority()));
entity.setFundPriority(String.valueOf(configSalary.getFundPriority()));
entity.setAnnualBonusType(String.valueOf(configSalary.getAnnualBonusType()));
}
}
......
......@@ -172,6 +172,13 @@ public class SalaryConstants {
public static final String CURRENT_SUPPLY_JAVA = "currentSupply";
//年终奖
public static final String ANNUAL_BONUS_JAVA = "annualBonus";
// 年终奖扣税方式:0合并/1单独
public static final String ANNUAL_BONUS_TAX_TYPE = "annualBonusTaxType";
// 年终奖扣税方式:单独
public static final String ANNUAL_BONUS_ALONE = "单独";
// 年终奖扣税方式的值:0合并/1单独
public static final String[] ANNUAL_BONUS_TAX_TYPE_VALUE = {"0","1"};
public static final String PRE_CURRENT_SUPPLY = "前次个人待补足";
//前次个人待补足
public static final String PRE_CURRENT_SUPPLY_JAVA = "preCurrentSupply";
......
......@@ -11,13 +11,11 @@
<result property="departNo" column="DEPART_NO"/>
<result property="departName" column="DEPART_NAME"/>
<result property="salaryMonth" column="SALARY_MONTH"/>
<result property="settleMonth" column="SETTLE_MONTH"/>
<result property="socialMonth" column="SOCIAL_MONTH"/>
<result property="fundMonth" column="FUND_MONTH"/>
<result property="socialPriority" column="SOCIAL_PRIORITY"/>
<result property="fundPriority" column="FUND_PRIORITY"/>
<result property="grantType" column="GRANT_TYPE"/>
<result property="annualBonusType" column="ANNUAL_BONUS_TYPE"/>
</resultMap>
<!--tConfigSalary简单分页查询-->
......@@ -29,13 +27,11 @@
DEPART_NO,
DEPART_NAME,
SALARY_MONTH,
SETTLE_MONTH,
SOCIAL_MONTH,
FUND_MONTH,
SOCIAL_PRIORITY,
FUND_PRIORITY,
GRANT_TYPE,
ANNUAL_BONUS_TYPE
GRANT_TYPE
FROM t_config_salary
<where>
1=1
......@@ -57,9 +53,6 @@
<if test="tConfigSalary.salaryMonth != null ">
AND SALARY_MONTH = #{tConfigSalary.salaryMonth}
</if>
<if test="tConfigSalary.settleMonth != null ">
AND SETTLE_MONTH = #{tConfigSalary.settleMonth}
</if>
<if test="tConfigSalary.socialMonth != null ">
AND SOCIAL_MONTH = #{tConfigSalary.socialMonth}
</if>
......@@ -75,9 +68,6 @@
<if test="tConfigSalary.grantType != null ">
AND GRANT_TYPE = #{tConfigSalary.grantType}
</if>
<if test="tConfigSalary.annualBonusType != null ">
AND ANNUAL_BONUS_TYPE = #{tConfigSalary.annualBonusType}
</if>
<!--数据权限判断-->
<if test="depatIds != null and depatIds.size() > 0">
and DEPART_ID in
......
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