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

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAutoPaymentDetail.java

@@ -161,12 +161,12 @@ public class TAutoPaymentDetail extends BaseEntity {
 	@Schema(description = "社保户")
 	private String socialSecurityAccount;
 	/**
-	 * 资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询
+	 * 资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询；4单位缴费明细下载
 	 */
 	@ExcelAttribute(name = "资源类型", maxLength = 100)
 	@Length(max = 100, message = "资源类型不能超过100个字符")
 	@ExcelProperty("资源类型")
-	@Schema(description = "资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询")
+	@Schema(description = "资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询；4单位缴费明细下载")
 	private String sourceType;
 
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialSoldierShenBaoTask.java

@@ -61,11 +61,11 @@ public class TSocialSoldierShenBaoTask extends BaseEntity {
 	/**
 	 * 1申报；2调整
 	 */
-	@ExcelAttribute(name = "1申报；2调整", isNotEmpty = true, errorInfo = "1申报；2调整", maxLength = 1)
+	@ExcelAttribute(name = "1申报；2调整", isNotEmpty = true, errorInfo = "1申报；2调整", maxLength = 2)
 	@NotBlank(message = "1申报；2调整不能为空")
-	@Length(max = 1, message = "1申报；2调整不能超过1个字符")
+	@Length(max = 2, message = "1申报；2调整不能超过1个字符")
 	@ExcelProperty("1申报；2调整")
-	@Schema(description = "1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询")
+	@Schema(description = "1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询；6：实缴3单位缴费明细下载")
 	private String type;
 	/**
 	 * 拉取状态：0未拉取；1已拉取

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierPaymentSelectTwoVo.java

@@ -14,12 +14,23 @@ import java.io.Serializable;
 public class SocialSoldierPaymentSelectTwoVo implements Serializable {
 
 	// 企业名称	参险类型	业务年月	回传信息	回传信息1	回传信息2
+	// 2024-6-7 11:29:15 变模版：
+	// 企业名称	证件号码	姓名	险种类型	人员状态	开始日期	结束日期	回传信息	回传信息1	回传信息2
 	@ExcelProperty("企业名称")
 	private String companyName;
-	@ExcelProperty("参险类型")
+	@ExcelProperty("证件号码")
+	private String idCard;
+	@ExcelProperty("姓名")
+	private String empName;
+	@ExcelProperty("险种类型")
 	private String paymentType;
-	@ExcelProperty("业务年月")
-	private String payMonth;
+	@ExcelProperty("人员状态")
+	private String userStatus;
+	@ExcelProperty("开始日期")
+	private String startDate;
+	@ExcelProperty("结束日期")
+	private String endDate;
+
 	@ExcelProperty("回传信息")
 	private String returnInfo;
 	@ExcelProperty("回传信息1")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialSoldierController.java

@@ -152,7 +152,7 @@ public class TSocialSoldierController {
 	@SysLog("6每月6号推送实缴3张表查询")
 	@Inner
 	public R<String> pushPaymentThree() {
-		return tSocialSoldierPushService.pushPaymentThree();
+		return tSocialSoldierPushService.pushPaymentThree(null,false);
 	}
 
 	/**
@@ -169,4 +169,29 @@ public class TSocialSoldierController {
 		return tSocialSoldierService.doInnerGetPaymentThree();
 	}
 
+	/**
+	 * @Description: 推送重新办理任务
+	 * @Author: hgw
+	 * @Date: 2024/5/11 19:25
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(description = "推送重新办理任务")
+	@GetMapping("/pushReHandle")
+	public R<String> pushReHandle(@RequestParam String parentId) {
+		return tSocialSoldierPushService.pushPaymentThree(parentId, true);
+	}
+
+	/**
+	 * @param parentId 主表id
+	 * @Description: 获取重新办理结果
+	 * @Author: hgw
+	 * @Date: 2024/5/11 19:25
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(description = "获取重新办理结果")
+	@GetMapping("/getReHandle")
+	public R<String> getReHandle(@RequestParam String parentId) {
+		return tSocialSoldierService.getReHandle(parentId);
+	}
+
 }

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

@@ -24,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 自动化实缴记录表
  *
@@ -49,4 +51,6 @@ public interface TAutoPaymentDetailMapper extends BaseMapper<TAutoPaymentDetail>
 	 **/
 	void deleteByParentId(@Param("parentId") String parentId);
 
+	List<TAutoPaymentDetail> getListByParentId(@Param("parentId") String parentId);
+
 }

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

@@ -39,4 +39,7 @@ public interface TAutoPaymentErrorMapper extends BaseMapper<TAutoPaymentError> {
 	 * @return
 	 */
 	IPage<TAutoPaymentError> getTAutoPaymentErrorPage(Page<TAutoPaymentError> page, @Param("tAutoPaymentError") TAutoPaymentError tAutoPaymentError);
+
+	void deleteByParentId(@Param("parentId") String parentId);
+
 }

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

@@ -48,4 +48,6 @@ public interface TAutoPaymentInfoMapper extends BaseMapper<TAutoPaymentInfo> {
 	 **/
 	TAutoPaymentInfo getThisMonthMainAuto();
 
+	void setUrlToNullByRePayment(@Param("parentId") String parentId);
+
 }

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

@@ -117,7 +117,9 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
 	List<SocialSoldierPaymentSelectThreeVo> getSoldierPaymentSelectThreeList();
 
 	void getSoldierPaymentErrorInfoOne(@Param("parentId") String parentId);
-
 	void getSoldierPaymentErrorInfoTwo(@Param("parentId") String parentId);
 
+	void getSoldierPaymentErrorInfoOneByRe(@Param("parentId") String parentId);
+	void getSoldierPaymentErrorInfoTwoByRe(@Param("parentId") String parentId);
+
 }

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

