Commit 08f1dec6 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 5e39085b a5fee1c2
......@@ -365,6 +365,115 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema(description = "工伤基数")
@ExcelProperty("工伤基数")
private BigDecimal workInjuryCardinal;
/**
* 养老基数上限
*/
@ExcelAttribute(name = "养老基数上限")
@Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限")
private BigDecimal upPersion;
/**
* 医疗基数上限
*/
@ExcelAttribute(name = "医疗基数上限")
@Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限")
private BigDecimal upMedical;
/**
* 失业基数上限
*/
@ExcelAttribute(name = "失业基数上限")
@Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限")
private BigDecimal upUnemployment;
/**
* 工伤基数上限
*/
@ExcelAttribute(name = "工伤基数上限")
@Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限")
private BigDecimal upInjury;
/**
* 生育基数上限
*/
@ExcelAttribute(name = "生育基数上限")
@Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限")
private BigDecimal upBirth;
/**
* 大病基数上限
*/
@ExcelAttribute(name = "大病基数上限")
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
/**
* 养老基数下限
*/
@ExcelAttribute(name = "养老基数下限")
@Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限")
private BigDecimal lowerPersion;
/**
* 医疗基数下限
*/
@ExcelAttribute(name = "医疗基数下限")
@Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限")
private BigDecimal lowerMedical;
/**
* 失业基数下限
*/
@ExcelAttribute(name = "失业基数下限")
@Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限")
private BigDecimal lowerUnemployment;
/**
* 工伤基数下限
*/
@ExcelAttribute(name = "工伤基数下限")
@Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限")
private BigDecimal lowerInjury;
/**
* 生育基数下限
*/
@ExcelAttribute(name = "生育基数下限")
@Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限")
private BigDecimal lowerBirth;
/**
* 大病基数下限
*/
@ExcelAttribute(name = "大病基数下限")
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
/**
* 生育基数
*/
......
......@@ -1455,13 +1455,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} else {
insert.setEmpId(project.getEmpId());
insert.setSettleDomain(project.getDeptId());
//电子签更新为签署中
if (Common.isNotNull(insert.getSignType()) && "0".equals(insert.getSignType())) {
insert.setAuditStatus(CommonConstants.FOUR_INT);
} else {
// 批量直接待审核
insert.setAuditStatus(CommonConstants.ONE_INT);
}
// 批量直接待审核
insert.setAuditStatus(CommonConstants.ONE_INT);
if (Common.isEmpty(insert.getContractTerm())
&& Common.isNotNull(insert.getContractStart())
&& Common.isNotNull(insert.getContractEnd())) {
......
......@@ -649,7 +649,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractInfo)) {
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
contractInfo.setAuditStatus(CommonConstants.FIVE_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
contractInfoService.updateById(contractInfo);
}
......
......@@ -131,8 +131,8 @@ public class DoFascTask {
pre.setRevokeReason(terminationNote);
tEmployeeContractPreService.updateById(pre);
}
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
//如果存在合同申请审核数据,将状态更新成5撤销签署
contractInfo.setAuditStatus(CommonConstants.FIVE_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
} else if (fddEvent.equals("sign-task-sign-failed")
......@@ -144,8 +144,8 @@ public class DoFascTask {
pre.setRequestId("");
tEmployeeContractPreService.updateById(pre);
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
//如果存在合同申请审核数据,将状态更新成6签署失败
contractInfo.setAuditStatus(CommonConstants.SIX_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
......
......@@ -383,7 +383,7 @@
null changeContractAndEmployee,
if(a.TRY_PERIOD = '' or a.TRY_PERIOD is null,'无',a.TRY_PERIOD) as tryPeriod,
a.id preId,
if(#{type} = '1',concat('手动签署-',a.customer_username),concat('自动化签署-',a.customer_username)) preName
if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable
<where>
1=1
......
......@@ -1739,6 +1739,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setDispatchItem("养老、医疗、生育、失业、工伤、大病");
if (CommonConstants.ZERO_STRING.equals(preVo.getIsCreateDate()) && Common.isEmpty(preVo.getSocialStartDate())) {
preVo.setBigailmentStart(registration.getJoinLeaveDate());
preVo.setPensionStart(registration.getJoinLeaveDate());
preVo.setMedicalStart(registration.getJoinLeaveDate());
preVo.setBirthStart(registration.getJoinLeaveDate());
preVo.setWorkInjuryStart(registration.getJoinLeaveDate());
preVo.setUnemployStart(registration.getJoinLeaveDate());
preVo.setSocialStartDate(registration.getJoinLeaveDate());
}
//如果自动触发派增为是,计算派单发起时间和派单确认时间
......
......@@ -383,6 +383,115 @@ public class TDispatchInfoPre extends BaseEntity {
@ExcelProperty("生育基数")
@Schema(description = "生育基数")
private BigDecimal birthCardinal;
/**
* 养老基数上限
*/
@ExcelAttribute(name = "养老基数上限")
@Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限")
private BigDecimal upPersion;
/**
* 医疗基数上限
*/
@ExcelAttribute(name = "医疗基数上限")
@Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限")
private BigDecimal upMedical;
/**
* 失业基数上限
*/
@ExcelAttribute(name = "失业基数上限")
@Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限")
private BigDecimal upUnemployment;
/**
* 工伤基数上限
*/
@ExcelAttribute(name = "工伤基数上限")
@Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限")
private BigDecimal upInjury;
/**
* 生育基数上限
*/
@ExcelAttribute(name = "生育基数上限")
@Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限")
private BigDecimal upBirth;
/**
* 大病基数上限
*/
@ExcelAttribute(name = "大病基数上限")
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
/**
* 养老基数下限
*/
@ExcelAttribute(name = "养老基数下限")
@Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限")
private BigDecimal lowerPersion;
/**
* 医疗基数下限
*/
@ExcelAttribute(name = "医疗基数下限")
@Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限")
private BigDecimal lowerMedical;
/**
* 失业基数下限
*/
@ExcelAttribute(name = "失业基数下限")
@Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限")
private BigDecimal lowerUnemployment;
/**
* 工伤基数下限
*/
@ExcelAttribute(name = "工伤基数下限")
@Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限")
private BigDecimal lowerInjury;
/**
* 生育基数下限
*/
@ExcelAttribute(name = "生育基数下限")
@Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限")
private BigDecimal lowerBirth;
/**
* 大病基数下限
*/
@ExcelAttribute(name = "大病基数下限")
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
/**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
*/
......
......@@ -60,4 +60,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
@Schema(description = "自动标识 1查询派单时间为空或者当天之前的数据")
private String timeSendFlag;
}
......@@ -175,34 +175,47 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.eq(TSocialPreDetail::getRegisterId, registrationPreVo.getExitSocialInfoList()
.get(0).getRegisterId()));
//批量新增
for (TSocialPreDetailVo vo :registrationPreVo.getExitSocialInfoList()) {
for (TSocialPreDetailVo vo : registrationPreVo.getExitSocialInfoList()) {
TSocialPreDetail preDetal = new TSocialPreDetail();
BeanUtils.copyProperties(vo, preDetal);
socialPreDetailService.save(preDetal);
}
//批量删除社保待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
baseMapper.delete(Wrappers.<TDispatchInfoPre>query().lambda().in(
TDispatchInfoPre::getProcessStatus,Arrays.asList("0", "1", "2", "4","8"))
.eq(TDispatchInfoPre::getRegisterId,registrationPreVo.getExitSocialInfoList()
TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4", "8"))
.eq(TDispatchInfoPre::getRegisterId, registrationPreVo.getExitSocialInfoList()
.get(0).getRegisterId()));
} else {
//删除已存在的入职确认信息对应的社保明细
TDispatchInfoPreVo preVo = registrationPreVo.getDispatchInfoPreVo();
socialPreDetailService.remove(Wrappers.<TSocialPreDetail>lambdaQuery()
.eq(TSocialPreDetail::getRegisterId, preVo.getRegisterId()));
if (Common.isNotNull(preVo) && Common.isNotNull(preVo.getId())) {
//更新逻辑
TDispatchInfoPre pre = new TDispatchInfoPre();
BeanUtils.copyProperties(preVo, pre);
baseMapper.updateById(pre);
}
if (Common.isNotNull(preVo) && Common.isEmpty(preVo.getId())) {
try {
try {
// if (Common.isNotNull(preVo) && Common.isNotNull(preVo.getId())) {
// //更新逻辑
// TDispatchInfoPre pre = new TDispatchInfoPre();
// BeanUtils.copyProperties(preVo, pre);
// //时间格式转化
// if (Common.isNotNull(preVo.getExpectedCollectionTime())) {
// preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
// preVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE));
// pre.setExpectedCollectionTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedCollectionTime()));
// }
// if (Common.isNotNull(preVo.getExpectedConfirmTime())) {
// preVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
// preVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 09:00", DateUtil.DATETIME_PATTERN_MINUTE));
// pre.setExpectedConfirmTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedConfirmTime()));
// }
// baseMapper.updateById(pre);
// }
if (Common.isNotNull(preVo)
// && Common.isEmpty(preVo.getId())
) {
//判断是否存在社保待购买信息
TDispatchInfoPre preExit = baseMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda()
.eq(TDispatchInfoPre::getRegisterId, preVo.getRegisterId())
.eq(TDispatchInfoPre::getEmpIdcard, preVo.getEmpIdcard())
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4", "8"))
.last(CommonConstants.LAST_ONE_SQL));
TDispatchInfoPre pre = new TDispatchInfoPre();
BeanUtils.copyProperties(preVo, pre);
......@@ -252,10 +265,10 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
baseMapper.deleteById(preExit);
}
baseMapper.insert(pre);
} catch (Exception e) {
log.error("执行异常", e);
return false;
}
} catch (Exception e) {
log.error("执行异常", e);
return false;
}
}
return true;
......@@ -575,13 +588,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.atZone(ZoneId.systemDefault())
.toLocalDate();
// 添加年数和月数
localDate = localDate
.plusYears(vo.getYearAfter())
.plusMonths(vo.getMonthAfter())
.minusDays(1);
// 转回Date类型
return Date.from(localDate.atStartOfDay()
.atZone(ZoneId.systemDefault())
.toInstant());
if (vo.getMonthAfter() == 0 && vo.getYearAfter() == 0) {
// 转回Date类型
return Date.from(localDate.atStartOfDay()
.atZone(ZoneId.systemDefault())
.toInstant());
} else {
localDate = localDate
.plusYears(vo.getYearAfter())
.plusMonths(vo.getMonthAfter())
.minusDays(1);
// 转回Date类型
return Date.from(localDate.atStartOfDay()
.atZone(ZoneId.systemDefault())
.toInstant());
}
}
}
......@@ -70,6 +70,18 @@
<result property="errorTime" column="error_time"/>
<result property="position" column="position"/>
<result property="phone" column="phone"/>
<result property="upPersion" column="UP_PERSION"/>
<result property="upMedical" column="UP_MEDICAL"/>
<result property="upUnemployment" column="UP_UNEMPLOYMENT"/>
<result property="upInjury" column="UP_INJURY"/>
<result property="upBirth" column="UP_BIRTH"/>
<result property="upBig" column="UP_BIG"/>
<result property="lowerPersion" column="LOWER_PERSION"/>
<result property="lowerMedical" column="LOWER_MEDICAL"/>
<result property="lowerUnemployment" column="LOWER_UNEMPLOYMENT"/>
<result property="lowerInjury" column="LOWER_INJURY"/>
<result property="lowerBirth" column="LOWER_BIRTH"/>
<result property="lowerBig" column="LOWER_BIG"/>
</resultMap>
<resultMap id="tDispatchInfoPreExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo">
......@@ -139,6 +151,18 @@
a.CREATE_TIME,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone,
a.SOCIAL_PROVINCE_ID,a.SOCIAL_CITY_ID,a.SOCIAL_TOWN_ID
,a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG
</sql>
<sql id="tDispatchInfoPre_other_where">
<if test="tDispatchInfoPre != null">
......@@ -216,6 +240,10 @@
<if test="tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''">
AND a.EXPECTED_CONFIRM_TIME is not null and DATE_FORMAT(a.EXPECTED_CONFIRM_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> CURDATE()
</if>
<if test="tDispatchInfoPre.timeSendFlag != null and tDispatchInfoPre.timeSendFlag.trim() != ''">
AND (a.EXPECTED_COLLECTION_TIME is null or
DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> CURDATE() )
</if>
<if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''">
${tDispatchInfoPre.authSql}
</if>
......
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