Commit 12f63016 authored by fangxinjiang's avatar fangxinjiang

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

parents bf4d5994 9f7e9719
...@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre { ...@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
@Schema(description = "列表类型 1 待办 2监控") @Schema(description = "列表类型 1 待办 2监控")
private String type; private String type;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
} }
...@@ -2596,9 +2596,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2596,9 +2596,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
} }
if (Common.isNotNull(vo.getContractId())) { if (Common.isNotNull(vo.getContractId())) {
//2025.10.28同倩倩确认:电子签合同社保审核不同步变更状态
TEmployeeContractInfo c = contractServicer.getOne(Wrappers.<TEmployeeContractInfo>query().lambda() TEmployeeContractInfo c = contractServicer.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getId, vo.getContractId()) .eq(TEmployeeContractInfo::getId, vo.getContractId())
.and(
wrapper -> wrapper.eq(TEmployeeContractInfo::getSignType, CommonConstants.ONE_STRING)
.or().isNull(TEmployeeContractInfo::getSignType)
)
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT) .eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(c)) { if (Common.isNotNull(c)) {
......
...@@ -225,6 +225,9 @@ ...@@ -225,6 +225,9 @@
<if test="tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''"> <if test="tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''">
AND a.process_status = #{tEmployeeContractPre.processStatus} AND a.process_status = #{tEmployeeContractPre.processStatus}
</if> </if>
<if test="tEmployeeContractPre.autoSendFlag != null and tEmployeeContractPre.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="tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0"> <if test="tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0">
AND a.process_status in AND a.process_status in
<foreach item="item" index="index" collection="tEmployeeContractPre.statusList" open="(" separator="," <foreach item="item" index="index" collection="tEmployeeContractPre.statusList" open="(" separator=","
......
...@@ -874,9 +874,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -874,9 +874,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isNotNull(employeeContractPreVo.getExpectedCollectionTime()) && if (Common.isNotNull(employeeContractPreVo.getExpectedCollectionTime()) &&
Common.isNotNull(employeeContractPreVo.getExpectedConfirmTime())) { Common.isNotNull(employeeContractPreVo.getExpectedConfirmTime())) {
employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE)); employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE));
employeeContractPreVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString( employeeContractPreVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
employeeContractPreVo.getExpectedConfirmTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 8:30", DateUtil.DATETIME_PATTERN_MINUTE)); employeeContractPreVo.getExpectedConfirmTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE));
} }
archivesDaprUtil.saveContractPreInfo(employeeContractPreVo); archivesDaprUtil.saveContractPreInfo(employeeContractPreVo);
} }
......
...@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre { ...@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@TableField(exist = false) @TableField(exist = false)
private String failType; private String failType;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
} }
...@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable { ...@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable {
/** /**
* 派单人姓名 * 派单人姓名
*/ */
private String createName; private String dispatchName;
/** /**
* 创建时间 * 创建时间
*/ */
private String createTime; private String dispatchTime;
} }
...@@ -213,6 +213,9 @@ ...@@ -213,6 +213,9 @@
<if test="tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''"> <if test="tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''">
AND a.error_info is not null AND a.error_info is not null
</if> </if>
<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.authSql != null and tDispatchInfoPre.authSql.trim() != ''"> <if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''">
${tDispatchInfoPre.authSql} ${tDispatchInfoPre.authSql}
</if> </if>
......
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
<result property="socialStatus" column="SOCIAL_STATUS"/> <result property="socialStatus" column="SOCIAL_STATUS"/>
<result property="deptNo" column="SETTLE_DOMAIN_CODE"/> <result property="deptNo" column="SETTLE_DOMAIN_CODE"/>
<result property="deptName" column="SETTLE_DOMAIN_NAME"/> <result property="deptName" column="SETTLE_DOMAIN_NAME"/>
<result property="createName" column="CREATE_NAME"/> <result property="dispatchName" column="dispatchName"/>
<result property="createTime" column="CREATE_TIME"/> <result property="dispatchTime" column="dispatchTime"/>
<result property="socialProvince" column="SOCIAL_PROVINCE"/> <result property="socialProvince" column="SOCIAL_PROVINCE"/>
<result property="socialCity" column="SOCIAL_CITY"/> <result property="socialCity" column="SOCIAL_CITY"/>
<result property="socialTown" column="SOCIAL_TOWN"/> <result property="socialTown" column="SOCIAL_TOWN"/>
...@@ -1227,8 +1227,8 @@ ...@@ -1227,8 +1227,8 @@
a.SOCIAL_PROVINCE, a.SOCIAL_PROVINCE,
a.SOCIAL_CITY, a.SOCIAL_CITY,
a.SOCIAL_TOWN, a.SOCIAL_TOWN,
d.CREATE_NAME, d.CREATE_NAME as dispatchName,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as CREATE_TIME DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
FROM t_social_fund_info a FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard} where a.EMP_IDCARD = #{empIdcard}
......
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