@@ -39,5 +39,8 @@ public interface TSocialSoldierShenBaoTaskMapper extends BaseMapper<TSocialSoldi
 	 * @return
 	 */
 	List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(@Param("tSocialSoldierShenBaoTask") TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask);
-	String getSoldierTaskAddIdByType(@Param("type") String type);
+	List<TSocialSoldierShenBaoTask> getTSocialSoldierTaskListByRe();
+	TSocialSoldierShenBaoTask getSoldierTaskAddIdByType(@Param("type") String type);
+	void deleteByPayment();
+	void deleteByRePayment();
 }

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

@@ -57,4 +57,14 @@ public interface TAutoPaymentDetailService extends IService<TAutoPaymentDetail>
 	 * @return: void
 	 **/
 	void deleteByParentId(String parentId);
+
+	/**
+	 * @param parentId
+	 * @Description: 获取被标记的明细，用来更新
+	 * @Author: hgw
+	 * @Date: 2024/6/7 17:50
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentDetail>
+	 **/
+	List<TAutoPaymentDetail> getListByParentId(String parentId);
+
 }

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

@@ -44,4 +44,7 @@ public interface TAutoPaymentErrorService extends IService<TAutoPaymentError> {
 	void listExport(HttpServletResponse response, TAutoPaymentErrorSearchVo searchVo);
 
 	List<TAutoPaymentError> noPageDiy(TAutoPaymentErrorSearchVo searchVo);
+
+	void deleteByParentId(String parentId);
+
 }

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

@@ -58,4 +58,13 @@ public interface TAutoPaymentInfoService extends IService<TAutoPaymentInfo> {
 	 **/
 	TAutoPaymentInfo getThisMonthMainAuto();
 
+	/**
+	 * @param parentId
+	 * @Description: 复核发起时，清空url
+	 * @Author: hgw
+	 * @Date: 2024/6/7 17:30
+	 * @return: void
+	 **/
+	void setUrlToNullByRePayment(String parentId);
+
 }

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

@@ -71,6 +71,6 @@ public interface TSocialSoldierPushService extends IService<TSocialInfo> {
 	 * @Date: 2024-5-31 16:04:54
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
-	R<String> pushPaymentThree();
+	R<String> pushPaymentThree(String parentId, boolean isReHandle);
 
 }

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

