Commit 7d4f87dd authored by hongguangwu's avatar hongguangwu

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

parents 014f21fb 67df314a
......@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
@Schema(description = "列表类型 1 待办 2监控")
private String type;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
}
......@@ -841,6 +841,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//保存社保规则明细
if (Common.isNotNull(socialRuleRels)){
TAutoSocialRuleRel temp = null;
for (TAutoSocialRuleRel rel:socialRuleRels){
//存在新增的直接socialFlag =true 后面不在判断此种场景
if (!Common.isNotNull(rel.getId())){
......@@ -852,7 +853,18 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
rel.setCreateBy(user.getId());
rel.setCreateTime(LocalDateTime.now());
rel.setCreateName(user.getNickname());
autoSocialRuleRelMapper.insert(rel);
if (Common.isNotNull(rel.getId())){
temp = autoSocialRuleRelMapper.selectById(rel.getId());
if (null != temp){
autoSocialRuleRelMapper.updateById(rel);
}else {
autoSocialRuleRelMapper.insert(rel);
}
}else {
autoSocialRuleRelMapper.insert(rel);
}
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
......
......@@ -2596,9 +2596,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(vo.getContractId())) {
//2025.10.28同倩倩确认:电子签合同社保审核不同步变更状态
TEmployeeContractInfo c = contractServicer.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getId, vo.getContractId())
.and(
wrapper -> wrapper.eq(TEmployeeContractInfo::getSignType, CommonConstants.ONE_STRING)
.or().isNull(TEmployeeContractInfo::getSignType)
)
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(c)) {
......
......@@ -225,6 +225,9 @@
<if test="tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''">
AND a.process_status = #{tEmployeeContractPre.processStatus}
</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">
AND a.process_status in
<foreach item="item" index="index" collection="tEmployeeContractPre.statusList" open="(" separator=","
......
......@@ -874,9 +874,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isNotNull(employeeContractPreVo.getExpectedCollectionTime()) &&
Common.isNotNull(employeeContractPreVo.getExpectedConfirmTime())) {
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.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);
}
......
......@@ -89,5 +89,12 @@
<artifactId>commons-logging-icbc</artifactId>
<version>1.2.0</version>
</dependency>
<!-- 交行jar引入 -->
<dependency>
<groupId>com.ipct.safety</groupId>
<artifactId>ipct_safety</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
</project>
......@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@TableField(exist = false)
private String failType;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
}
......@@ -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 @@
<if test="tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''">
AND a.error_info is not null
</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() != ''">
${tDispatchInfoPre.authSql}
</if>
......@@ -330,9 +333,10 @@
SELECT
count(1)
FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where>
1=1
<include refid="tDispatchInfoPre_other_where"/>
<include refid="tDispatchInfoPre_where"/>
</where>
</select>
......
......@@ -200,7 +200,7 @@
LEFT JOIN
(SELECT
SOCIAL_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
GROUP_CONCAT(DISTINCT AUDIT_REMARK SEPARATOR '#') as 'reasons',
DISPATCH_INFO_ID
FROM
t_audit_info
......@@ -261,7 +261,7 @@
LEFT JOIN
(SELECT
PROVIDENT_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
GROUP_CONCAT(DISTINCT AUDIT_REMARK SEPARATOR '#') as 'reasons',
DISPATCH_INFO_ID
FROM
t_audit_info
......
......@@ -277,8 +277,8 @@
<result property="socialStatus" column="SOCIAL_STATUS"/>
<result property="deptNo" column="SETTLE_DOMAIN_CODE"/>
<result property="deptName" column="SETTLE_DOMAIN_NAME"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="dispatchName" column="dispatchName"/>
<result property="dispatchTime" column="dispatchTime"/>
<result property="socialProvince" column="SOCIAL_PROVINCE"/>
<result property="socialCity" column="SOCIAL_CITY"/>
<result property="socialTown" column="SOCIAL_TOWN"/>
......@@ -1227,8 +1227,8 @@
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
d.CREATE_NAME,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as CREATE_TIME
d.CREATE_NAME as dispatchName,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
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