MVP1.6.5-社保士兵实缴:最终

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

@@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -148,10 +149,10 @@ public class TSocialSoldierController {
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
 	@Operation(description = "6每月6号1点推送实缴3张表查询")
-	@PostMapping("/inner/pushPaymentThree")
+	@PostMapping("/inner/doPushPaymentThree")
 	@SysLog("6每月6号推送实缴3张表查询")
 	@Inner
-	public R<String> pushPaymentThree() {
+	public R<String> doPushPaymentThree() {
 		return tSocialSoldierPushService.pushPaymentThree(null,false);
 	}
 
@@ -191,19 +192,20 @@ public class TSocialSoldierController {
 	@Operation(description = "获取重新办理结果")
 	@GetMapping("/getReHandle")
 	public R<String> getReHandle(@RequestParam String parentId) {
-		return tSocialSoldierService.getReHandle(parentId);
+		tSocialSoldierService.getReHandle(parentId);
+		return R.ok("正在执行中，请耐心等待！");
 	}
 
 	/**
-	 * @Description: 文件组装zip的Demo
+	 * @Description: 文件组装zip的Demo（测试附件使用，不删除）
 	 * @Author: hgw
 	 * @Date: 2024-6-11 14:27:50
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
-	/*@Operation(description = "文件组装zip的Demo")
-	@GetMapping("/getZip")
-	public R<String> getZip() {
-		return tSocialSoldierService.getZip();
-	}*/
+	@Operation(description = "文件组装zip的Demo")
+	@PostMapping("/getZip")
+	public R<String> getZip(@RequestBody MultipartFile zipFile) {
+		return tSocialSoldierService.getZip(zipFile);
+	}
 
 }

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

@@ -49,7 +49,7 @@ public interface TAutoPaymentDetailMapper extends BaseMapper<TAutoPaymentDetail>
 	 * @Date: 2024/6/6 9:55
 	 * @return: void
 	 **/
-	void deleteByParentId(@Param("parentId") String parentId);
+	void deleteByParentId(@Param("parentId") String parentId, @Param("sourceType") int sourceType);
 
 	List<TAutoPaymentDetail> getListByParentId(@Param("parentId") String parentId);
 

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

@@ -51,12 +51,13 @@ public interface TAutoPaymentDetailService extends IService<TAutoPaymentDetail>
 	List<TAutoPaymentDetail> noPageDiy(TAutoPaymentDetailSearchVo searchVo);
 
 	/**
+	 * @param: sourceType 资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询；4单位缴费明细下载
 	 * @Description: 清空明细表
 	 * @Author: hgw
 	 * @Date: 2024/6/6 9:54
 	 * @return: void
 	 **/
-	void deleteByParentId(String parentId);
+	void deleteByParentId(String parentId, int sourceType);
 
 	/**
 	 * @param parentId

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

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 社保士兵
@@ -62,4 +63,7 @@ public interface TSocialSoldierService extends IService<TSocialInfo> {
 	 **/
 	R<String> getReHandle(String parentId);
 
+	R<String> getZip(MultipartFile zipFile);
+
+
 }

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

@@ -178,8 +178,8 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 	}
 
 	@Override
-	public void deleteByParentId(String parentId) {
-		baseMapper.deleteByParentId(parentId);
+	public void deleteByParentId(String parentId, int sourceType) {
+		baseMapper.deleteByParentId(parentId, sourceType);
 	}
 	@Override
 	public List<TAutoPaymentDetail> getListByParentId(String parentId) {

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

@@ -114,7 +114,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			if (type == 2) {
 				List<SocialSoldierSetVo> setList = new ArrayList<>();
 				SocialSoldierSetVo vo = new SocialSoldierSetVo();
-				vo.setIsAutoSubmit("否");
+				vo.setIsAutoSubmit("是");
 				vo.setIsAutoInsert("否");
 				vo.setIsAutoUpload("否");
 				vo.setIsDoShenBao("否");

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

@@ -150,7 +150,7 @@
     </select>
 
 	<delete id="deleteByParentId">
-		delete from t_auto_payment_detail where PARENT_ID = #{parentId}
+		delete from t_auto_payment_detail where PARENT_ID = #{parentId} and SOURCE_TYPE = #{sourceType}
 	</delete>