@@ -54,4 +54,12 @@ public interface TSocialSoldierService extends IService<TSocialInfo> {
 	 **/
 	R<String> doInnerGetPaymentThree();
 
+	/**
+	 * @Description: 重新办理
+	 * @Author: hgw
+	 * @Date: 2024/6/6 21:36
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> getReHandle(String parentId);
+
 }

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

@@ -36,6 +36,14 @@ public interface TSocialSoldierShenBaoTaskService extends IService<TSocialSoldie
 	 * @return
 	 */
 	List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask);
+	/**
+	 * @param
+	 * @Description: 获取复核记录为未复核的情况
+	 * @Author: hgw
+	 * @Date: 2024/6/7 11:56
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierShenBaoTask>
+	 **/
+	List<TSocialSoldierShenBaoTask> getTSocialSoldierTaskListByRe();
 
 	/**
 	 * @param type
@@ -44,6 +52,22 @@ public interface TSocialSoldierShenBaoTaskService extends IService<TSocialSoldie
 	 * @Date: 2024/5/31 18:13
 	 * @return: java.lang.String
 	 **/
-	String getSoldierTaskAddIdByType(String type);
+	TSocialSoldierShenBaoTask getSoldierTaskAddIdByType(String type);
+
+	/**
+	 * @Description: 删除实缴推送
+	 * @Author: hgw
+	 * @Date: 2024/6/6 21:49
+	 * @return: void
+	 **/
+	void deleteByPayment();
+
+	/**
+	 * @Description: 删除实缴再次推送
+	 * @Author: hgw
+	 * @Date: 2024/6/6 21:50
+	 * @return: void
+	 **/
+	void deleteByRePayment();
 
 }

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

@@ -181,6 +181,10 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 	public void deleteByParentId(String parentId) {
 		baseMapper.deleteByParentId(parentId);
 	}
+	@Override
+	public List<TAutoPaymentDetail> getListByParentId(String parentId) {
+		return baseMapper.getListByParentId(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/TAutoPaymentErrorServiceImpl.java

@@ -127,6 +127,11 @@ public class TAutoPaymentErrorServiceImpl extends ServiceImpl<TAutoPaymentErrorM
 		}
 	}
 
+	@Override
+	public void deleteByParentId(String parentId) {
+		baseMapper.deleteByParentId(parentId);
+	}
+
 	@Override
 	public List<TAutoPaymentError> noPageDiy(TAutoPaymentErrorSearchVo searchVo) {
 		LambdaQueryWrapper<TAutoPaymentError> wrapper = buildQueryWrapper(searchVo);

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

@@ -168,6 +168,11 @@ public class TAutoPaymentInfoServiceImpl extends ServiceImpl<TAutoPaymentInfoMap
 		return baseMapper.getThisMonthMainAuto();
 	}
 
