Commit 35848004 authored by 李灿灿's avatar 李灿灿

Merge branch 'develop' into feature-licancan

parents 648c37cc 3acc35dd
...@@ -5080,6 +5080,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5080,6 +5080,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R} * @return {@link R}
*/ */
@Override @Override
@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
public R urgentUpdateIsUse(String empIdcardNo) { public R urgentUpdateIsUse(String empIdcardNo) {
//员工身份证 //员工身份证
if(StringUtils.isBlank(empIdcardNo)){ if(StringUtils.isBlank(empIdcardNo)){
......
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
set set
REDUCE_HANDLE_STATUS = #{reduceHandleStatus}, REDUCE_HANDLE_STATUS = #{reduceHandleStatus},
REMARK = #{remark}, REMARK = #{remark},
CREATE_NAME= #{createName},
CREATE_BY = #{createBy},
CREATE_TIME = #{createTime},
UPDATE_BY = #{createBy}, UPDATE_BY = #{createBy},
UPDATE_TIME = #{createTime} UPDATE_TIME = #{createTime}
where where
......
...@@ -89,14 +89,14 @@ public class TStatisticsDeclarer { ...@@ -89,14 +89,14 @@ public class TStatisticsDeclarer {
* 任职受雇从业类型 * 任职受雇从业类型
*/ */
@Length(max = 2, message = "任职受雇从业类型不能超过2个字符") @Length(max = 2, message = "任职受雇从业类型不能超过2个字符")
@ExcelIgnore @ExcelAttribute(name = "任职受雇从业类型", maxLength = 2,readConverterExp = "0=雇员,1=其他")
@ExcelProperty("任职受雇从业类型")
private String occupationType; private String occupationType;
/** /**
* 任职受雇从业日期 * 任职受雇从业日期
*/ */
@ExcelAttribute(name = "任职受雇从业日期", maxLength = 20)
@Length(max = 20, message = "任职受雇从业日期不能超过20个字符") @Length(max = 20, message = "任职受雇从业日期不能超过20个字符")
@ExcelProperty("任职受雇从业日期") @ExcelIgnore
private String occupationMonth; private String occupationMonth;
/** /**
* 本月是否申报 0 是 1 否 * 本月是否申报 0 是 1 否
......
...@@ -87,8 +87,8 @@ public class TMinSalaryController { ...@@ -87,8 +87,8 @@ public class TMinSalaryController {
@SysLog("修改各地市最低工资标准") @SysLog("修改各地市最低工资标准")
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('wxhr:tminsalary_edit')") @PreAuthorize("@pms.hasPermission('wxhr:tminsalary_edit')")
public R update(@RequestBody TMinSalary tMinSalary) { public R<Boolean> update(@RequestBody TMinSalary tMinSalary) {
return new R<>(tMinSalaryService.updateById(tMinSalary)); return tMinSalaryService.updateByIdDIy(tMinSalary);
} }
/** /**
......
...@@ -46,5 +46,5 @@ public interface TStatisticsDeclarerMapper extends BaseMapper<TStatisticsDeclare ...@@ -46,5 +46,5 @@ public interface TStatisticsDeclarerMapper extends BaseMapper<TStatisticsDeclare
* @Description: 统计 * @Description: 统计
* @return: * @return:
**/ **/
List<TStatisticsDeclarer> doStatisticsTaxDeclarer(@Param("nowMonth") String nowMonth, @Param("lastYear") String lastYear); List<TStatisticsDeclarer> doStatisticsTaxDeclarer(@Param("nowMonth") String nowMonth, @Param("lastMonth") String lastYear);
} }
...@@ -24,4 +24,6 @@ public interface TMinSalaryService extends IService<TMinSalary> { ...@@ -24,4 +24,6 @@ public interface TMinSalaryService extends IService<TMinSalary> {
R<Boolean> saveDiy(TMinSalary tMinSalary); R<Boolean> saveDiy(TMinSalary tMinSalary);
R<Boolean> updateByIdDIy(TMinSalary tMinSalary);
} }
...@@ -66,4 +66,38 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -66,4 +66,38 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
return R.ok(true,CommonConstants.SAVE_SUCCESS); return R.ok(true,CommonConstants.SAVE_SUCCESS);
} }
@Override
public R<Boolean> updateByIdDIy(TMinSalary tMinSalary) {
YifuUser user = SecurityUtils.getUser();
if (null == user || null == user.getId()) {
return R.failed("获取登录用户信息失败!");
}
TMinSalary entity = baseMapper.selectById(tMinSalary.getId());
if (Common.isNotNull(entity)){
LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>();
if (Common.isNotNull(tMinSalary.getProvince())){
query.eq(TMinSalary::getProvince,tMinSalary.getProvince());
}
if (Common.isNotNull(tMinSalary.getCity())){
query.eq(TMinSalary::getCity,tMinSalary.getCity());
}
if (Common.isNotNull(tMinSalary.getTown())){
query.eq(TMinSalary::getTown,tMinSalary.getTown());
}
if (Common.isEmpty(tMinSalary.getTown())){
query.isNull(TMinSalary::getTown);
}
query.ne(TMinSalary::getId,tMinSalary.getId());
query.eq(TMinSalary::getStatus, CommonConstants.ONE_INT);
long res = baseMapper.selectCount(query);
if (res > CommonConstants.ZERO_INT){
return R.failed("已存在对应区域在用的配置信息");
}
baseMapper.updateById(entity);
return R.ok(true,CommonConstants.UPDATE_SUCCESS);
}else {
return R.failed(false,CommonConstants.SAVE_FAILED);
}
}
} }
...@@ -201,7 +201,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -201,7 +201,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if (sdr != null && sdr.getData() != null) { if (sdr != null && sdr.getData() != null) {
dept = sdr.getData(); dept = sdr.getData();
} }
if (dept == null || dept.getId() == null) { if (dept != null && dept.getId() != null) {
invoiceTitle = dept.getBusinessSubjectName(); invoiceTitle = dept.getBusinessSubjectName();
} }
...@@ -273,10 +273,11 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -273,10 +273,11 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus()); finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus());
//年终奖合并扣税 //年终奖合并扣税
if (isSend) { if (isSend) {
wSalary = infoVo.getAnnualBonus();
finalSalaryWithSalary = finalSalaryNoSalary; finalSalaryWithSalary = finalSalaryNoSalary;
} else { } else {
finalSalaryWithSalary = calculationSalary(annousTax, BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), wSalary = BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), infoVo.getAnnualTSalary());
infoVo.getAnnualTSalary())); finalSalaryWithSalary = calculationSalary(annousTax, wSalary);
} }
if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary). if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary).
...@@ -471,8 +472,12 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -471,8 +472,12 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
zySalary.add(BigDecimalUtils.safeAdd(res,anRes)); zySalary.add(BigDecimalUtils.safeAdd(res,anRes));
map.put(BigDecimalUtils.safeAdd(res,anRes).toString(),i); map.put(BigDecimalUtils.safeAdd(res,anRes).toString(),i);
} }
BigDecimal salary = BigDecimal.ZERO;
if (Common.isNotNull(zySalary)) {
salary = Collections.min(zySalary);
}
jsonObject.put("anRes",map); jsonObject.put("anRes",map);
jsonObject.put("zySalary",Collections.max(zySalary)); jsonObject.put("zySalary",salary);
return jsonObject; return jsonObject;
} }
......
...@@ -173,8 +173,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla ...@@ -173,8 +173,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
return R.failed("上月数据已生成,不可重复生成!"); return R.failed("上月数据已生成,不可重复生成!");
} else { } else {
String lastMonth = DateUtil.addMonth(-1); //上月 String lastMonth = DateUtil.addMonth(-1); //上月
String lastYear = lastMonth.substring(0,4); List<TStatisticsDeclarer> stdvoList = baseMapper.doStatisticsTaxDeclarer(nowMonth,lastMonth);
List<TStatisticsDeclarer> stdvoList = baseMapper.doStatisticsTaxDeclarer(nowMonth,lastYear);
for (TStatisticsDeclarer declarer : stdvoList) { for (TStatisticsDeclarer declarer : stdvoList) {
this.save(declarer); this.save(declarer);
} }
......
...@@ -95,12 +95,15 @@ ...@@ -95,12 +95,15 @@
<!--统计--> <!--统计-->
<select id="doStatisticsTaxDeclarer" resultMap="tStatisticsDeclarerMap"> <select id="doStatisticsTaxDeclarer" resultMap="tStatisticsDeclarerMap">
select SELECT
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE DECLARE_UNIT, #{nowMonth} DECLARE_MONTH,c.EMP_NAME,c.EMP_IDCARD,c.EMP_PHONE,c.INVOICE_TITLE DECLARE_UNIT,
if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE if(c.FORM_TYPE=0,'0',if(c.FORM_TYPE=3 or c.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE FROM
from t_salary_account a (SELECT s.* FROM t_salary_account s,
left join t_salary_employee b on b.id = a.EMP_ID (SELECT a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE,a.FORM_TYPE,MAX(CREATE_TIME) max_day,a.SETTLEMENT_MONTH
where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH like '${lastYear}%' FROM t_salary_account a WHERE a.DELETE_FLAG = '0' AND a.SETTLEMENT_MONTH = #{lastYear}
GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.FORM_TYPE,a.SETTLEMENT_MONTH) b
WHERE s.DELETE_FLAG = '0' AND b.max_day = s.CREATE_TIME
AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE
AND s.SETTLEMENT_MONTH = b.SETTLEMENT_MONTH AND s.FORM_TYPE = b.FORM_TYPE ) c
</select> </select>
</mapper> </mapper>
...@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+ CommonConstants.DOWN_LINE_STRING + CommonConstants.DOWN_LINE_STRING
+ infoVo.getProvidentCreateMonth().trim() + infoVo.getProvidentCreateMonth().trim()
+ CommonConstants.DOWN_LINE_STRING + CommonConstants.DOWN_LINE_STRING
+ Math.round(BigDecimalUtils.safeAdd(infoVo.getProvidentSum()).doubleValue() * 100) / 100.0); + Math.round(BigDecimalUtils.safeAdd(infoVo.getUnitProvidentSum()).doubleValue() * 100) / 100.0);
} }
//存在公积金缴费数据 //存在公积金缴费数据
if (null != paymentInfo && ((BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) != 0) if (null != paymentInfo && BigDecimalUtils.isNullToZero(paymentInfo.getUnitProvidentSum()).compareTo(BigDecimal.ZERO) != 0) {
|| ((BigDecimalUtils.isNullToZero(paymentInfo.getSocialSum()).compareTo(BigDecimal.ZERO) == 0)
&& BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) == 0))) {
//允许覆盖,但已核准表或工资结算或已锁定不允许覆盖 //允许覆盖,但已核准表或工资结算或已锁定不允许覆盖
errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" +
......
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