MVP1.6.6-社保士兵实缴——加个拦截

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TAutoPaymentDetailMapper.java

@@ -53,4 +53,6 @@ public interface TAutoPaymentDetailMapper extends BaseMapper<TAutoPaymentDetail>
 
 	List<TAutoPaymentDetail> getListByParentId(@Param("parentId") String parentId);
 
+	int getCountByParentId(@Param("parentId") String parentId);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAutoPaymentDetailService.java

@@ -68,4 +68,13 @@ public interface TAutoPaymentDetailService extends IService<TAutoPaymentDetail>
 	 **/
 	List<TAutoPaymentDetail> getListByParentId(String parentId);
 
+	/**
+	 * @param parentId
+	 * @Description: 获取被打标的条数，用作拦截重新办理
+	 * @Author: hgw
+	 * @Date: 2024/6/21 11:21
+	 * @return: int
+	 **/
+	int getCountByParentId(String parentId);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAutoPaymentDetailServiceImpl.java

@@ -186,6 +186,10 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 	public List<TAutoPaymentDetail> getListByParentId(String parentId) {
 		return baseMapper.getListByParentId(parentId);
 	}
+	@Override
+	public int getCountByParentId(String parentId) {
+		return baseMapper.getCountByParentId(parentId);
+	}
 
 	private Long noPageCountDiy(TAutoPaymentDetailSearchVo searchVo) {
 		LambdaQueryWrapper<TAutoPaymentDetail> wrapper = buildQueryWrapper(searchVo);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java

@@ -61,6 +61,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 	private final TSocialSoldierShenBaoTaskService tSocialSoldierShenBaoTaskService;
 	private final TAutoPaymentInfoService tAutoPaymentInfoService;
 	private final TAutoPaymentErrorService tAutoPaymentErrorService;
+	private final TAutoPaymentDetailService tAutoPaymentDetailService;
 
 	/**
 	 * @param socialList
@@ -430,6 +431,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 		// 先删除推送任务
 		int type = 3;
 		if (isReHandle) {
+			int count = tAutoPaymentDetailService.getCountByParentId(parentId);
+			if (count == 0) {
+				return R.failed("请先标记！");
+			}
 			type = 7;
 			List<TSocialSoldierShenBaoTask> taskList = tSocialSoldierShenBaoTaskService.getTSocialSoldierTaskListByRe();
 			boolean canReTask = false;
@@ -451,6 +456,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 					}
 				}
 			} else {
+				if (Common.isNotNull(parentId)) {
+					tAutoPaymentErrorService.deleteByParentId(parentId);
+				}
 				tSocialSoldierShenBaoTaskService.deleteByRePayment();
 			}
 		} else {

yifu-social/yifu-social-biz/src/main/resources/mapper/TAutoPaymentDetailMapper.xml

@@ -163,4 +163,12 @@
 		order by a.SOURCE_TYPE,a.CERT_NUM
 	</select>
 
+	<!--tAutoPaymentDetail简单分页查询-->
+	<select id="getCountByParentId" resultType="java.lang.Integer">
+		SELECT
+			count(1)
+		FROM t_auto_payment_detail a
+		where PARENT_ID = #{parentId} and REPEAT_HANDLE_FLAG = '0'
+	</select>
+
 </mapper>