Commit 7a7bead6 authored by hongguangwu's avatar hongguangwu

1.7.19-税友相关

parent d9e10af4
...@@ -84,7 +84,7 @@ public class TSocialFriendController { ...@@ -84,7 +84,7 @@ public class TSocialFriendController {
@SysLog("1定时任务推送税友") @SysLog("1定时任务推送税友")
@Inner @Inner
public R<String> doPushFriendTest() { public R<String> doPushFriendTest() {
return tSocialFriendPushService.pushFriend(null, null, CommonConstants.ONE_INT); return tSocialFriendPushService.pushFriend(null, null, CommonConstants.ONE_INT, null);
} }
@Operation(description = "2定时任务获取税友") @Operation(description = "2定时任务获取税友")
...@@ -147,7 +147,7 @@ public class TSocialFriendController { ...@@ -147,7 +147,7 @@ public class TSocialFriendController {
if (type == CommonConstants.ONE_INT) { if (type == CommonConstants.ONE_INT) {
// isAuto 参数:是否自动,自动要查户配置。手动可推送养工失。 手动的都推送(大部分都是推送,芜湖要先推送医保办理成功后才推送社保) // isAuto 参数:是否自动,自动要查户配置。手动可推送养工失。 手动的都推送(大部分都是推送,芜湖要先推送医保办理成功后才推送社保)
//doJointFriendTask.pushFriendByAsync() //doJointFriendTask.pushFriendByAsync()
tSocialFriendPushService.pushFriend(null, dispatchIdList, CommonConstants.ZERO_INT); tSocialFriendPushService.pushFriend(null, dispatchIdList, CommonConstants.ZERO_INT, user.getId());
} else { } else {
//doJointFriendTask.getInfoByRequestIdByAsync() //doJointFriendTask.getInfoByRequestIdByAsync()
tSocialFriendService.getInfoByRequestId(); tSocialFriendService.getInfoByRequestId();
......
...@@ -39,7 +39,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> { ...@@ -39,7 +39,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> {
* @Author hgw * @Author hgw
* @Date 2024-5-10 21:16:41 * @Date 2024-5-10 21:16:41
**/ **/
List<SociaFriendYgsAddVo> getSocialSoldierYgsAddVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr, @Param("isAuto") Integer isAuto); List<SociaFriendYgsAddVo> getSocialSoldierYgsAddVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr
, @Param("isAuto") Integer isAuto, @Param("userId") String userId);
/** /**
* 社保士兵养工失减少模板 * 社保士兵养工失减少模板
...@@ -47,7 +48,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> { ...@@ -47,7 +48,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> {
* @Author hgw * @Author hgw
* @Date 2024-5-10 21:16:41 * @Date 2024-5-10 21:16:41
**/ **/
List<SociaFriendYgsAddVo> getSocialSoldierYgsReduceVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr, @Param("isAuto") Integer isAuto); List<SociaFriendYgsAddVo> getSocialSoldierYgsReduceVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr
, @Param("isAuto") Integer isAuto, @Param("userId") String userId);
/** /**
* 社保士兵医生大增加模板 * 社保士兵医生大增加模板
...@@ -55,7 +57,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> { ...@@ -55,7 +57,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> {
* @Author hgw * @Author hgw
* @Date 2024-5-10 21:16:41 * @Date 2024-5-10 21:16:41
**/ **/
List<SociaFriendYgsAddVo> getSocialSoldierYsdAddVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr, @Param("isAuto") Integer isAuto); List<SociaFriendYgsAddVo> getSocialSoldierYsdAddVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr
, @Param("isAuto") Integer isAuto, @Param("userId") String userId);
/** /**
* 社保士兵医生大减少模板 * 社保士兵医生大减少模板
...@@ -63,7 +66,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> { ...@@ -63,7 +66,8 @@ public interface TSocialFriendMapper extends BaseMapper<TSocialInfo> {
* @Author hgw * @Author hgw
* @Date 2024-5-10 21:16:41 * @Date 2024-5-10 21:16:41
**/ **/
List<SociaFriendYgsAddVo> getSocialSoldierYsdReduceVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr, @Param("isAuto") Integer isAuto); List<SociaFriendYgsAddVo> getSocialSoldierYsdReduceVoList(@Param("idsStr") List<String> idsStr, @Param("pushIdsStr") List<String> pushIdsStr
, @Param("isAuto") Integer isAuto, @Param("userId") String userId);
......
...@@ -41,7 +41,7 @@ public interface TSocialFriendPushService extends IService<TSocialInfo> { ...@@ -41,7 +41,7 @@ public interface TSocialFriendPushService extends IService<TSocialInfo> {
* @Date: 2024/5/10 17:52 * @Date: 2024/5/10 17:52
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
R<String> pushFriend(List<String> dispatchIdList, List<String> pushDispatchIdList, Integer isAuto); R<String> pushFriend(List<String> dispatchIdList, List<String> pushDispatchIdList, Integer isAuto, String userId);
R<String> doExportRoster(String socialId, String type, String unitCreditCode, List<SociaFriendYgsAddVo> listVo); R<String> doExportRoster(String socialId, String type, String unitCreditCode, List<SociaFriendYgsAddVo> listVo);
......
...@@ -115,7 +115,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -115,7 +115,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@Override @Override
public R<String> pushFriend(List<String> dispatchIdList, List<String> pushDispatchIdList, Integer isAuto) { public R<String> pushFriend(List<String> dispatchIdList, List<String> pushDispatchIdList, Integer isAuto, String userId) {
if (atomicPushFriend.incrementAndGet() <= 1) { if (atomicPushFriend.incrementAndGet() <= 1) {
try { try {
TSocialFreindSet set = tSocialFreindSetService.getById("1"); TSocialFreindSet set = tSocialFreindSetService.getById("1");
...@@ -158,24 +158,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -158,24 +158,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 社保增员、社保减员、医保增员、医保减员 // 社保增员、社保减员、医保增员、医保减员
// 养工失新增列表 // 养工失新增列表
List<SociaFriendYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList, pushDispatchIdList, isAuto); List<SociaFriendYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList, pushDispatchIdList, isAuto, userId);
if (ygsAddlist != null && !ygsAddlist.isEmpty()) { if (ygsAddlist != null && !ygsAddlist.isEmpty()) {
this.doPushSocialAndLogYgs(socialSetMap, ygsAddlist, 1, reduceYgsMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap); this.doPushSocialAndLogYgs(socialSetMap, ygsAddlist, 1, reduceYgsMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap);
} }
// 养工失减少列表 // 养工失减少列表
List<SociaFriendYgsAddVo> ygsReducelist = baseMapper.getSocialSoldierYgsReduceVoList(dispatchIdList, pushDispatchIdList, isAuto); List<SociaFriendYgsAddVo> ygsReducelist = baseMapper.getSocialSoldierYgsReduceVoList(dispatchIdList, pushDispatchIdList, isAuto, userId);
if (ygsReducelist != null && !ygsReducelist.isEmpty()) { if (ygsReducelist != null && !ygsReducelist.isEmpty()) {
this.doPushSocialAndLogYgs(socialSetMap, ygsReducelist, 2, reduceYgsMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap); this.doPushSocialAndLogYgs(socialSetMap, ygsReducelist, 2, reduceYgsMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap);
} }
// 医生大新增列表 // 医生大新增列表
List<SociaFriendYgsAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList,pushDispatchIdList, isAuto); List<SociaFriendYgsAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList,pushDispatchIdList, isAuto, userId);
if (ysdAddlist != null && !ysdAddlist.isEmpty()) { if (ysdAddlist != null && !ysdAddlist.isEmpty()) {
this.doPushSocialAndLogYsd(socialSetMap, ysdAddlist, 3, reduceYsdMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap); this.doPushSocialAndLogYsd(socialSetMap, ysdAddlist, 3, reduceYsdMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap);
} }
// 医生大减少列表 // 医生大减少列表
List<SociaFriendYgsAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList, pushDispatchIdList, isAuto); List<SociaFriendYgsAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList, pushDispatchIdList, isAuto, userId);
if (ysdReducelist != null && !ysdReducelist.isEmpty()) { if (ysdReducelist != null && !ysdReducelist.isEmpty()) {
this.doPushSocialAndLogYsd(socialSetMap, ysdReducelist, 4, reduceYsdMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap); this.doPushSocialAndLogYsd(socialSetMap, ysdReducelist, 4, reduceYsdMap, zhangMap, templateUrl, templateSrcMap, reduceChiZhouMap);
} }
......
...@@ -270,7 +270,7 @@ public class DoSocialTask { ...@@ -270,7 +270,7 @@ public class DoSocialTask {
**/ **/
@Async @Async
public void pushFriend(List<String> dispatchIdList) { public void pushFriend(List<String> dispatchIdList) {
tSocialFriendPushService.pushFriend(dispatchIdList, null, CommonConstants.ONE_INT); tSocialFriendPushService.pushFriend(dispatchIdList, null, CommonConstants.ONE_INT, null);
} }
@Async @Async
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
and (shh.IS_YSD_OK_PUSH_YGS = '0' or s.YSD_HANDLE_STATUS = '6') and (shh.IS_YSD_OK_PUSH_YGS = '0' or s.YSD_HANDLE_STATUS = '6')
</if> </if>
<if test="isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) "> <if test="userId != null and isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) ">
/* 以社保办理权限推送税友,查数量 */ /* 以社保办理权限推送税友,查数量 */
and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' ) and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' )
</if> </if>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
and (shh.IS_YSD_OK_PUSH_YGS = '0' or s.YSD_HANDLE_STATUS = '6') and (shh.IS_YSD_OK_PUSH_YGS = '0' or s.YSD_HANDLE_STATUS = '6')
</if> </if>
<if test="isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) "> <if test="userId != null and isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) ">
/* 以社保办理权限推送税友,查数量 */ /* 以社保办理权限推送税友,查数量 */
and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' ) and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' )
</if> </if>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
/*派单推的,有ID,则查单个推送的,立即推*/ /*派单推的,有ID,则查单个推送的,立即推*/
and a.IS_SINGLE_YSD = '1' and a.IS_SINGLE_YSD = '1'
</if> </if>
<if test="isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) "> <if test="userId != null and isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) ">
/* 以社保办理权限推送税友,查数量 */ /* 以社保办理权限推送税友,查数量 */
and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' ) and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' )
</if> </if>
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
and a.IS_SINGLE_YSD = '1' and a.IS_SINGLE_YSD = '1'
</if> </if>
<if test="isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) "> <if test="userId != null and isAuto != null and isAuto == 0 and (pushIdsStr == null or pushIdsStr.size == 0) ">
/* 以社保办理权限推送税友,查数量 */ /* 以社保办理权限推送税友,查数量 */
and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' ) and a.SOCIAL_HOUSEHOLD_NAME in (select SOCIAL_HOUSEHOLD from t_socialfund_house_res where user_id=#{userId} AND STATUS = '0' AND AUTH_TYPE = '1' and HOUSE_NAME_TYPE='0' )
</if> </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