Commit 1e5ce3fa authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent c6896097
...@@ -289,6 +289,11 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -289,6 +289,11 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<TAttaInfo> attaList; private List<TAttaInfo> attaList;
@Schema(description = "超期标识 0已超期 1未超期")
private String overFlag;
@Schema(description = "催办标识 0已催办 1未催办")
private String isUrg;
@Schema(description = "法大大模版ID") @Schema(description = "法大大模版ID")
private String fadadaTemplateId; private String fadadaTemplateId;
......
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.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex; import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -172,6 +173,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -172,6 +173,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "入职日期", isDate = true) @ExcelAttribute(name = "入职日期", isDate = true)
@Schema(description = "入职日期") @Schema(description = "入职日期")
@ExcelProperty("入职日期") @ExcelProperty("入职日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date joinLeaveDate; private Date joinLeaveDate;
/** /**
* 前端客服姓名 * 前端客服姓名
...@@ -193,6 +195,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -193,6 +195,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "预计派单时间", isDate = true) @ExcelAttribute(name = "预计派单时间", isDate = true)
@Schema(description = "预计派单时间") @Schema(description = "预计派单时间")
@ExcelProperty("预计派单时间") @ExcelProperty("预计派单时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date expectedCollectionTime; private Date expectedCollectionTime;
/** /**
* 预计派单时间 * 预计派单时间
...@@ -205,6 +208,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -205,6 +208,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "派单确认时间", isDate = true) @ExcelAttribute(name = "派单确认时间", isDate = true)
@Schema(description = "派单确认时间") @Schema(description = "派单确认时间")
@ExcelProperty("派单确认时间") @ExcelProperty("派单确认时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date expectedConfirmTime; private Date expectedConfirmTime;
/** /**
* 是否自动触发派增 0 是 1否 * 是否自动触发派增 0 是 1否
...@@ -247,6 +251,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -247,6 +251,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "起缴日期", isDate = true) @ExcelAttribute(name = "起缴日期", isDate = true)
@Schema(description = "起缴日期") @Schema(description = "起缴日期")
@ExcelProperty("起缴日期") @ExcelProperty("起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date socialStartDate; private Date socialStartDate;
/** /**
* 养老起缴日期 * 养老起缴日期
...@@ -254,6 +259,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -254,6 +259,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "养老起缴日期", isDate = true) @ExcelAttribute(name = "养老起缴日期", isDate = true)
@Schema(description = "养老起缴日期") @Schema(description = "养老起缴日期")
@ExcelProperty("养老起缴日期") @ExcelProperty("养老起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date pensionStart; private Date pensionStart;
/** /**
* 医疗起缴日期 * 医疗起缴日期
...@@ -261,6 +267,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -261,6 +267,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "医疗起缴日期", isDate = true) @ExcelAttribute(name = "医疗起缴日期", isDate = true)
@Schema(description = "医疗起缴日期") @Schema(description = "医疗起缴日期")
@ExcelProperty("医疗起缴日期") @ExcelProperty("医疗起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date medicalStart; private Date medicalStart;
/** /**
* 失业起缴日期 * 失业起缴日期
...@@ -268,6 +275,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -268,6 +275,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "失业起缴日期", isDate = true) @ExcelAttribute(name = "失业起缴日期", isDate = true)
@Schema(description = "失业起缴日期") @Schema(description = "失业起缴日期")
@ExcelProperty("失业起缴日期") @ExcelProperty("失业起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date unemployStart; private Date unemployStart;
/** /**
* 工伤起缴日期 * 工伤起缴日期
...@@ -275,6 +283,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -275,6 +283,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "工伤起缴日期", isDate = true) @ExcelAttribute(name = "工伤起缴日期", isDate = true)
@Schema(description = "工伤起缴日期") @Schema(description = "工伤起缴日期")
@ExcelProperty("工伤起缴日期") @ExcelProperty("工伤起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date workInjuryStart; private Date workInjuryStart;
/** /**
* 生育起缴日期 * 生育起缴日期
...@@ -282,6 +291,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -282,6 +291,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "生育起缴日期", isDate = true) @ExcelAttribute(name = "生育起缴日期", isDate = true)
@Schema(description = "生育起缴日期") @Schema(description = "生育起缴日期")
@ExcelProperty("生育起缴日期") @ExcelProperty("生育起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date birthStart; private Date birthStart;
/** /**
* 大病起缴日期 * 大病起缴日期
...@@ -289,6 +299,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -289,6 +299,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "大病起缴日期", isDate = true) @ExcelAttribute(name = "大病起缴日期", isDate = true)
@Schema(description = "大病起缴日期") @Schema(description = "大病起缴日期")
@ExcelProperty("大病起缴日期") @ExcelProperty("大病起缴日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date bigailmentStart; private Date bigailmentStart;
/** /**
* 委托备注 * 委托备注
......
...@@ -284,4 +284,14 @@ public class TEmployeeContractPreController { ...@@ -284,4 +284,14 @@ public class TEmployeeContractPreController {
public R electronicSignExpiringReminder() { public R electronicSignExpiringReminder() {
return tEmployeeContractPreService.electronicSignExpiringReminder(); return tEmployeeContractPreService.electronicSignExpiringReminder();
} }
/**
* 一键催办
* @param idList 一键催办列表
**/
@Operation(description = "一键催办")
@PostMapping("/contractUrg")
public R contractUrg(@RequestBody List<String> idList) {
return tEmployeeContractPreService.contractUrg(idList);
}
} }
...@@ -97,4 +97,10 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP ...@@ -97,4 +97,10 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
*/ */
R electronicSignExpiringReminder(); R electronicSignExpiringReminder();
/**
* 合同待签订一键催办
* @param idList id集合
* @return
*/
R contractUrg(List<String> idList);
} }
...@@ -947,6 +947,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -947,6 +947,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}); });
stats.setExpiringCount(stats.getExpiringCount() + 1); stats.setExpiringCount(stats.getExpiringCount() + 1);
} }
//更新催办和超期标识标识
contract.setOverFlag(CommonConstants.ZERO_STRING);
if (Common.isEmpty(contract.getIsUrg())) {
contract.setIsUrg(CommonConstants.ONE_STRING);
}
} }
} }
} }
...@@ -971,7 +976,29 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -971,7 +976,29 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return R.failed("执行电子签合同即将超期提醒任务时发生异常:" + e.getMessage()); return R.failed("执行电子签合同即将超期提醒任务时发生异常:" + e.getMessage());
} }
} }
@Override
public R contractUrg(List<String> idList) {
// 查询所有待催办的合同
List<TEmployeeContractPre> signingContracts = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query()
.lambda()
.eq(TEmployeeContractPre::getIsUrg, CommonConstants.ONE_STRING)
.in(TEmployeeContractPre::getId, idList)
);
if (Common.isNotNull(signingContracts) && signingContracts.size() > 0) {
try {
for (TEmployeeContractPre pre : signingContracts) {
fascService.urgeTask(pre.getId());
pre.setIsUrg(CommonConstants.ZERO_STRING);
baseMapper.updateById(pre);
}
} catch (Exception e) {
log.error("发送法大大催办时发生异常", e);
}
}
return R.ok();
}
/** /**
* 计算入职一个月最后一天往前3个工作日的日期列表 * 计算入职一个月最后一天往前3个工作日的日期列表
* @param lastDay 入职一个月的最后一天 * @param lastDay 入职一个月的最后一天
......
...@@ -283,6 +283,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -283,6 +283,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(preExit)) { if (Common.isNotNull(preExit)) {
TDispatchInfoPreVo pre = new TDispatchInfoPreVo(); TDispatchInfoPreVo pre = new TDispatchInfoPreVo();
BeanUtils.copyProperties(preExit, pre); BeanUtils.copyProperties(preExit, pre);
preSocialListVo.setDispatchInfoPreVo(pre); preSocialListVo.setDispatchInfoPreVo(pre);
} }
......
...@@ -4430,7 +4430,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4430,7 +4430,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//针对社保自动化过来的数据,办理更新待购买数据状态 //针对社保自动化过来的数据,办理更新待购买数据状态
TDispatchInfoPre dispatchInfoPre = dispatchInfoPreMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda() TDispatchInfoPre dispatchInfoPre = dispatchInfoPreMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda()
.eq(TDispatchInfoPre::getSocialFundId, sf.getId()) .eq(TDispatchInfoPre::getSocialFundId, sf.getId())
.eq(TDispatchInfoPre::getProcessStatus, CommonConstants.FIVE_STRING) .in(TDispatchInfoPre::getProcessStatus, Arrays.asList("5","6","9"))
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(dispatchInfoPre)) { if (Common.isNotNull(dispatchInfoPre)) {
//此处状态可能会更新为 办理成功 办理中 部分办理失败和办理失败 //此处状态可能会更新为 办理成功 办理中 部分办理失败和办理失败
......
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