Commit dd3f00f6 authored by zhaji's avatar zhaji

Merge branch 'develop' into feature-zhaji

parents b6ed50c0 831eacbe
...@@ -474,4 +474,16 @@ public class TEmployeeInfoController { ...@@ -474,4 +474,16 @@ public class TEmployeeInfoController {
public Boolean updateEmpInfo(@RequestBody UpdateEmpVo vo) { public Boolean updateEmpInfo(@RequestBody UpdateEmpVo vo) {
return tEmployeeInfoService.updateEmpInfo(vo); return tEmployeeInfoService.updateEmpInfo(vo);
} }
/**
* @Description: 查验手机号码是否存在
* @Author: fxj
* @Date: 2022/08/01 18:52
**/
@Operation(summary = "通过mobile查询是否已存在", description = "通过mobile查询是否已存在")
@Inner
@PostMapping("/inner/checkMobile")
public Boolean checkMobile(@RequestBody String mobile) {
return tEmployeeInfoService.checkMobile(mobile);
}
} }
...@@ -186,4 +186,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> { ...@@ -186,4 +186,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
EmpDispatchAddVo addDispatchInfo(EmpDispatchAddVo addVo); EmpDispatchAddVo addDispatchInfo(EmpDispatchAddVo addVo);
Boolean updateEmpInfo(UpdateEmpVo vo); Boolean updateEmpInfo(UpdateEmpVo vo);
Boolean checkMobile(String mobile);
} }
...@@ -2135,6 +2135,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2135,6 +2135,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
return true; return true;
} }
@Override
public Boolean checkMobile(String mobile) {
if (Common.isEmpty(mobile)){
return true;
}
return !(baseMapper.selectCount(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getFileStatus,CommonConstants.ZERO_STRING)
.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)) > 0);
}
private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap, private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap,
Map<String, EmpContractDispatchVo> contractsMap, Map<String, EmpContractDispatchVo> contractsMap,
Map<String, EmpAddDispatchVo> empAddsMap) { Map<String, EmpAddDispatchVo> empAddsMap) {
......
...@@ -480,4 +480,8 @@ public interface ErrorCodes { ...@@ -480,4 +480,8 @@ public interface ErrorCodes {
* 派增异常: 单派工伤其他起缴日期不可填写 * 派增异常: 单派工伤其他起缴日期不可填写
*/ */
String EMP_DISPATCH_SOCIAL_DIY_INJURY_ERROR = "emp.dispatch.social.diy.injury.error"; String EMP_DISPATCH_SOCIAL_DIY_INJURY_ERROR = "emp.dispatch.social.diy.injury.error";
/**
* 派增异常: 已存在对应手机号码的在用员工档案
*/
String EMP_DISPATCH_EMP_MOBILE_REPEAT = "emp.dispatch.emp.mobile.repeat";
} }
...@@ -287,8 +287,7 @@ public class DateUtil { ...@@ -287,8 +287,7 @@ public class DateUtil {
// setLenient avoids allowing dates like 9/32/2001 // setLenient avoids allowing dates like 9/32/2001
// which would otherwise parse to 10/2/2001 // which would otherwise parse to 10/2/2001
df.setLenient(false); df.setLenient(false);
return df.parse( dateText.replace("/","").replace("-",""));
return df.parse(dateText);
} catch (ParseException e) { } catch (ParseException e) {
return null; return null;
......
...@@ -633,7 +633,9 @@ public class ExcelUtil <T> implements Serializable { ...@@ -633,7 +633,9 @@ public class ExcelUtil <T> implements Serializable {
if (Common.isNotNull(c)) { if (Common.isNotNull(c)) {
//日期格式校验 //日期格式校验
if (attr.isDate()) { if (attr.isDate()) {
DateUtil.stringToDate(c.trim(), attr.dateFormat()); if (null == DateUtil.stringToDate(c.trim(), "yyyyMMdd")) {
return errorInfo(attr, "_日期格式有误", i);
}
} }
//手机号码校验 //手机号码校验
if (attr.isPhone() && getMatchRes(c.trim(), attr, ValidityConstants.MOBILE_PATTERN)) { if (attr.isPhone() && getMatchRes(c.trim(), attr, ValidityConstants.MOBILE_PATTERN)) {
......
...@@ -183,6 +183,8 @@ emp.dispatch.reduce.fund.depart.no.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u65E0\u ...@@ -183,6 +183,8 @@ emp.dispatch.reduce.fund.depart.no.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u65E0\u
emp.dispatch.social.diy.injury.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5355\u6D3E\u5DE5\u4F24\u5176\u4ED6\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u586B\u5199 emp.dispatch.social.diy.injury.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5355\u6D3E\u5DE5\u4F24\u5176\u4ED6\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u586B\u5199
emp.dispatch.emp.mobile.repeat=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5DF2\u5B58\u5728\u5BF9\u5E94\u624B\u673A\u53F7\u7801\u7684\u5728\u7528\u5458\u5DE5\u6863\u6848
......
...@@ -187,4 +187,18 @@ public class ArchivesDaprUtil { ...@@ -187,4 +187,18 @@ public class ArchivesDaprUtil {
} }
return res; return res;
} }
/**
* @Author fxj
* @Description 校验手机号码重复
* @Date 22:11 2022/8/4
* @Param
* @return
**/
public R<Boolean> checkMobile(String mobile) {
R<Boolean> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/inner/checkMobile" , mobile, Boolean.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("检验号码重复信息失败!");
}
return res;
}
} }
...@@ -46,7 +46,7 @@ public class DispatchConstants { ...@@ -46,7 +46,7 @@ public class DispatchConstants {
/** /**
* 社保派单 * 社保派单
* '缴纳类型(0最低缴纳、1自定义、2最高缴纳) PAYMENT_TYPE * '缴纳类型(0最低、1自定义、2最高) PAYMENT_TYPE
*/ */
enum PaymentType { enum PaymentType {
LATEST("0", "最低"), LATEST("0", "最低"),
......
...@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity { ...@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity {
private String empIdcard; private String empIdcard;
/** /**
* 单位名称 * 客户名称
*/ */
@ExcelAttribute(name = "单位名称" ) @ExcelAttribute(name = "客户名称" )
@Schema(description ="单位名称") @Schema(description ="客户名称")
@ExcelProperty("单位名称") @ExcelProperty("客户名称")
private String unitId; private String unitId;
/** /**
...@@ -542,10 +542,10 @@ public class TPaymentInfo extends BaseEntity { ...@@ -542,10 +542,10 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty("单位公积金基数") @ExcelProperty("单位公积金基数")
private BigDecimal unitProvidentSet; private BigDecimal unitProvidentSet;
/** /**
* 单公积金比例 * 单公积金比例
*/ */
@ExcelAttribute(name = "单公积金比例" ) @ExcelAttribute(name = "单公积金比例" )
@ExcelProperty("单公积金比例") @ExcelProperty("单公积金比例")
private BigDecimal providentPercent; private BigDecimal providentPercent;
/** /**
* 单位公积金费用 * 单位公积金费用
......
...@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 日期,格式:2020-12-25 * 日期,格式:2020-12-25
*/ */
@Schema(description ="日期,格式:2020-12-25") @Schema(description ="日期,格式:2020-12-25")
@ExcelAttribute(name = "日期") @ExcelAttribute(name = "日期", isDate = true)
private String date; private String date;
/** /**
...@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="入职日期") @Schema(description ="入职日期")
@Size(max = 20, message = "入职日期不可超过20位") @Size(max = 20, message = "入职日期不可超过20位")
@ExcelAttribute(name = "入职日期",isDate = true,dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "入职日期", isDate = true)
private String entryDate; private String entryDate;
/** /**
...@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="派遣开始日期") @Schema(description ="派遣开始日期")
@Size(max = 20, message = "派遣开始日期不可超过20位") @Size(max = 20, message = "派遣开始日期不可超过20位")
@ExcelAttribute(name = "派遣开始日期", maxLength = 20) @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
private String dispatchStart; private String dispatchStart;
/** /**
...@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="派遣结束日期") @Schema(description ="派遣结束日期")
@Size(max = 20, message = "派遣结束日期不可超过20位") @Size(max = 20, message = "派遣结束日期不可超过20位")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
private String dispatchEnd; private String dispatchEnd;
/** /**
...@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同开始日期") @Schema(description ="合同开始日期")
@Size(max = 20, message = "合同开始日期不可超过20位") @Size(max = 20, message = "合同开始日期不可超过20位")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20) @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
private String contractStart; private String contractStart;
/** /**
...@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同终止日期") @Schema(description ="合同终止日期")
@Size(max = 20, message = "合同终止日期不可超过20位") @Size(max = 20, message = "合同终止日期不可超过20位")
@ExcelAttribute(name = "合同终止日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "合同终止日期", isDate = true)
private String contractEnd; private String contractEnd;
/** /**
...@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="试用开始日期") @Schema(description ="试用开始日期")
@Size(max = 20, message = "试用开始日期不可超过20位") @Size(max = 20, message = "试用开始日期不可超过20位")
@ExcelAttribute(name = "试用开始日期", maxLength = 20) @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
private String trialStart; private String trialStart;
/** /**
...@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="试用结束日期") @Schema(description ="试用结束日期")
@Size(max = 20, message = "试用结束日期不可超过20位") @Size(max = 20, message = "试用结束日期不可超过20位")
@ExcelAttribute(name = "试用结束日期", maxLength = 20) @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
private String trialEnd; private String trialEnd;
/** /**
...@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 离职日期 * 离职日期
*/ */
@Schema(description ="离职日期") @Schema(description ="离职日期")
@ExcelAttribute(name = "离职日期") @ExcelAttribute(name = "离职日期", isDate = true)
private Date leaveDate; private Date leaveDate;
/** /**
......
...@@ -298,11 +298,11 @@ public class TSocialFundHistory extends BaseEntity { ...@@ -298,11 +298,11 @@ public class TSocialFundHistory extends BaseEntity {
@ExcelProperty("个人公积金金额" ) @ExcelProperty("个人公积金金额" )
private BigDecimal personalFundMoney; private BigDecimal personalFundMoney;
/** /**
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳 * 缴纳类型(0最低、1自定义、2最高
*/ */
@ExcelAttribute(name = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @ExcelAttribute(name = "缴纳类型(0最低、1自定义、2最高)" )
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @Schema(description = "缴纳类型(0最低、1自定义、2最高)" )
@ExcelProperty("缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @ExcelProperty("缴纳类型(0最低、1自定义、2最高)" )
private Integer paymentType; private Integer paymentType;
/** /**
* 是否是社保:0否1是 * 是否是社保:0否1是
......
...@@ -608,12 +608,12 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -608,12 +608,12 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("委托备注" ) @ExcelProperty("委托备注" )
private String trustRemark; private String trustRemark;
/** /**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳 * 缴纳类型(0最低、1自定义缴纳、2最高
*/ */
@Length(max = 1, message = "缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1个字符" ) @Length(max = 1, message = "缴纳类型(0最低、1自定义、2最高) 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)", maxLength = 1) @ExcelAttribute(name = "缴纳类型(0最低、1自定义、2最高)", maxLength = 1)
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @Schema(description = "缴纳类型(0最低、1自定义、2最高)" )
@ExcelProperty("缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @ExcelProperty("缴纳类型(0最低、1自定义、2最高)" )
private String paymentType; private String paymentType;
/** /**
* 基数上限(社保或公积金) * 基数上限(社保或公积金)
......
...@@ -634,12 +634,12 @@ public class TSocialInfo extends BaseEntity { ...@@ -634,12 +634,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("电信编号" ) @ExcelProperty("电信编号" )
private String telecomNumber; private String telecomNumber;
/** /**
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳 * 缴纳类型(0最低、1自定义、2最高
*/ */
@Length(max = 1, message = "缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1个字符" ) @Length(max = 1, message = "缴纳类型(0最低、1自定义、2最高) 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)", maxLength = 1) @ExcelAttribute(name = "缴纳类型(0最低、1自定义、2最高)", maxLength = 1)
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @Schema(description = "缴纳类型(0最低、1自定义、2最高)" )
@ExcelProperty("缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @ExcelProperty("缴纳类型(0最低、1自定义、2最高)" )
private String paymentType; private String paymentType;
/** /**
* 备案基数 * 备案基数
......
...@@ -118,7 +118,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -118,7 +118,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 员工类型 * 员工类型
*/ */
@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 1, isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE,needExport = true) @ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE,needExport = true)
@ExcelProperty("员工类型" ) @ExcelProperty("员工类型" )
private String empType; private String empType;
/** /**
...@@ -138,7 +138,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -138,7 +138,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 户口性质 * 户口性质
*/ */
@ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.HOUSEHOLD_NATURE,needExport = true) @ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_REGISTYPE,needExport = true)
@Schema(description = "户口性质") @Schema(description = "户口性质")
@ExcelProperty("户口性质" ) @ExcelProperty("户口性质" )
private String empRegisType; private String empRegisType;
...@@ -146,7 +146,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -146,7 +146,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 民族 * 民族
*/ */
@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.NATION,needExport = true) @ExcelAttribute(name = "民族", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATIONAL,needExport = true)
@Schema(description = "民族") @Schema(description = "民族")
@ExcelProperty("民族" ) @ExcelProperty("民族" )
private String empNational; private String empNational;
...@@ -197,10 +197,10 @@ public class SocialHandleExportVo implements Serializable { ...@@ -197,10 +197,10 @@ public class SocialHandleExportVo implements Serializable {
private String recordBase; private String recordBase;
/** /**
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳 * 缴纳类型(0最低、1自定义、2最高
*/ */
@ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳",needExport = true) @ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低,1=自定义,2=最高",needExport = true)
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)") @Schema(description = "缴纳类型(0最低、1自定义、2最高)")
@ExcelProperty("缴纳类型" ) @ExcelProperty("缴纳类型" )
private String paymentType; private String paymentType;
/** /**
...@@ -213,21 +213,21 @@ public class SocialHandleExportVo implements Serializable { ...@@ -213,21 +213,21 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 缴纳地-省 * 缴纳地-省
*/ */
@ExcelAttribute(name = "社保缴纳地-省", maxLength = 32, isDataId = true, isArea = true, parentField = "",needExport = true) @ExcelAttribute(name = "社保缴纳地-省", maxLength = 32,isArea = true,needExport = true)
@Schema(description = "社保缴纳地-省") @Schema(description = "社保缴纳地-省")
@ExcelProperty("社保缴纳地-省" ) @ExcelProperty("社保缴纳地-省" )
private String socialProvince; private String socialProvince;
/** /**
* 缴纳地-市 * 缴纳地-市
*/ */
@ExcelAttribute(name = "社保缴纳地-市", maxLength = 32, isDataId = true, isArea = true, parentField = "socialProvince",needExport = true) @ExcelAttribute(name = "社保缴纳地-市", maxLength = 32, isArea = true, parentField = "socialProvince",needExport = true)
@Schema(description = "社保缴纳地-市") @Schema(description = "社保缴纳地-市")
@ExcelProperty("社保缴纳地-市" ) @ExcelProperty("社保缴纳地-市" )
private String socialCity; private String socialCity;
/** /**
* 缴纳地-县 * 缴纳地-县
*/ */
@ExcelAttribute(name = "社保缴纳地-县", maxLength = 32, isDataId = true, isArea = true, parentField = "socialCity",needExport = true) @ExcelAttribute(name = "社保缴纳地-县", maxLength = 32, isArea = true, parentField = "socialCity",needExport = true)
@Schema(description = "社保缴纳地-县") @Schema(description = "社保缴纳地-县")
@ExcelProperty("社保缴纳地-县" ) @ExcelProperty("社保缴纳地-县" )
private String socialTown; private String socialTown;
......
...@@ -306,11 +306,11 @@ public class TDispatchImportVo extends RowIndex implements Serializable { ...@@ -306,11 +306,11 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期" ) @ExcelProperty("大病起缴日期" )
private Date bigailmentStart; private Date bigailmentStart;
/** /**
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳 * 缴纳类型(0最低、1自定义、2最高
*/ */
@Length(max = 1, message = "缴纳类型 不能超过1 个字符" ) @Length(max = 1, message = "缴纳类型 不能超过1 个字符" )
@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳") @ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型:(0最低缴纳、1自定义、2最高缴纳)" ) @Schema(description = "缴纳类型:(0最低、1自定义、2最高)" )
@ExcelProperty("缴纳类型" ) @ExcelProperty("缴纳类型" )
private String paymentType; private String paymentType;
......
...@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable { ...@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
/** /**
* 单位名称 * 客户名称
*/ */
@Length(max = 50, message = "单位名称 不能超过50 个字符") @Length(max = 50, message = "客户名称 不能超过50 个字符")
@ExcelAttribute(name = "单位名称", maxLength = 50) @ExcelAttribute(name = "客户名称", maxLength = 50)
@Schema(description = "单位名称") @Schema(description = "客户名称")
@ExcelProperty("单位名称") @ExcelProperty("客户名称")
private String unitId; private String unitId;
/** /**
* 项目名称 * 项目名称
...@@ -558,11 +558,11 @@ public class TPaymentInfoVo extends RowIndex implements Serializable { ...@@ -558,11 +558,11 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@ExcelProperty("单位公积金基数") @ExcelProperty("单位公积金基数")
private BigDecimal unitProvidentSet; private BigDecimal unitProvidentSet;
/** /**
* 单公积金比例 * 单公积金比例
*/ */
@ExcelAttribute(name = "单公积金比例") @ExcelAttribute(name = "单公积金比例")
@Schema(description ="单公积金比例") @Schema(description ="单公积金比例")
@ExcelProperty("单公积金比例") @ExcelProperty("单公积金比例")
private BigDecimal providentPercent; private BigDecimal providentPercent;
/** /**
* 单位公积金费用 * 单位公积金费用
......
...@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 日期,格式:2020-12-25 * 日期,格式:2020-12-25
*/ */
@ExcelAttribute(name = "日期") @ExcelAttribute(name = "日期", isDate = true)
private String date; private String date;
/** /**
* 接单分公司 * 接单分公司
...@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 入职日期 * 入职日期
*/ */
@ExcelAttribute(name = "入职日期") @ExcelAttribute(name = "入职日期", isDate = true)
private String entryDate; private String entryDate;
/** /**
* 正式工资 * 正式工资
...@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 派遣开始日期 * 派遣开始日期
*/ */
@Length(max = 20, message = "派遣开始日期不能超过20个字符") @Length(max = 20, message = "派遣开始日期不能超过20个字符")
@ExcelAttribute(name = "派遣开始日期", maxLength = 20) @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
private String dispatchStart; private String dispatchStart;
/** /**
* 派遣结束日期 * 派遣结束日期
*/ */
@Length(max = 20, message = "派遣结束日期不能超过20个字符") @Length(max = 20, message = "派遣结束日期不能超过20个字符")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20) @ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
private String dispatchEnd; private String dispatchEnd;
/** /**
* 合同开始日期 * 合同开始日期
*/ */
@Length(max = 20, message = "合同开始日期不能超过20个字符") @Length(max = 20, message = "合同开始日期不能超过20个字符")
@ExcelAttribute(name = "合同开始日期", maxLength = 20) @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
private String contractStart; private String contractStart;
/** /**
* 合同终止日期 * 合同终止日期
*/ */
@Length(max = 20, message = "合同终止日期不能超过20个字符") @Length(max = 20, message = "合同终止日期不能超过20个字符")
@ExcelAttribute(name = "合同终止日期", maxLength = 20) @ExcelAttribute(name = "合同终止日期", maxLength = 20, isDate = true)
private String contractEnd; private String contractEnd;
/** /**
* 试用开始日期 * 试用开始日期
*/ */
@Length(max = 20, message = "试用开始日期不能超过20个字符") @Length(max = 20, message = "试用开始日期不能超过20个字符")
@ExcelAttribute(name = "试用开始日期", maxLength = 20) @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
private String trialStart; private String trialStart;
/** /**
* 试用结束日期 * 试用结束日期
*/ */
@Length(max = 20, message = "试用结束日期不能超过20个字符") @Length(max = 20, message = "试用结束日期不能超过20个字符")
@ExcelAttribute(name = "试用结束日期", maxLength = 20) @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
private String trialEnd; private String trialEnd;
/** /**
* 试用期工资 * 试用期工资
...@@ -383,7 +383,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -383,7 +383,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 离职日期 * 离职日期
*/ */
@ExcelAttribute(name = "离职日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "离职日期", isDate = true)
private Date leaveDate; private Date leaveDate;
/** /**
* 离职原因 * 离职原因
...@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 员工类型 * 员工类型
*/ */
@Length(max = 2, message = "员工类型不能超过2个字符") @Length(max = 2, message = "员工类型不能超过2个字符")
@ExcelAttribute(name = "员工类型", maxLength = 2) @ExcelAttribute(name = "员工类型", maxLength = 2)
@ExcelProperty(value ="员工类型") @ExcelProperty(value ="员工类型")
private String empTypeAdd; private String empTypeAdd;
/** /**
...@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 派单合同开始时间 * 派单合同开始时间
*/ */
@Length(max = 20, message = "派单合同开始时间不能超过20个字符") @Length(max = 20, message = "派单合同开始时间不能超过20个字符")
@ExcelAttribute(name = "派单合同开始时间", maxLength = 20) @ExcelAttribute(name = "派单合同开始时间", maxLength = 20, isDate = true)
private String contractStartAdd; private String contractStartAdd;
/** /**
* 派单合同截止时间 * 派单合同截止时间
*/ */
@Length(max = 20, message = "派单合同截止时间不能超过20个字符") @Length(max = 20, message = "派单合同截止时间不能超过20个字符")
@ExcelAttribute(name = "派单合同截止时间", maxLength = 20) @ExcelAttribute(name = "派单合同截止时间", maxLength = 20, isDate = true)
private String contractEndAdd; private String contractEndAdd;
/** /**
* 派单合同期限 * 派单合同期限
......
...@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable { ...@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳") @ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义缴纳,2=最高")
@Schema(description = "缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)") @Schema(description = "缴纳类型(0最低、1自定义缴纳、2最高)")
@ExcelProperty("缴纳类型") @ExcelProperty("缴纳类型")
private String paymentType; private String paymentType;
......
...@@ -303,8 +303,8 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable { ...@@ -303,8 +303,8 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期") @ExcelProperty("大病起缴日期")
private Date bigailmentStart; private Date bigailmentStart;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳") @ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)") @Schema(description = "缴纳类型(0最低、1自定义、2最高)")
@ExcelProperty("缴纳类型") @ExcelProperty("缴纳类型")
private String paymentType; private String paymentType;
......
...@@ -301,8 +301,8 @@ public class TSocialFundInfoVo extends RowIndex implements Serializable { ...@@ -301,8 +301,8 @@ public class TSocialFundInfoVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期") @ExcelProperty("大病起缴日期")
private Date bigailmentStart; private Date bigailmentStart;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳") @ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)") @Schema(description = "缴纳类型(0最低、1自定义、2最高)")
@ExcelProperty("缴纳类型") @ExcelProperty("缴纳类型")
private String paymentType; private String paymentType;
......
...@@ -620,12 +620,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable { ...@@ -620,12 +620,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
@ExcelProperty("电信编号" ) @ExcelProperty("电信编号" )
private String telecomNumber; private String telecomNumber;
/** /**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳 * 缴纳类型(0最低、1自定义缴纳、2最高
*/ */
@Length(max = 1, message = "缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1 个字符" ) @Length(max = 1, message = "缴纳类型(0最低、1自定义、2最高) 不能超过1 个字符" )
@ExcelAttribute(name = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)", maxLength = 1) @ExcelAttribute(name = "缴纳类型(0最低、1自定义、2最高)", maxLength = 1)
@Schema(description = "缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @Schema(description = "缴纳类型(0最低、1自定义、2最高)" )
@ExcelProperty("缴纳类型(0最低缴纳、1自定义、2最高缴纳)" ) @ExcelProperty("缴纳类型(0最低、1自定义、2最高)" )
private String paymentType; private String paymentType;
/** /**
* 备案基数 * 备案基数
......
...@@ -1232,6 +1232,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1232,6 +1232,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
} }
} }
social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setUnitMedicalMoney(BigDecimalUtils.safeMultiply(social.getUnitMedicalCardinal(), social.getUnitMedicalPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setUnitMedicalMoney(BigDecimalUtils.safeMultiply(social.getUnitMedicalCardinal(), social.getUnitMedicalPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setUnitBirthMoney(BigDecimalUtils.safeMultiply(social.getUnitBirthCardinal(), social.getUnitBirthPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setUnitBirthMoney(BigDecimalUtils.safeMultiply(social.getUnitBirthCardinal(), social.getUnitBirthPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
...@@ -1297,7 +1298,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1297,7 +1298,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitPersionMoney(null); social.setUnitPersionMoney(null);
social.setUnitPensionPer(null); social.setUnitPensionPer(null);
social.setUnitPensionCardinal(null); social.setUnitPensionCardinal(null);
social.setInsurancePension(null);
} }
if (Common.isEmpty(social.getMedicalStart())){ if (Common.isEmpty(social.getMedicalStart())){
social.setMedicalHandle(null); social.setMedicalHandle(null);
...@@ -1307,30 +1307,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1307,30 +1307,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitMedicalMoney(null); social.setUnitMedicalMoney(null);
social.setUnitMedicalPer(null); social.setUnitMedicalPer(null);
social.setUnitMedicalCardinal(null); social.setUnitMedicalCardinal(null);
social.setInsuranceMedical(null);
} }
if (Common.isEmpty(social.getBirthStart())){ if (Common.isEmpty(social.getBirthStart())){
social.setBirthHandle(null); social.setBirthHandle(null);
social.setUnitBirthMoney(null); social.setUnitBirthMoney(null);
social.setUnitBirthPer(null); social.setUnitBirthPer(null);
social.setUnitBirthCardinal(null); social.setUnitBirthCardinal(null);
social.setInsuranceBirth(null);
} }
if (Common.isEmpty(social.getUnemployStart())){ if (Common.isEmpty(social.getUnemployStart())){
social.setUnemployHandle(null); social.setUnemployHandle(null);
social.setUnitUnemploymentCardinal(null); social.setUnitUnemploymentCardinal(null);
social.setUnitUnemploymentPer(null); social.setUnitUnemploymentPer(null);
social.setUnitUnemploymentCardinal(null); social.setUnitUnemploymentCardinal(null);
social.setInsuranceUnemployment(null);
} }
if (Common.isEmpty(social.getWorkInjuryStart())){ if (Common.isEmpty(social.getWorkInjuryStart())){
social.setWorkInjuryHandle(null); social.setWorkInjuryHandle(null);
social.setUnitInjuryMoney(null); social.setUnitInjuryMoney(null);
social.setUnitWorkUnjuryPer(null); social.setUnitWorkUnjuryPer(null);
social.setUnitWorkInjuryCardinal(null); social.setUnitWorkInjuryCardinal(null);
social.setInsuranceInjury(null);
} }
if (Common.isEmpty(social.getBigailmentStart())){ if (Common.isEmpty(social.getBigailmentStart())
|| (Common.isEmpty(social.getPensionStart())
&& Common.isEmpty(social.getMedicalStart())
&& Common.isEmpty(social.getBirthStart())
&& Common.isEmpty(social.getUnemployStart())
&& Common.isEmpty(social.getBigailmentStart())
&& Common.isNotNull(social.getWorkInjuryStart())
)){
social.setBigailmentHandle(null); social.setBigailmentHandle(null);
social.setPersonalBigailmentCardinal(null); social.setPersonalBigailmentCardinal(null);
social.setPersonalBigailmentPer(null); social.setPersonalBigailmentPer(null);
...@@ -1338,7 +1341,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1338,7 +1341,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitBigailmentMoney(null); social.setUnitBigailmentMoney(null);
social.setUnitBigailmentPer(null); social.setUnitBigailmentPer(null);
social.setUnitBigailmentCardinal(null); social.setUnitBigailmentCardinal(null);
social.setInsuranceBigailment(null);
} }
} }
...@@ -1683,6 +1685,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1683,6 +1685,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg())); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
return true; return true;
} }
// 校验手机号码重复
checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile());
if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
return true;
}
if (checkRes.getData().booleanValue()){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT)));
return true;
}
} }
/*项目档案有可用状态的合同: /*项目档案有可用状态的合同:
不对合同做判断,取值:项目档案的合同; 不对合同做判断,取值:项目档案的合同;
...@@ -1897,12 +1909,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1897,12 +1909,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getRecordBase()) && Common.isNotNull(excel.getSocialHousehold())){ if (Common.isNotNull(excel.getRecordBase()) && Common.isNotNull(excel.getSocialHousehold())){
// 自定义 只要有一个不相当同的 日期或基数 就要提示 // 自定义 只要有一个不相当同的 日期或基数 就要提示
if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark()) if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT && ((Common.isNotNull(excel.getPensionCardinal())
|| excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT && excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT || (Common.isNotNull(excel.getMedicalCardinal())
|| excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT && excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT || (Common.isNotNull(excel.getUnemploymentCardinal())
|| excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT && excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getWorkInjuryCardinal())
&& excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBirthCardinal())
&& excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBigailmentCardinal())
&& excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
)){ )){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
return true; return true;
...@@ -2140,7 +2158,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2140,7 +2158,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED));
continue; continue;
} }
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
} }
} }
...@@ -2205,6 +2222,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2205,6 +2222,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
} }
if (Common.isNotNull(excel.getFundReduceDate())){ if (Common.isNotNull(excel.getFundReduceDate())){
// 公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 )
if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING); dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
dispatch.setFundId(socialFund.getFundId()); dispatch.setFundId(socialFund.getFundId());
dispatch.setFundReduceDate(excel.getSocialReduceDate()); dispatch.setFundReduceDate(excel.getSocialReduceDate());
...@@ -2214,10 +2235,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2214,10 +2235,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setFundReduceDate(excel.getFundReduceDate()); socialFund.setFundReduceDate(excel.getFundReduceDate());
socialFund.setFundStatus(CommonConstants.FIVE_STRING); socialFund.setFundStatus(CommonConstants.FIVE_STRING);
socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING); socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
// 公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 )
if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
} }
dispatch.setDispatchItem(temp.toString()); dispatch.setDispatchItem(temp.toString());
dispatch.setBelongUnitName(socialFund.getUnitName()); dispatch.setBelongUnitName(socialFund.getUnitName());
...@@ -2261,8 +2278,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2261,8 +2278,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败)、派减(6待审核 7待办理 8办理成功 9 办理失败) //社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败)、派减(6待审核 7待办理 8办理成功 9 办理失败)
if (Common.isNotNull(excel.getSocialReduceDate())){ if (Common.isNotNull(excel.getSocialReduceDate())){
if (Common.isEmpty(socialFund.getSocialStatus()) if (Common.isEmpty(socialFund.getSocialStatus())
|| (!socialFund.getSocialStatus().equals(CommonConstants.THREE_STRING) || !(socialFund.getSocialStatus().equals(CommonConstants.THREE_STRING)
&& !socialFund.getSocialStatus().equals(CommonConstants.NINE_STRING))){ || socialFund.getSocialStatus().equals(CommonConstants.FOUR_STRING)
|| socialFund.getSocialStatus().equals(CommonConstants.NINE_STRING))){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR)));
return true; return true;
} }
...@@ -2447,7 +2465,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2447,7 +2465,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setSocialAddStatus(CommonConstants.FIVE_STRING); sf.setSocialAddStatus(CommonConstants.FIVE_STRING);
sf.setSocialStatus(CommonConstants.TEN_STRING); sf.setSocialStatus(CommonConstants.TEN_STRING);
// 更新预估数据 // 更新预估数据
forecastLibraryService.updateForecastLibaryByDispatchReduce(sf); forecastLibraryService.updateForecastLibaryByDispatch(sf);
} }
socialInfo.setAuditTime(now); socialInfo.setAuditTime(now);
socialInfo.setAuditUser(user.getId()); socialInfo.setAuditUser(user.getId());
...@@ -2498,7 +2516,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2498,7 +2516,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setFundAddStatus(CommonConstants.FOUR_STRING); sf.setFundAddStatus(CommonConstants.FOUR_STRING);
sf.setFundStatus(CommonConstants.NINE_STRING); sf.setFundStatus(CommonConstants.NINE_STRING);
// 更新预估数据 // 更新预估数据
forecastLibraryService.updateForecastLibaryByDispatchReduce(sf); forecastLibraryService.updateForecastLibaryByDispatch(sf);
} }
providentFund.setAuditTime(now); providentFund.setAuditTime(now);
providentFund.setAuditUser(user.getId()); providentFund.setAuditUser(user.getId());
...@@ -2509,7 +2527,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2509,7 +2527,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.ZERO_INT == flag.intValue()) { if (CommonConstants.ZERO_INT == flag.intValue()) {
providentFund.setReduceCan(CommonConstants.ONE_STRING); providentFund.setReduceCan(CommonConstants.ONE_STRING);
sf.setFundReduceStatus(CommonConstants.ONE_STRING); sf.setFundReduceStatus(CommonConstants.ONE_STRING);
sf.setFundStatus(CommonConstants.EIGHT_STRING); sf.setFundStatus(CommonConstants.SIX_STRING);
// 审核不通过 // 审核不通过
} else if (CommonConstants.ONE_INT == flag.intValue()) { } else if (CommonConstants.ONE_INT == flag.intValue()) {
// 作废更新:公积金状态、同步档案的公积金状态 // 作废更新:公积金状态、同步档案的公积金状态
...@@ -2534,13 +2552,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2534,13 +2552,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 派单状态信息拼接 // 派单状态信息拼接
if (CommonConstants.ZERO_INT == flag.intValue()) { if (CommonConstants.ZERO_INT == flag.intValue()) {
remark += "审核通过:" + auditRemark; remark += "审核通过:" + auditRemark;
initAuditInfo(auditInfo, remark, CommonConstants.ONE_STRING, user,remark);
} else { } else {
remark += "审核不通过:" + auditRemark; remark += "审核不通过:" + auditRemark;
initAuditInfo(auditInfo, remark, CommonConstants.TWO_STRING, user,remark);
} }
//记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询 //记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询
dis.setHandleRemark(ServiceUtil.ifNullToEmpty(auditRemark)); dis.setHandleRemark(ServiceUtil.ifNullToEmpty(auditRemark));
dis.setAuditRemark(ServiceUtil.ifNullToEmpty(auditRemark)); dis.setAuditRemark(ServiceUtil.ifNullToEmpty(auditRemark));
initAuditInfo(auditInfo, remark, auditStatus, user,remark);
auditInfo.setDispatchInfoId(dis.getId()); auditInfo.setDispatchInfoId(dis.getId());
//更新派单状态 //更新派单状态
if (CommonConstants.ZERO_INT == flag.intValue()) { if (CommonConstants.ZERO_INT == flag.intValue()) {
...@@ -2730,7 +2749,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2730,7 +2749,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 派增办理,全部失败,清空社保状态 // 派增办理,全部失败,清空社保状态
if (CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) { if (CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
// 同步预估库数据 // 同步预估库数据
forecastLibraryService.updateForecastLibaryByDispatchReduce(sf); forecastLibraryService.updateForecastLibaryByDispatch(sf);
} }
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
...@@ -2738,15 +2757,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2738,15 +2757,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
temp.setLength(CommonConstants.ZERO_INT); temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD); temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString()); temp.append(socialTypeRemark);
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS); temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString()); initAuditInfo(auditInfo, ( temp + handleRemark), CommonConstants.THREE_STRING, user, temp.toString());
} else { } else {
temp.setLength(CommonConstants.ZERO_INT); temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD); temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString()); temp.append(socialTypeRemark);
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL); temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString()); initAuditInfo(auditInfo, ( temp + handleRemark), CommonConstants.FOUR_STRING, user, temp.toString());
} }
auditInfo.setSocialId(dis.getId()); auditInfo.setSocialId(dis.getId());
} else { } else {
...@@ -2773,14 +2792,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2773,14 +2792,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setFundAddStatus(CommonConstants.THREE_STRING); sf.setFundAddStatus(CommonConstants.THREE_STRING);
sf.setFundStatus(CommonConstants.FOUR_STRING); sf.setFundStatus(CommonConstants.FOUR_STRING);
// 同步预估库数据 // 同步预估库数据
forecastLibraryService.updateForecastLibaryByDispatchReduce(sf); forecastLibraryService.updateForecastLibaryByDispatch(sf);
} }
fundMapper.updateById(providentFund); fundMapper.updateById(providentFund);
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), handleStatus, user, DispatchConstants.DISPATCH_FUND_ADD_SUCCESS); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), CommonConstants.THREE_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_SUCCESS);
} else { } else {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), handleStatus, user, DispatchConstants.DISPATCH_FUND_ADD_FAIL); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_FAIL);
} }
auditInfo.setProvidentId(dis.getId()); auditInfo.setProvidentId(dis.getId());
} else { } else {
...@@ -2827,14 +2846,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2827,14 +2846,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp.append(socialTypeRemark.toString()); temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS); temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
temp.append(handleRemark); temp.append(handleRemark);
initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString()); initAuditInfo(auditInfo,temp.toString(), CommonConstants.THREE_STRING, user, temp.toString());
} else { } else {
temp.setLength(CommonConstants.ZERO_INT); temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_REDUCE); temp.append(DispatchConstants.DISPATCH_SOCIAL_REDUCE);
temp.append(socialTypeRemark.toString()); temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL); temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
temp.append(handleRemark); temp.append(handleRemark);
initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString()); initAuditInfo(auditInfo,temp.toString(), CommonConstants.FOUR_STRING, user, temp.toString());
} }
dis.setSocialHandleStatus(handleStatus); dis.setSocialHandleStatus(handleStatus);
auditInfo.setSocialId(dis.getId()); auditInfo.setSocialId(dis.getId());
...@@ -2870,10 +2889,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2870,10 +2889,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fundMapper.updateById(providentFund); fundMapper.updateById(providentFund);
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, ("公积金派减办理成功:" + handleRemark), handleStatus, user, ""); initAuditInfo(auditInfo, ("公积金派减办理成功:" + handleRemark), CommonConstants.SIX_STRING, user, "");
dis.setFundHandleStatus(CommonConstants.ONE_STRING); dis.setFundHandleStatus(CommonConstants.ONE_STRING);
} else { } else {
initAuditInfo(auditInfo, ("公积金派减办理失败:" + handleRemark), handleStatus, user, ""); initAuditInfo(auditInfo, ("公积金派减办理失败:" + handleRemark), CommonConstants.FOUR_STRING, user, "");
dis.setFundHandleStatus(CommonConstants.TWO_STRING); dis.setFundHandleStatus(CommonConstants.TWO_STRING);
} }
auditInfo.setProvidentId(dis.getId()); auditInfo.setProvidentId(dis.getId());
...@@ -3240,7 +3259,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3240,7 +3259,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(idStr)){ if (Common.isNotNull(idStr)){
ids = Common.initStrToList(idStr,CommonConstants.COMMA_STRING); ids = Common.initStrToList(idStr,CommonConstants.COMMA_STRING);
} }
return baseMapper.getSocialRecordRosterListCount(searchVo,ids,settleDomains,sql); return baseMapper.getSocialRecordRosterListCount(searchVo,settleDomains,ids,sql);
} }
/** /**
* @Author fxj * @Author fxj
...@@ -3250,7 +3269,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3250,7 +3269,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @return * @return
**/ **/
private List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) { private List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
return baseMapper.getSocialRecordRosterList(searchVo,Common.getList(idStr),settleDomains,sql); return baseMapper.getSocialRecordRosterList(searchVo,settleDomains,Common.getList(idStr),sql);
} }
@Override @Override
...@@ -3341,12 +3360,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3341,12 +3360,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) { private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
List<String> ids = Common.getList(idStr); return baseMapper.getFundRecordList(searchVo,settleDomains,Common.getList(idStr),sql);
return baseMapper.getFundRecordList(searchVo,Common.getList(idStr),settleDomains,sql);
} }
private long getFundRecordCount(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) { private long getFundRecordCount(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
return baseMapper.getFundRecordCount(searchVo,Common.getList(idStr),settleDomains,sql); return baseMapper.getFundRecordCount(searchVo,settleDomains,Common.getList(idStr),sql);
} }
} }
...@@ -1082,7 +1082,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1082,7 +1082,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @param library 预估库 * @param library 预估库
* @param socialInfo 社保 * @param socialInfo 社保
* @param sysBaseSetInfo 基数配置 * @param sysBaseSetInfo 基数配置
* @param paymentType 0最低缴纳、1自定义、2最高缴纳 * @param paymentType 0最低、1自定义、2最高
* @Description: 塞大病金额 * @Description: 塞大病金额
* @Author: hgw * @Author: hgw
* @Date: 2020/11/25 15:51 * @Date: 2020/11/25 15:51
......
...@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
} }
baseMapper.insert(info); baseMapper.insert(info);
} }
return null; return errorList;
} }
/** /**
......
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