Skip to content

Y
yifu-mvp
Commit 9c8b4da4 authored by 李灿灿's avatar 李灿灿
Browse files
Options

Merge branch 'develop' into feature-licancan

parents 5dccf843 d6d065a5
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 53 deletions
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @ 9c8b4da4
......@@ -550,6 +550,11 @@ public class InsurancesConstants {
*/
public static final String USER_DATA_IS_NOT_EXIST = "员工投保信息不存在";
/**
* 存在多条在保记录
*/
public static final String MULTIPLE_RECORDS_UNDER_WARRANTY = "存在多条在保记录";
/***********************商险产品错误码********************************/
/**
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @ 9c8b4da4
......@@ -2341,6 +2341,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceDetail.setReduceHandleStatus(refundType);
if(CommonConstants.FOUR_INT == refundType){
tInsuranceDetail.setBuyHandleStatus(CommonConstants.FIVE_INT);
}else {
tInsuranceDetail.setBuyHandleStatus(CommonConstants.THREE_INT);
}
successList.add(tInsuranceDetail);
refund.setInsDetailId(tInsuranceDetail.getId());
......@@ -2632,9 +2634,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
LambdaQueryWrapper<TInsuranceDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TInsuranceDetail :: getDeleteFlag,CommonConstants.ZERO_INT).eq(TInsuranceDetail ::getEmpName,empName )
.eq(TInsuranceDetail ::getEmpIdcardNo,empIdCardNo ).eq(TInsuranceDetail :: getInsuranceCompanyName,insuranceCompanyName )
.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName)
.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName).eq(TInsuranceDetail :: getBuyHandleStatus,CommonConstants.THREE_INT)
.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
.eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd));
//排除已减员的数据
queryWrapper.ne(TInsuranceDetail :: getBuyHandleStatus,CommonConstants.FIVE_INT);
List<TInsuranceDetail> list = list(queryWrapper);
if (list.size()>1){
param.setErrorMessage(InsurancesConstants.MULTIPLE_RECORDS_UNDER_WARRANTY);
errorList.add(param);
continue;
}
TInsuranceDetail one = getOne(queryWrapper);
if (Common.isEmpty(one)){
param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
......@@ -2867,6 +2877,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TInsuranceDetail :: getDeptNo,deptNo).eq(TInsuranceDetail :: getBuyStandard,buyStandard)
.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName)
.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart) ).eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd));
//排除已减员的数据
queryWrapper.ne(TInsuranceDetail :: getBuyHandleStatus,CommonConstants.FIVE_INT);
List<TInsuranceDetail> list = list(queryWrapper);
if (list.size()>1){
param.setErrorMessage(InsurancesConstants.MULTIPLE_RECORDS_UNDER_WARRANTY);
errorList.add(param);
continue;
}
TInsuranceDetail insuranceDetail = getOne(queryWrapper);
//如果保单信息为空
if (Common.isEmpty(insuranceDetail)){
......@@ -3039,28 +3057,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//根据项目编码查询项目是否存在
R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(newDeptNo));
if (null != setInfoByCodes && setInfoByCodes.getCode() != CommonConstants.SUCCESS) {
Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS) {
Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
if (MapUtils.isEmpty(data)){
param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_IS_NOT_EXIST);
param.setErrorMessage(InsurancesConstants.DEPT_NO_IS_NOT_EXIST);
errorList.add(param);
continue;
}else {
//结算类型，根据项目编码获取，并冗余到明细记录中
ProjectSetInfoVo jsonObject = data.get(newDeptNo);
if (null == jsonObject){
param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_IS_NOT_EXIST);
String settleType = jsonObject.getInsuranceSettleType();
if (StringUtils.isEmpty(settleType)){
param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);
errorList.add(param);
continue;
}else {
//结算类型，根据项目编码获取，并冗余到明细记录中
String settleType = jsonObject.getInsuranceSettleType();
if (StringUtils.isEmpty(settleType)){
param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);
errorList.add(param);
continue;
}else {
param.setNewSettleType(Integer.parseInt(settleType));
}
param.setNewSettleType(Integer.parseInt(settleType));
}
}
}
......@@ -3071,6 +3083,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TInsuranceDetail :: getBuyStandard,buyStandard).eq(TInsuranceDetail::getDeptNo,oldDeptNo)
.eq(TInsuranceDetail :: getInsuranceCompanyName,insuranceCompanyName)
.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart)).eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd));
//排除已减员的数据
queryWrapper.ne(TInsuranceDetail :: getBuyHandleStatus,CommonConstants.FIVE_INT);
List<TInsuranceDetail> list = list(queryWrapper);
if (list.size()>1){
param.setErrorMessage(InsurancesConstants.MULTIPLE_RECORDS_UNDER_WARRANTY);
errorList.add(param);
continue;
}
TInsuranceDetail insuranceDetail = getOne(queryWrapper);
//如果保单信息为空
if (Common.isEmpty(insuranceDetail)){
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 9c8b4da4
......@@ -569,12 +569,12 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("大病缴纳周期：0按年1按月" )
private String collectType;
/**
* 大病取值方式0 按比例 1按定值
* 大病取值方式0按定值 1按比例
*/
@Length(max = 1, message = "大病取值方式0 按比例 1按定值 不能超过1个字符" )
@ExcelAttribute(name = "大病取值方式0 按比例 1按定值", maxLength = 1)
@Schema(description = "大病取值方式0 按比例 1按定值" )
@ExcelProperty("大病取值方式0 按比例 1按定值" )
@Length(max = 1, message = "大病取值方式0按定值 1按比例 不能超过1个字符" )
@ExcelAttribute(name = "大病取值方式0按定值 1按比例", maxLength = 1)
@Schema(description = "大病取值方式0按定值 1按比例" )
@ExcelProperty("大病取值方式0按定值 1按比例 " )
private String valueType;
/**
* 大病按年收收取月份1-12月
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @ 9c8b4da4
......@@ -249,7 +249,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
* 备案基数
*/
@Length(max = 255, message = "备案基数 不能超过255 个字符" )
@ExcelAttribute(name = "备案基数", maxLength = 255)
@ExcelAttribute(name = "备案基数", isFloat = true,max = "999999999.99")
@Schema(description = "备案基数：购买社保时必填" )
@ExcelProperty("备案基数" )
private String recordBase;
......@@ -317,21 +317,21 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 养老基数
*/
@ExcelAttribute(name = "养老基数" )
@ExcelAttribute(name = "养老基数", isFloat = true,max = "999999999.99" )
@Schema(description = "养老基数" )
@ExcelProperty("养老基数" )
private BigDecimal pensionCardinal;
/**
* 医疗基数
*/
@ExcelAttribute(name = "医疗基数" )
@ExcelAttribute(name = "医疗基数", isFloat = true,max = "999999999.99" )
@Schema(description = "医疗基数" )
@ExcelProperty("医疗基数" )
private BigDecimal medicalCardinal;
/**
* 失业基数
*/
@ExcelAttribute(name = "失业基数" )
@ExcelAttribute(name = "失业基数", isFloat = true,max = "999999999.99" )
@Schema(description = "失业基数" )
@ExcelProperty("失业基数" )
private BigDecimal unemploymentCardinal;
......@@ -339,14 +339,14 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 工伤基数
*/
@ExcelAttribute(name = "工伤基数" )
@ExcelAttribute(name = "工伤基数", isFloat = true,max = "999999999.99" )
@Schema(description = "工伤基数" )
@ExcelProperty("工伤基数" )
private BigDecimal workInjuryCardinal;
/**
* 生育基数
*/
@ExcelAttribute(name = "生育基数" )
@ExcelAttribute(name = "生育基数", isFloat = true,max = "999999999.99" )
@Schema(description = "生育基数" )
@ExcelProperty("生育基数" )
private BigDecimal birthCardinal;
......@@ -354,7 +354,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 大病基数
*/
@ExcelAttribute(name = "大病基数" )
@ExcelAttribute(name = "大病基数" , isFloat = true,max = "999999999.99" )
@Schema(description = "大病基数" )
@ExcelProperty("大病基数" )
private BigDecimal bigailmentCardinal;
......@@ -379,7 +379,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 公积金基数
*/
@ExcelAttribute(name = "公积金基数" )
@ExcelAttribute(name = "公积金基数", isFloat = true,max = "999999999.99" )
@Schema(description = "公积金基数" )
@ExcelProperty("公积金基数" )
private BigDecimal providentCardinal;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java
View file @ 9c8b4da4
......@@ -43,8 +43,5 @@ public class PreDispatchConstants {
public static final String DATA_IMPORT_ANALYSIS_ERROR = "数据导入解析失败！";
public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
public static final String TEL_NOT_EMPTY = "联系电话1不可为空！";
public static final String TEL_INVALID = "联系电话1无效！";
public static final String TEL_INVALID2 = "联系电话2无效！";
public static final String GET_AREA_INFO = "获取区域数据失败！";
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 9c8b4da4
......@@ -113,8 +113,7 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--审核")
@GetMapping("/pageAudit")
public R<IPage<TDispatchInfo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
tDispatchInfo.setStatus(CommonConstants.ZERO_STRING);
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
tDispatchInfo.setDeleteFlag(CommonConstants.ONE_STRING);
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 9c8b4da4
......@@ -330,7 +330,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
empVo = empVoMap.get(excel.getEmpIdcard());
}
// 数据合法情况
if (validImport(errorMessageList, excel,setInfoVo,socialFundMap,empVo,socialSet)) {
if (validImport(errorMessageList, excel,setInfoVo,socialFundMap,empVo,socialSet,fundSet)) {
excelVOTemp.put(excel.getEmpIdcard(),excel.getEmpIdcard());
continue;
}
......@@ -1342,7 +1342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
TDispatchImportVo excel,
ProjectSetInfoVo setInfoVo,
Map<String, TSocialFundInfo> socialFundMap,
DispatchEmpVo empVo, SysBaseSetInfo socialSet) {
DispatchEmpVo empVo, SysBaseSetInfo socialSet, SysBaseSetInfo fundSet) {
if (Common.isEmpty(setInfoVo)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND)));
return true;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @ 9c8b4da4
......@@ -550,18 +550,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if (x != null) {
return x;
}
// 手机号码必填及格式校验
if (Common.isEmpty(tPreDispatchInfo.getTelOne())) {
return R.failed(PreDispatchConstants.TEL_NOT_EMPTY);
}
if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelOne())) {
return R.failed(PreDispatchConstants.TEL_INVALID);
}
if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())) {
return R.failed(PreDispatchConstants.TEL_INVALID2);
}
}
if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
initLeaveReason(tPreDispatchInfo);
......@@ -1149,12 +1137,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
private String checkAddPreDispatch(TPreDispatchInfo tPreDispatchInfo) {
if (CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
if (Common.isEmpty(tPreDispatchInfo.getTelOne())) {
return PreDispatchConstants.TEL_NOT_EMPTY;
}
if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelOne())) {
return PreDispatchConstants.TEL_INVALID;
}
if (Common.isEmpty(tPreDispatchInfo.getPensionAddress()) &&
Common.isEmpty(tPreDispatchInfo.getFundAddress())) {
return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_ADD;
......
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