+	@Override
+	public void setUrlToNullByRePayment(String parentId) {
+		baseMapper.setUrlToNullByRePayment(parentId);
+	}
+
 	private Long noPageCountDiy(TAutoPaymentInfoSearchVo searchVo) {
 		LambdaQueryWrapper<TAutoPaymentInfo> wrapper = buildQueryWrapper(searchVo);
 		List<String> idList = Common.getList(searchVo.getIds());

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

@@ -28,9 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierShenBaoTask;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
-import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierShenBaoTaskService;
-import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService;
-import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierPushService;
+import com.yifu.cloud.plus.v1.yifu.social.service.*;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -61,6 +59,8 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 	private final SocialConfig socialConfig;
 	private final TSocialInfoService tSocialInfoService;
 	private final TSocialSoldierShenBaoTaskService tSocialSoldierShenBaoTaskService;
+	private final TAutoPaymentInfoService tAutoPaymentInfoService;
+	private final TAutoPaymentErrorService tAutoPaymentErrorService;
 
 	/**
 	 * @param socialList
@@ -395,6 +395,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				task.setType(CommonConstants.ONE_STRING);
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}
@@ -407,6 +408,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				task.setType(CommonConstants.TWO_STRING);
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}
@@ -416,14 +418,43 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 		return R.ok("推送成功！！");
 	}
 	/**
+	 * @param : isReHandle true:是重新办理
 	 * @Description: 6每月6号推送实缴3张表查询
 	 * @Author: hgw
 	 * @Date: 2024-5-31 16:04:47
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
 	@Override
-	public R<String> pushPaymentThree() {
+	public R<String> pushPaymentThree(String parentId, boolean isReHandle) {
 
+		// 先删除推送任务
+		int type = 3;
+		if (isReHandle) {
+			type = 7;
+			List<TSocialSoldierShenBaoTask> taskList = tSocialSoldierShenBaoTaskService.getTSocialSoldierTaskListByRe();
+			boolean canReTask = false;
+			if (taskList != null) {
+				for (TSocialSoldierShenBaoTask task : taskList) {
+					// 表示已经有过反馈了
+					if (CommonConstants.ONE_STRING.equals(task.getDataStatus())) {
+						canReTask = true;
+					}
+				}
+				if (!canReTask) {
+					return R.failed("上一次推送的还未获取结果，请先获取复核结果！");
+				} else {
+					// 清空原表url
+					if (Common.isNotNull(parentId)) {
+						tAutoPaymentErrorService.deleteByParentId(parentId);
+						tAutoPaymentInfoService.setUrlToNullByRePayment(parentId);
+					}
+				}
+			} else {
+				tSocialSoldierShenBaoTaskService.deleteByRePayment();
+			}
+		} else {
+			tSocialSoldierShenBaoTaskService.deleteByPayment();
+		}
 		// 实缴3张表之1：日常申报
 		List<SocialSoldierPaymentSelectOneVo> shenBaolist = baseMapper.getSoldierPaymentSelectOneList();
 		log.info("实缴3张表之1：日常申报list="+shenBaolist);
@@ -433,7 +464,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
-				task.setType(CommonConstants.THREE_STRING);
+				task.setType(String.valueOf(type));
+				type++;
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}
@@ -446,7 +479,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
-				task.setType(CommonConstants.FOUR_STRING);
+				task.setType(String.valueOf(type));
+				type++;
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}
@@ -459,7 +494,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
-				task.setType(CommonConstants.FIVE_STRING);
+				task.setType(String.valueOf(type));
+				type++;
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}
@@ -472,7 +509,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (Common.isNotNull(file)) {
 				TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
 				// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询；6：实缴3单位缴费明细下载
-				task.setType(CommonConstants.SIX_STRING);
+				task.setType(String.valueOf(type));
+				type++;
+				task.setDataStatus(CommonConstants.ZERO_STRING);
 				this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
 			}
 		}

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

@@ -44,13 +44,27 @@ public class TSocialSoldierShenBaoTaskServiceImpl extends ServiceImpl<TSocialSol
 	public List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask) {
 		return baseMapper.getTSocialSoldierShenBaoTaskList(tSocialSoldierShenBaoTask);
 	}
+
+	@Override
+	public List<TSocialSoldierShenBaoTask> getTSocialSoldierTaskListByRe() {
+		return baseMapper.getTSocialSoldierTaskListByRe();
+	}
 	/**
 	 * 获取任务id
 	 * @return
 	 */
 	@Override
-	public String getSoldierTaskAddIdByType(String type) {
+	public TSocialSoldierShenBaoTask getSoldierTaskAddIdByType(String type) {
 		return baseMapper.getSoldierTaskAddIdByType(type);
 	}
 
+	@Override
+	public void deleteByPayment() {
+		baseMapper.deleteByPayment();
+	}
+	@Override
+	public void deleteByRePayment() {
+		baseMapper.deleteByRePayment();
+	}
+
 }

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

@@ -45,6 +45,7 @@
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="updateTime" column="UPDATE_TIME"/>
     <result property="parentId" column="PARENT_ID"/>
+    <result property="sourceType" column="SOURCE_TYPE"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -67,6 +68,7 @@
                 a.CREATE_TIME,
                 a.UPDATE_BY,
                 a.UPDATE_TIME,
+                a.SOURCE_TYPE,
                 a.PARENT_ID
     </sql>
     <sql id="tAutoPaymentDetail_where">
@@ -151,4 +153,14 @@
 		delete from t_auto_payment_detail where PARENT_ID = #{parentId}
 	</delete>
 
+
+	<!--tAutoPaymentDetail简单分页查询-->
+	<select id="getListByParentId" resultMap="tAutoPaymentDetailMap">
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM t_auto_payment_detail a
+		where PARENT_ID = #{parentId} and REPEAT_HANDLE_FLAG = '0'
+		order by a.SOURCE_TYPE,a.CERT_NUM
+	</select>
+
 </mapper>

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

@@ -75,4 +75,9 @@
             <include refid="tAutoPaymentError_where"/>
         </where>
     </select>
+
+	<delete id="deleteByParentId">
+		delete from t_auto_payment_error where PARENT_ID = #{parentId}
+	</delete>
+
 </mapper>

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

@@ -138,4 +138,10 @@
         FROM t_auto_payment_info a
         where a.CREATE_MONTH = DATE_FORMAT(now(),'%Y%m')
     </select>
+
+    <!-- 重新办理，清空url -->
+    <update id="setUrlToNullByRePayment" >
+		update t_auto_payment_info a set a.ATTA_URL_ONE = null,a.ATTA_URL_TWO = null,a.ATTA_URL_THREE = null,a.ATTA_URL_FOUR = null where id = #{parentId}
+    </update>
+
 </mapper>

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

@@ -27,6 +27,7 @@
 		<id property="id" column="ID"/>
 		<result property="addId" column="ADD_ID"/>
 		<result property="type" column="TYPE"/>
+		<result property="dataStatus" column="DATA_STATUS"/>
 		<result property="createBy" column="CREATE_BY"/>
 		<result property="updateBy" column="UPDATE_BY"/>
 		<result property="createName" column="CREATE_NAME"/>
@@ -37,6 +38,7 @@
 		a.ID,
 		a.ADD_ID,
 		a.TYPE,
+		a.DATA_STATUS,
 		a.CREATE_BY,
 		a.UPDATE_BY,
 		a.CREATE_NAME,
@@ -54,6 +56,9 @@
 			<if test="tSocialSoldierShenBaoTask.type != null and tSocialSoldierShenBaoTask.type.trim() != ''">
 				AND a.TYPE = #{tSocialSoldierShenBaoTask.type}
 			</if>
+			<if test="tSocialSoldierShenBaoTask.dataStatus != null and tSocialSoldierShenBaoTask.dataStatus.trim() != ''">
+				AND a.DATA_STATUS = #{tSocialSoldierShenBaoTask.dataStatus}
+			</if>
 			<if test="tSocialSoldierShenBaoTask.createBy != null and tSocialSoldierShenBaoTask.createBy.trim() != ''">
 				AND a.CREATE_BY = #{tSocialSoldierShenBaoTask.createBy}
 			</if>
@@ -82,11 +87,28 @@
 		</where>
 	</select>
 	<!--获取任务id-->
-	<select id="getSoldierTaskAddIdByType" resultType="java.lang.String">
+	<select id="getSoldierTaskAddIdByType" resultMap="tSocialSoldierShenBaoTaskMap">
 		SELECT
-			a.ADD_ID
+			<include refid="Base_Column_List"/>
 		FROM t_social_soldier_shen_bao_task a
 		where a.TYPE = #{type} and a.DATA_STATUS = '0'
 		ORDER BY a.CREATE_TIME desc limit 1
 	</select>
+
+
+	<!--list-->
+	<select id="getTSocialSoldierTaskListByRe" resultMap="tSocialSoldierShenBaoTaskMap">
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM t_social_soldier_shen_bao_task a
+		where TYPE in ('7','8','9','10')
+	</select>
+
+	<delete id="deleteByPayment">
+		delete FROM t_social_soldier_shen_bao_task where TYPE in ('3','4','5','6')
+	</delete>
+
+	<delete id="deleteByRePayment">
+		delete FROM t_social_soldier_shen_bao_task where TYPE in ('7','8','9','10')
+	</delete>
 </mapper>