Commit 9325f732 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 5f72b07f
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TDispatchInfoPreVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TDispatchInfoPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TFundPreDetailVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TFundPreDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSocialPreDetailVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSocialPreDetailVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail;
...@@ -169,4 +171,10 @@ public class EmployeeRegistrationPre extends BaseEntity { ...@@ -169,4 +171,10 @@ public class EmployeeRegistrationPre extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<String> attaIdList; private List<String> attaIdList;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@Schema(description = "公积金是否可修改")
@TableField(exist = false)
private Boolean fundUpdateFlag;
} }
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -157,4 +159,13 @@ public class EmployeeRegistrationPreVo implements Serializable { ...@@ -157,4 +159,13 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema(description = "修改类型:1新增;2修改;3删除;4状态346为不可编辑") @Schema(description = "修改类型:1新增;2修改;3删除;4状态346为不可编辑")
private String modelType; private String modelType;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@ExcelAttribute(name = "公积金是否可修改", maxLength = 10)
@ExcelProperty("公积金是否可修改")
@Schema(description = "公积金是否可修改")
@TableField(exist = false)
private Boolean fundUpdateFlag;
} }
...@@ -629,12 +629,4 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -629,12 +629,4 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema(description = "公积金户ID") @Schema(description = "公积金户ID")
private String configHouseId; private String configHouseId;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@ExcelAttribute(name = "公积金是否可修改", maxLength = 10)
@ExcelProperty("公积金是否可修改")
@Schema(description = "公积金是否可修改")
private Boolean fundUpdateFlag;
} }
...@@ -844,8 +844,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -844,8 +844,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//查已购买公积金明细 //查已购买公积金明细
if (null != employeeRegistrationPre.getDispatchInfoFundPreVo() if (null != employeeRegistrationPre.getDispatchInfoFundPreVo()
&& !Common.isEmpty(employeeRegistrationPre.getDispatchInfoFundPreVo().getId()) && !Common.isEmpty(employeeRegistrationPre.getDispatchInfoFundPreVo().getId())
&& null != employeeRegistrationPre.getDispatchInfoFundPreVo().getFundUpdateFlag() && null != employeeRegistrationPre.getFundUpdateFlag()
&& employeeRegistrationPre.getDispatchInfoFundPreVo().getFundUpdateFlag().booleanValue()) { && employeeRegistrationPre.getFundUpdateFlag().booleanValue()) {
R<Boolean> fundSdr = socialDaprUtils.getFundPreStatus(employeeRegistrationPre.getDispatchInfoFundPreVo().getId()); R<Boolean> fundSdr = socialDaprUtils.getFundPreStatus(employeeRegistrationPre.getDispatchInfoFundPreVo().getId());
//公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败 //公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
if (fundSdr != null && null != fundSdr.getData() if (fundSdr != null && null != fundSdr.getData()
......
...@@ -645,9 +645,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -645,9 +645,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundPreInfo(preVo, preVo.getDispatchInfoFundPreVo(), user, empPreId); initFundPreInfo(preVo, preVo.getDispatchInfoFundPreVo(), user, empPreId);
} }
//如果页面传承为不修改则不更新数据 //如果页面传承为不修改则不更新数据
if (null != preVo && null != preVo.getDispatchInfoFundPreVo() if (null != preVo && null != preVo.getFundUpdateFlag()
&& null != preVo.getDispatchInfoFundPreVo().getFundUpdateFlag() && preVo.getFundUpdateFlag().booleanValue()){
&& preVo.getDispatchInfoFundPreVo().getFundUpdateFlag().booleanValue()){
socialDaprUtils.saveFundPreInfo(preVo); socialDaprUtils.saveFundPreInfo(preVo);
} }
} }
......
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