Commit 5f4ec908 authored by fangxinjiang's avatar fangxinjiang

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

parents a7ac9638 a28810e5
...@@ -114,6 +114,11 @@ public class TGzPushEntryServiceImpl extends ServiceImpl<TGzPushEntryMapper, TGz ...@@ -114,6 +114,11 @@ public class TGzPushEntryServiceImpl extends ServiceImpl<TGzPushEntryMapper, TGz
*/ */
@Override @Override
public void addPushEntry(TGzPushEntry tGzPushEntry) { public void addPushEntry(TGzPushEntry tGzPushEntry) {
// 流程是0的,不推送
if(CommonConstants.ZERO_STRING.equals(tGzPushEntry.getBizId())){
return;
}
// 仅存指定状态的任务 // 仅存指定状态的任务
if (!ArrayUtils.contains(taskTypeArr, tGzPushEntry.getTaskType())) { if (!ArrayUtils.contains(taskTypeArr, tGzPushEntry.getTaskType())) {
return; return;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.config.GzConfig; import com.yifu.cloud.plus.v1.yifu.archives.config.GzConfig;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
...@@ -263,6 +264,14 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -263,6 +264,14 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
// 公共处理瓜子返回的信息 // 公共处理瓜子返回的信息
this.handlePushReturnCommon(pushInfo, returnMap); this.handlePushReturnCommon(pushInfo, returnMap);
// 改档案里的【档案推送状态】为 已推送
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getEmpPushStatus, CommonConstants.ZERO_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
} }
} }
...@@ -281,6 +290,14 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -281,6 +290,14 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
// 公共处理瓜子返回的信息 // 公共处理瓜子返回的信息
this.handlePushReturnCommon(pushInfo, returnMap); this.handlePushReturnCommon(pushInfo, returnMap);
// 改档案里的【合同信息推送状态】状态为 已推送
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractPushStatus, CommonConstants.ZERO_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
} }
} }
...@@ -354,6 +371,15 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -354,6 +371,15 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
// 公共处理瓜子返回的信息 // 公共处理瓜子返回的信息
this.handlePushReturnCommon(pushInfo, returnMap); this.handlePushReturnCommon(pushInfo, returnMap);
// 改档案里的【合同附件推送状态】为 已推送
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractAttaPushStatus, CommonConstants.ZERO_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
} catch (Exception e) { } catch (Exception e) {
log.error("瓜子附件推送失败!"); log.error("瓜子附件推送失败!");
pushInfo.setPushStatus(CommonConstants.ONE_STRING); pushInfo.setPushStatus(CommonConstants.ONE_STRING);
......
...@@ -1613,6 +1613,8 @@ ...@@ -1613,6 +1613,8 @@
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG ,a.BACK_FILE_FLAG
,a.IS_SINGLE
,a.IS_AUTO_LEAVE_DOC
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -1712,7 +1714,6 @@ ...@@ -1712,7 +1714,6 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -2148,9 +2149,6 @@ ...@@ -2148,9 +2149,6 @@
<include refid="where_getSocialRecordRoster_base"/> <include refid="where_getSocialRecordRoster_base"/>
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.backFileFlag != null and tDispatchInfo.backFileFlag.trim() != ''">
AND a.BACK_FILE_FLAG = #{tDispatchInfo.backFileFlag}
</if>
<if test="tDispatchInfo.ygsHandleStatus != null and tDispatchInfo.ygsHandleStatus.trim() != ''"> <if test="tDispatchInfo.ygsHandleStatus != null and tDispatchInfo.ygsHandleStatus.trim() != ''">
AND s.YGS_HANDLE_STATUS = #{tDispatchInfo.ygsHandleStatus} AND s.YGS_HANDLE_STATUS = #{tDispatchInfo.ygsHandleStatus}
</if> </if>
...@@ -2840,43 +2838,4 @@ ...@@ -2840,43 +2838,4 @@
#{item} #{item}
</foreach> </foreach>
</select> </select>
<!--tDispatchInfo 自动化办理查询导出反馈文件-->
<select id="getSocialSoldierAllListBackFile" resultMap="socialSoldierBackMap">
SELECT
a.id,
a.social_id,
a.EMP_NAME,
a.EMP_IDCARD
,s.ygs_Handle_Status
,s.ysd_Handle_Status
,a.SOCIAL_HOUSEHOLD_NAME
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<where>
a.DELETE_FLAG = '0'
AND a.social_id is not null
and a.AUTO_FLAG = '0'
and a.type = '0'
<!-- 税友反馈接口目前只支持社保附件下载,必须是办理成功的 -->
and s.ygs_Handle_Status = '6'
<if test="idsStr != null and idsStr.size > 0">
AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
#{items}
</foreach>
</if>
</where>
order by a.AUDIT_TIME desc
</select>
<update id="updateBackFileFlag">
update t_dispatch_info a set a.BACK_FILE_FLAG = '已下载'
WHERE 1=2
<if test="idsStr != null and idsStr.size > 0">
or a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
#{items}
</foreach>
</if>
</update>
</mapper> </mapper>
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