Commit 548c8d40 authored by hongguangwu's avatar hongguangwu

1.5.7-划转,减项的可划转

parent bdccabfe
...@@ -312,8 +312,9 @@ public class TEmployeeProject extends BaseEntity { ...@@ -312,8 +312,9 @@ public class TEmployeeProject extends BaseEntity {
/** /**
* 公积金状态(字典) * 公积金状态(字典)
* 0无公积金;1处理中;2正常;3已派减
*/ */
@Schema(description = "公积金状态(字典): 0 无公积金 1 处理中 2.部分购买 3.正常 4.已派减") @Schema(description = "公积金状态(字典): 0无公积金;1处理中;2正常;3已派减")
private Integer fundStatus; private Integer fundStatus;
/** /**
......
...@@ -545,13 +545,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -545,13 +545,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
}else{ }else{
if (Common.isEmpty(newEmpProject.getFundStatus()) if (Common.isEmpty(newEmpProject.getFundStatus())
|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus() || CommonConstants.ZERO_INT == newEmpProject.getFundStatus()
|| CommonConstants.FOUR_INT == newEmpProject.getFundStatus()){ || CommonConstants.THREE_INT == newEmpProject.getFundStatus()){
newEmpProject.setFundStatus(oldEmpProject.getFundStatus()); newEmpProject.setFundStatus(oldEmpProject.getFundStatus());
updatesf.setFlag(CommonConstants.ONE_STRING); updatesf.setFlag(CommonConstants.ONE_STRING);
socialDaprUtils.updateSocialAndFoundInfo(updatesf); socialDaprUtils.updateSocialAndFoundInfo(updatesf);
oldEmpProject.setFundStatus(CommonConstants.ZERO_INT); oldEmpProject.setFundStatus(CommonConstants.ZERO_INT);
resStr.append("公积金划转成功! <br>"); resStr.append("公积金划转成功! <br>");
}else { } else {
resStr.append("目标项目档案存在公积金数据,公积金划转失败! <br>"); resStr.append("目标项目档案存在公积金数据,公积金划转失败! <br>");
} }
} }
......
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