Commit ff8af359 authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents 3f425bd6 d5174ec9
...@@ -184,6 +184,7 @@ public class TPreEmployeeInfo extends BaseEntity { ...@@ -184,6 +184,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute(name = "身份证-省") @ExcelAttribute(name = "身份证-省")
@ExcelProperty("身份证-省") @ExcelProperty("身份证-省")
@Schema(description = "身份证-省") @Schema(description = "身份证-省")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idProvince; private Integer idProvince;
/** /**
* 身份证-市 * 身份证-市
...@@ -191,6 +192,7 @@ public class TPreEmployeeInfo extends BaseEntity { ...@@ -191,6 +192,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute(name = "身份证-市") @ExcelAttribute(name = "身份证-市")
@ExcelProperty("身份证-市") @ExcelProperty("身份证-市")
@Schema(description = "身份证-市") @Schema(description = "身份证-市")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idCity; private Integer idCity;
/** /**
* 身份证-县 * 身份证-县
...@@ -198,6 +200,7 @@ public class TPreEmployeeInfo extends BaseEntity { ...@@ -198,6 +200,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute(name = "身份证-县") @ExcelAttribute(name = "身份证-县")
@ExcelProperty("身份证-县") @ExcelProperty("身份证-县")
@Schema(description = "身份证-县") @Schema(description = "身份证-县")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idTown; private Integer idTown;
/** /**
* 户口性质 * 户口性质
......
...@@ -3431,12 +3431,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3431,12 +3431,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo.setEmpPhone(info.getEmpPhone()); tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
if (Common.isNotNull(info.getIdProvinceValue())) { if (Common.isNotNull(info.getIdProvinceValue())) {
tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue())); tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
} else {
tPreEmployeeInfo.setIdProvince(null);
} }
if (Common.isNotNull(info.getIdCityValue())) { if (Common.isNotNull(info.getIdCityValue())) {
tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue())); tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
} else {
tPreEmployeeInfo.setIdCity(null);
} }
if (Common.isNotNull(info.getIdTownValue())) { if (Common.isNotNull(info.getIdTownValue())) {
tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue())); tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
} else {
tPreEmployeeInfo.setIdTown(null);
} }
tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue()); tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue());
if (Common.isNotNull(info.getFileProvinceValue())) { if (Common.isNotNull(info.getFileProvinceValue())) {
...@@ -3447,6 +3453,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3447,6 +3453,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
if (Common.isNotNull(info.getFileTownValue())) { if (Common.isNotNull(info.getFileTownValue())) {
tPreEmployeeInfo.setFileTown(Integer.parseInt(info.getFileTownValue())); tPreEmployeeInfo.setFileTown(Integer.parseInt(info.getFileTownValue()));
} else {
tPreEmployeeInfo.setFileTown(null);
} }
if (Common.isNotNull(info.getEducationNameValue())) { if (Common.isNotNull(info.getEducationNameValue())) {
tPreEmployeeInfo.setHignEducation(info.getEducationNameValue()); tPreEmployeeInfo.setHignEducation(info.getEducationNameValue());
......
...@@ -19,6 +19,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard; ...@@ -19,6 +19,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException; import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
...@@ -7684,7 +7685,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7684,7 +7685,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override @Override
public IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, InsuranceSearchVo condition) { public IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, InsuranceSearchVo condition) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId())) { long roleId = 1851541100126863362L;
boolean isSsc = this.haveRole(user, roleId);
if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId()) || isSsc) {
condition.setCreateBy(null); condition.setCreateBy(null);
} else { } else {
condition.setCreateBy(user.getId()); condition.setCreateBy(user.getId());
...@@ -7933,7 +7936,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7933,7 +7936,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
searchVo.setIdList(Common.getList(idstr)); searchVo.setIdList(Common.getList(idstr));
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId())) { long roleId = 1851541100126863362L;
boolean isSsc = this.haveRole(user, roleId);
if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId()) || isSsc) {
searchVo.setCreateBy(null); searchVo.setCreateBy(null);
} else { } else {
searchVo.setCreateBy(user.getId()); searchVo.setCreateBy(user.getId());
...@@ -8050,4 +8055,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -8050,4 +8055,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
searchVo.setExpireIgnoreFlag(CommonConstants.ONE_STRING); searchVo.setExpireIgnoreFlag(CommonConstants.ONE_STRING);
return R.ok(baseMapper.noPageCountDiy(searchVo)); return R.ok(baseMapper.noPageCountDiy(searchVo));
} }
private boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
for (Long role : roleList) {
if (role == roleId) {
return true;
}
}
return false;
}
} }
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