Skip to content

Y
yifu-mvp
Commit d48c5333 authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.6.5-社保士兵实缴

parent 07a89c5f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1462 additions and 127 deletions
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/SocialTask.java
View file @ d48c5333
......@@ -230,4 +230,28 @@ public class SocialTask {
log.info("------------5每月5号推送工资申报、调整（实缴使用）-定时任务结束------------");
}
/**
* @Description: 6每月6号0点推送实缴3张表查询
* @Author: hgw
* @Date: 2024-6-6 10:54:39
* @return: void
**/
public void doPushPaymentThree() {
log.info("------------6每月6号1点推送实缴3张表查询-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialsoldier/inner/doPushPaymentThree","", Object.class, SecurityConstants.FROM_IN);
log.info("------------6每月6号1点推送实缴3张表查询-定时任务结束------------");
}
/**
* @Description: 7每月6号3点定时任务获取社保士兵实缴3张表
* @Author: hgw
* @Date: 2024-6-6 10:54:43
* @return: void
**/
public void doInnerGetPaymentThree() {
log.info("------------7每月6号3点定时任务获取社保士兵实缴3张表-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialsoldier/inner/doInnerGetPaymentThree","", Object.class, SecurityConstants.FROM_IN);
log.info("------------7每月6号3点定时任务获取社保士兵实缴3张表-定时任务结束------------");
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAutoPaymentDetail.java
View file @ d48c5333
......@@ -160,6 +160,14 @@ public class TAutoPaymentDetail extends BaseEntity {
@ExcelProperty("社保户")
@Schema(description = "社保户")
private String socialSecurityAccount;
/**
* 资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询
*/
@ExcelAttribute(name = "资源类型", maxLength = 100)
@Length(max = 100, message = "资源类型不能超过100个字符")
@ExcelProperty("资源类型")
@Schema(description = "资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询")
private String sourceType;
/**
* 主表ID
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAutoPaymentInfo.java
View file @ d48c5333
......@@ -18,14 +18,15 @@
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
......@@ -50,28 +51,125 @@ public class TAutoPaymentInfo extends BaseEntity {
@Schema(description = "id")
private String id;
/**
* 数据整合：1 整合中 2已整合
* 生成月
*/
@ExcelAttribute(name = "生成月", maxLength = 6)
@Length(max = 1, message = "生成月不能超过6个字符")
@ExcelProperty("生成月")
@Schema(description = "生成月")
private String createMonth;
/**
* 数据整合之日常申报：0未整合1整合中2已整合3整合失败
*/
@ExcelAttribute(name = "数据整合之日常申报", maxLength = 1)
@Length(max = 1, message = "数据整合之日常申报不能超过1个字符")
@ExcelProperty("数据整合之日常申报")
@Schema(description = "数据整合之日常申报：0未整合1整合中2已整合3整合失败")
private String dataOneFlag;
/**
* 数据整合之人员缴费明细：0未整合1整合中2已整合3整合失败
*/
@ExcelAttribute(name = "数据整合之人员缴费明细", maxLength = 1)
@Length(max = 1, message = "数据整合之人员缴费明细不能超过1个字符")
@ExcelProperty("数据整合之人员缴费明细")
@Schema(description = "数据整合之人员缴费明细：0未整合1整合中2已整合3整合失败")
private String dataTwoFlag;
/**
* 数据整合之单位缴费明细：0未整合1整合中2已整合3整合失败
*/
@ExcelAttribute(name = "数据整合之单位缴费明细", maxLength = 1)
@Length(max = 1, message = "数据整合之单位缴费明细不能超过1个字符")
@ExcelProperty("数据整合之单位缴费明细")
@Schema(description = "数据整合之单位缴费明细：0未整合1整合中2已整合3整合失败")
private String dataThreeFlag;
/**
* 数据整合之日常申报的备注
*/
@ExcelAttribute(name = "数据整合之日常申报的备注", maxLength = 100)
@Length(max = 100, message = "数据整合之日常申报的备注不能超过100个字符")
@ExcelProperty("数据整合之日常申报的备注")
@Schema(description = "数据整合之日常申报的备注")
private String dataOneRemark;
/**
* 数据整合之人员缴费明细的备注
*/
@ExcelAttribute(name = "数据整合之人员缴费明细的备注", maxLength = 100)
@Length(max = 100, message = "数据整合之人员缴费明细的备注不能超过100个字符")
@ExcelProperty("数据整合之人员缴费明细的备注")
@Schema(description = "数据整合之人员缴费明细的备注")
private String dataTwoRemark;
/**
* 数据整合之单位缴费明细的备注
*/
@ExcelAttribute(name = "数据整合：1 整合中 2已整合", maxLength = 1)
@Length(max = 1, message = "数据整合：1 整合中 2已整合不能超过1个字符")
@ExcelProperty("数据整合：1 整合中 2已整合")
@Schema(description = "数据整合：1 整合中 2已整合")
private String dataIntegrationFlag;
@ExcelAttribute(name = "数据整合之单位缴费明细的备注", maxLength = 100)
@Length(max = 100, message = "数据整合之单位缴费明细的备注不能超过100个字符")
@ExcelProperty("数据整合之单位缴费明细的备注")
@Schema(description = "数据整合之单位缴费明细的备注")
private String dataThreeRemark;
/**
* 系统复核：0复核中1复核成功2复核失败
* 系统复核：0未复核1复核中2复核成功3复核失败
*/
@ExcelAttribute(name = "系统复核：0复核中1复核成功2复核失败", maxLength = 1)
@Length(max = 1, message = "系统复核：0复核中1复核成功2复核失败不能超过1个字符")
@ExcelProperty("系统复核：0复核中1复核成功2复核失败")
@Schema(description = "系统复核：0复核中1复核成功2复核失败")
@ExcelAttribute(name = "系统复核", maxLength = 1)
@Length(max = 1, message = "系统复核不能超过1个字符")
@ExcelProperty("系统复核：0未复核1复核中2复核成功3复核失败")
@Schema(description = "系统复核：0未复核1复核中2复核成功3复核失败")
private String systemReviewFlag;
/**
* 重新复核状态 0 复核中 1复核成功 2复核失败
* 重新复核状态 0未复核1复核中2复核成功3复核失败
*/
@ExcelAttribute(name = "重新复核状态 0 复核中 1复核成功 2复核失败", maxLength = 1)
@Length(max = 1, message = "重新复核状态 0 复核中 1复核成功 2复核失败不能超过1个字符")
@ExcelProperty("重新复核状态 0 复核中 1复核成功 2复核失败")
@Schema(description = "重新复核状态 0 复核中 1复核成功 2复核失败")
@ExcelAttribute(name = "重新复核状态", maxLength = 1)
@Length(max = 1, message = "重新复核状态不能超过1个字符")
@ExcelProperty("重新复核状态 0未复核1复核中2复核成功3复核失败")
@Schema(description = "重新复核状态 0未复核1复核中2复核成功3复核失败")
private String repeatReviewFlag;
/**
* 资源路径
*/
@ExcelAttribute(name = "资源路径", maxLength = 200)
@Length(max = 200, message = "资源路径不能超过200个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("资源路径")
private String attaSrc;
/**
* 资源地址
*/
@ExcelAttribute(name = "资源地址", maxLength = 100)
@Length(max = 100, message = "资源地址不能超过100个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("资源地址")
private String attaUrl;
/**
* 原表资源地址1
*/
@ExcelAttribute(name = "原表资源地址1", maxLength = 200)
@Length(max = 200, message = "原表资源地址1不能超过200个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("原表资源地址1")
private String attaUrlOne;
/**
* 原表资源地址2
*/
@ExcelAttribute(name = "原表资源地址2", maxLength = 200)
@Length(max = 200, message = "原表资源地址2不能超过200个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("原表资源地址2")
private String attaUrlTwo;
/**
* 原表资源地址3
*/
@ExcelAttribute(name = "原表资源地址3", maxLength = 200)
@Length(max = 200, message = "原表资源地址3不能超过200个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("原表资源地址3")
private String attaUrlThree;
/**
* 原表资源地址4
*/
@ExcelAttribute(name = "原表资源地址4", maxLength = 200)
@Length(max = 200, message = "原表资源地址4不能超过200个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("原表资源地址4")
private String attaUrlFour;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialSoldierShenBaoTask.java
View file @ d48c5333
......@@ -65,7 +65,15 @@ public class TSocialSoldierShenBaoTask extends BaseEntity {
@NotBlank(message = "1申报；2调整不能为空")
@Length(max = 1, message = "1申报；2调整不能超过1个字符")
@ExcelProperty("1申报；2调整")
@Schema(description = "1申报；2调整")
@Schema(description = "1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询")
private String type;
/**
* 拉取状态：0未拉取；1已拉取
*/
@ExcelAttribute(name = "拉取状态：0未拉取；1已拉取", maxLength = 1)
@Length(max = 1, message = "拉取状态：0未拉取；1已拉取不能超过1个字符")
@ExcelProperty("拉取状态：0未拉取；1已拉取")
@Schema(description = "拉取状态：0未拉取；1已拉取")
private String dataStatus;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierPaymentSelectOneVo.java 0 → 100644
View file @ d48c5333
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author hgw
* @Description 社保士兵实缴3张表查询1_合肥-社保费管理客户端-日常申报导出
* @Date 2024-5-29 18:20:26
**/
@Data
public class SocialSoldierPaymentSelectOneVo implements Serializable {
// 单位编号 单位名称 是否截图（日常申报） 费款所属期 单企业多Sheet 单企业单Sheet 多企业单Sheet 有效期起 有效期止 是否查询职工缴费工资 回传信息
// 单位编号 单位名称 是否截图（日常申报） 费款所属期 是否下载人员明细 单企业多Sheet 单企业单Sheet 多企业单Sheet 有效期起 有效期止 是否查询职工缴费工资 回传信息
@ExcelProperty("单位编号")
private String companyNo;
@ExcelProperty("单位名称")
private String companyName;
@ExcelProperty("是否截图（日常申报）")
private String isPrint;
@ExcelProperty("费款所属期")
private String createMonth;
@ExcelProperty("是否下载人员明细")
private String isDownLoad;
@ExcelProperty("单企业多Sheet")
private String danDuoSheet;
@ExcelProperty("单企业单Sheet")
private String danDanSheet;
@ExcelProperty("多企业单Sheet")
private String duoDanSheet;
@ExcelProperty("有效期起")
private String startDate;
@ExcelProperty("有效期止")
private String endDate;
@ExcelProperty("是否查询职工缴费工资")
private String isSalary;
@ExcelProperty("回传信息")
private String returnInfo;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierPaymentSelectThreeVo.java 0 → 100644
View file @ d48c5333
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author hgw
* @Description 社保士兵实缴3张表查询3_合肥-医保-单位缴费明细查询
* @Date 2024-5-29 18:20:26
**/
@Data
public class SocialSoldierPaymentSelectThreeVo implements Serializable {
// 企业名称 对应费款所属期 险种类型 回传信息 回传信息1 回传信息2
@ExcelProperty("企业名称")
private String companyName;
@ExcelProperty("对应费款所属期")
private String createMonth;
@ExcelProperty("险种类型")
private String paymentType;
@ExcelProperty("回传信息")
private String returnInfo;
@ExcelProperty("回传信息1")
private String returnInfoOne;
@ExcelProperty("回传信息2")
private String returnInfoTwo;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierPaymentSelectTwoVo.java 0 → 100644
View file @ d48c5333
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author hgw
* @Description 社保士兵实缴3张表查询2_合肥-社保-人员缴费明细打印
* @Date 2024-5-29 18:20:26
**/
@Data
public class SocialSoldierPaymentSelectTwoVo implements Serializable {
// 企业名称 参险类型 业务年月 回传信息 回传信息1 回传信息2
@ExcelProperty("企业名称")
private String companyName;
@ExcelProperty("参险类型")
private String paymentType;
@ExcelProperty("业务年月")
private String payMonth;
@ExcelProperty("回传信息")
private String returnInfo;
@ExcelProperty("回传信息1")
private String returnInfoOne;
@ExcelProperty("回传信息2")
private String returnInfoTwo;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialConfig.java
View file @ d48c5333
......@@ -117,8 +117,8 @@ public class SocialConfig {
sheMap.put("社保减员", sheBaoArrObj.getString("value"));
} else if ("审核数据查询".equals(sheBaoArrObj.get("label"))) {
sheMap.put("审核数据查询", sheBaoArrObj.getString("value"));
} else if ("社保批量调基文件下载".equals(sheBaoArrObj.get("label"))) {
sheMap.put("社保批量调基文件下载", sheBaoArrObj.getString("value"));
} else if ("人员缴费明细打印".equals(sheBaoArrObj.get("label"))) {
sheMap.put("人员缴费明细打印", sheBaoArrObj.getString("value"));
}
}
} else if ("医保".equals(childrenArrObj.get("label"))) {
......@@ -133,6 +133,8 @@ public class SocialConfig {
sheMap.put("审核数据信息查询", sheBaoArrObj.getString("value"));
} else if ("单位缴费明细查询".equals(sheBaoArrObj.get("label"))) {
sheMap.put("单位缴费明细查询", sheBaoArrObj.getString("value"));
} else if ("单位缴费明细下载".equals(sheBaoArrObj.get("label"))) {
sheMap.put("单位缴费明细下载", sheBaoArrObj.getString("value"));
}
}
} else if ("社保费管理客户端".equals(childrenArrObj.get("label"))) {
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAutoPaymentDetailController.java
View file @ d48c5333
......@@ -46,7 +46,7 @@ import java.util.List;
/**
* 自动化实缴记录表
* 自动化实缴明细表
*
* @author fxj
* @date 2024-05-24 10:56:42
......@@ -54,7 +54,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/tautopaymentdetail")
@Tag(name = "自动化实缴记录表明细管理")
@Tag(name = "自动化实缴明细表")
public class TAutoPaymentDetailController {
private final TAutoPaymentDetailService tAutoPaymentDetailService;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAutoPaymentInfoController.java
View file @ d48c5333
......@@ -18,26 +18,25 @@
package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TAutoPaymentInfoService;
import com.yifu.cloud.plus.v1.yifu.social.vo.TAutoPaymentInfoVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TAutoPaymentInfoSearchVo;
import lombok.SneakyThrows;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import lombok.SneakyThrows;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.net.URL;
import java.util.List;
......@@ -55,6 +54,7 @@ public class TAutoPaymentInfoController {
private final TAutoPaymentInfoService tAutoPaymentInfoService;
private final OSSUtil ossUtil;
/**
* 简单分页查询
......@@ -69,6 +69,20 @@ public class TAutoPaymentInfoController {
return new R<>(tAutoPaymentInfoService.getTAutoPaymentInfoPage(page, tAutoPaymentInfo));
}
/**
* 获取附件下载地址
* @Author hgw
* @Date 2024-6-6 09:42:47
**/
@Schema(description = "附件预览下载地址")
@SysLog("附件预览下载地址")
@PostMapping("/getOssFileUrl")
public R<String> ossFileUrl(@RequestParam String attaSrc) {
URL url = ossUtil.getObjectUrl(null, attaSrc);
String urlStr = url.toString().replace("http","https");
return new R<>(urlStr);
}
/**
* 不分页查询
*
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialSoldierController.java
View file @ d48c5333
......@@ -141,4 +141,32 @@ public class TSocialSoldierController {
return tSocialSoldierPushService.pushSalaryByShenBao();
}
/**
* @Description: 6每月6号推送实缴3张表查询
* @Author: hgw
* @Date: 2024-5-31 16:04:09
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(description = "6每月6号1点推送实缴3张表查询")
@PostMapping("/inner/pushPaymentThree")
@SysLog("6每月6号推送实缴3张表查询")
@Inner
public R<String> pushPaymentThree() {
return tSocialSoldierPushService.pushPaymentThree();
}
/**
* @Description: 7每月6号定时任务获取社保士兵实缴3张表
* @Author: hgw
* @Date: 2024-5-30 18:00:00
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(description = "7每月6号3点定时任务获取社保士兵实缴3张表")
@PostMapping("/inner/doInnerGetPaymentThree")
@SysLog("7每月6号定时任务获取社保士兵实缴3张表")
@Inner
public R<String> doInnerGetPaymentThree() {
return tSocialSoldierService.doInnerGetPaymentThree();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TAutoPaymentDetailMapper.java
View file @ d48c5333
......@@ -39,4 +39,14 @@ public interface TAutoPaymentDetailMapper extends BaseMapper<TAutoPaymentDetail>
* @return
*/
IPage<TAutoPaymentDetail> getTAutoPaymentDetailPage(Page<TAutoPaymentDetail> page, @Param("tAutoPaymentDetail") TAutoPaymentDetail tAutoPaymentDetail);
/**
* @param parentId
* @Description: 删除明细表
* @Author: hgw
* @Date: 2024/6/6 9:55
* @return: void
**/
void deleteByParentId(@Param("parentId") String parentId);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TAutoPaymentInfoMapper.java
View file @ d48c5333
......@@ -39,4 +39,13 @@ public interface TAutoPaymentInfoMapper extends BaseMapper<TAutoPaymentInfo> {
* @return
*/
IPage<TAutoPaymentInfo> getTAutoPaymentInfoPage(Page<TAutoPaymentInfo> page, @Param("tAutoPaymentInfo") TAutoPaymentInfo tAutoPaymentInfo);
/**
* @Description: 获取当前月的主表
* @Author: hgw
* @Date: 2024/6/4 16:12
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo
**/
TAutoPaymentInfo getThisMonthMainAuto();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialSoldierMapper.java
View file @ d48c5333
......@@ -94,5 +94,27 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
**/
List<SocialSoldierSalaryTiaoZhengVo> getSoldierSalaryByTiaoZhengList();
/**
* @Description: 实缴3张表之日常申报
* @Author: hgw
* @Date: 2024/5/29 18:32
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSalaryShenBaoVo>
**/
List<SocialSoldierPaymentSelectOneVo> getSoldierPaymentSelectOneList();
/**
* @Description: 实缴3张表之日常申报
* @Author: hgw
* @Date: 2024/5/29 18:32
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSalaryShenBaoVo>
**/
List<SocialSoldierPaymentSelectTwoVo> getSoldierPaymentSelectTwoList();
/**
* @Description: 实缴3张表之日常申报
* @Author: hgw
* @Date: 2024/5/29 18:32
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSalaryShenBaoVo>
**/
List<SocialSoldierPaymentSelectThreeVo> getSoldierPaymentSelectThreeList();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialSoldierShenBaoTaskMapper.java
View file @ d48c5333
......@@ -39,4 +39,5 @@ public interface TSocialSoldierShenBaoTaskMapper extends BaseMapper<TSocialSoldi
* @return
*/
List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(@Param("tSocialSoldierShenBaoTask") TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask);
String getSoldierTaskAddIdByType(@Param("type") String type);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAutoPaymentDetailService.java
View file @ d48c5333
......@@ -49,4 +49,12 @@ public interface TAutoPaymentDetailService extends IService<TAutoPaymentDetail>
void listExport(HttpServletResponse response, TAutoPaymentDetailSearchVo searchVo);
List<TAutoPaymentDetail> noPageDiy(TAutoPaymentDetailSearchVo searchVo);
/**
* @Description: 清空明细表
* @Author: hgw
* @Date: 2024/6/6 9:54
* @return: void
**/
void deleteByParentId(String parentId);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAutoPaymentInfoService.java
View file @ d48c5333
......@@ -49,4 +49,13 @@ public interface TAutoPaymentInfoService extends IService<TAutoPaymentInfo> {
void listExport(HttpServletResponse response, TAutoPaymentInfoSearchVo searchVo);
List<TAutoPaymentInfo> noPageDiy(TAutoPaymentInfoSearchVo searchVo);
/**
* @Description: 获取当前月的主表
* @Author: hgw
* @Date: 2024/6/4 16:12
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo
**/
TAutoPaymentInfo getThisMonthMainAuto();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierPushService.java
View file @ d48c5333
......@@ -65,5 +65,12 @@ public interface TSocialSoldierPushService extends IService<TSocialInfo> {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> pushSalaryByShenBao();
/**
* @Description: 6每月6号推送实缴3张表查询
* @Author: hgw
* @Date: 2024-5-31 16:04:54
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> pushPaymentThree();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierService.java
View file @ d48c5333
......@@ -46,5 +46,12 @@ public interface TSocialSoldierService extends IService<TSocialInfo> {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> getSixJobByAudit();
/**
* @Description: 获取实缴3张表的数据
* @Author: hgw
* @Date: 2024-5-24 17:02:34
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> doInnerGetPaymentThree();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierShenBaoTaskService.java
View file @ d48c5333
......@@ -36,4 +36,14 @@ public interface TSocialSoldierShenBaoTaskService extends IService<TSocialSoldie
* @return
*/
List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask);
/**
* @param type
* @Description: 获取实缴3张表推送后的任务ID，以用来拉取数据
* @Author: hgw
* @Date: 2024/5/31 18:13
* @return: java.lang.String
**/
String getSoldierTaskAddIdByType(String type);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAutoPaymentDetailServiceImpl.java
View file @ d48c5333
......@@ -177,6 +177,11 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
return baseMapper.selectList(wrapper);
}
@Override
public void deleteByParentId(String parentId) {
baseMapper.deleteByParentId(parentId);
}
private Long noPageCountDiy(TAutoPaymentDetailSearchVo searchVo) {
LambdaQueryWrapper<TAutoPaymentDetail> 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/TAutoPaymentInfoServiceImpl.java
View file @ d48c5333
......@@ -157,6 +157,17 @@ public class TAutoPaymentInfoServiceImpl extends ServiceImpl<TAutoPaymentInfoMap
return baseMapper.selectList(wrapper);
}
/**
* @Description: 获取当前月的主表
* @Author: hgw
* @Date: 2024/6/4 16:12
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo
**/
@Override
public TAutoPaymentInfo getThisMonthMainAuto() {
return baseMapper.getThisMonthMainAuto();
}
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
View file @ d48c5333
......@@ -286,7 +286,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName);
}
}
if (ygsAddlist == null || ysdXuBaolist == null|| ysdAddlist == null) {
if (ygsAddlist == null && ysdXuBaolist == null && ysdAddlist == null) {
return R.failed("无数据，推送结束！");
}
return R.ok("推送成功！！");
......@@ -386,7 +386,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
**/
@Override
public R<String> pushSalaryByShenBao() {
// 养工失待审核列表
// 工资申报
List<SocialSoldierSalaryShenBaoVo> shenBaolist = baseMapper.getSoldierSalaryByShenBaoList();
log.info("工资申报列表="+shenBaolist);
String sheetName = "年度缴费工资申报";
......@@ -398,7 +398,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
// 养工失待审核列表
// 工资调整
List<SocialSoldierSalaryTiaoZhengVo> tiaoZhenglist = baseMapper.getSoldierSalaryByTiaoZhengList();
log.info("工资调整列表="+tiaoZhenglist);
sheetName = "年度缴费工资调整";
......@@ -410,7 +410,73 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
if (shenBaolist == null || tiaoZhenglist == null) {
if (shenBaolist == null && tiaoZhenglist == null) {
return R.failed("无数据，推送结束！");
}
return R.ok("推送成功！！");
}
/**
* @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() {
// 实缴3张表之1：日常申报
List<SocialSoldierPaymentSelectOneVo> shenBaolist = baseMapper.getSoldierPaymentSelectOneList();
log.info("实缴3张表之1：日常申报list="+shenBaolist);
String sheetName = "日常申报导出";
if (shenBaolist != null && !shenBaolist.isEmpty()) {
MultipartFile file = this.getFile(shenBaolist, SocialSoldierPaymentSelectOneVo.class, sheetName);
if (Common.isNotNull(file)) {
TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
task.setType(CommonConstants.THREE_STRING);
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
// 实缴3张表之2：人员缴费明细打印
List<SocialSoldierPaymentSelectTwoVo> shenBaoTwolist = baseMapper.getSoldierPaymentSelectTwoList();
log.info("实缴3张表之2：人员缴费明细打印list="+shenBaoTwolist);
sheetName = "人员缴费明细打印";
if (shenBaoTwolist != null && !shenBaoTwolist.isEmpty()) {
MultipartFile file = this.getFile(shenBaoTwolist, SocialSoldierPaymentSelectTwoVo.class, sheetName);
if (Common.isNotNull(file)) {
TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
task.setType(CommonConstants.FOUR_STRING);
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
// 实缴3张表之3：单位缴费明细查询
List<SocialSoldierPaymentSelectThreeVo> shenBaoThreelist = baseMapper.getSoldierPaymentSelectThreeList();
log.info("实缴3张表之3：单位缴费明细查询list="+shenBaoThreelist);
sheetName = "单位缴费明细查询";
if (shenBaoThreelist != null && !shenBaoThreelist.isEmpty()) {
MultipartFile file = this.getFile(shenBaoThreelist, SocialSoldierPaymentSelectThreeVo.class, sheetName);
if (Common.isNotNull(file)) {
TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询
task.setType(CommonConstants.FIVE_STRING);
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
// 实缴3张表之3-2：单位缴费明细下载
List<SocialSoldierPaymentSelectThreeVo> shenBaoFourlist = baseMapper.getSoldierPaymentSelectThreeList();
log.info("实缴3张表之3-2：单位缴费明细下载list="+shenBaoFourlist);
sheetName = "单位缴费明细下载";
if (shenBaoFourlist != null && !shenBaoFourlist.isEmpty()) {
MultipartFile file = this.getFile(shenBaoFourlist, SocialSoldierPaymentSelectThreeVo.class, sheetName);
if (Common.isNotNull(file)) {
TSocialSoldierShenBaoTask task = new TSocialSoldierShenBaoTask();
// 1申报；2调整；3：实缴1日常申报导出；4：实缴2人员缴费明细打印；5：实缴3单位缴费明细查询；6：实缴3单位缴费明细下载
task.setType(CommonConstants.SIX_STRING);
this.getOneAppGetModuleDetailByShenBao(task, file, sheetName);
}
}
if (shenBaolist == null && shenBaoTwolist == null && shenBaoThreelist == null && shenBaoFourlist == null) {
return R.failed("无数据，推送结束！");
}
return R.ok("推送成功！！");
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierShenBaoTaskServiceImpl.java
View file @ d48c5333
......@@ -44,5 +44,13 @@ public class TSocialSoldierShenBaoTaskServiceImpl extends ServiceImpl<TSocialSol
public List<TSocialSoldierShenBaoTask> getTSocialSoldierShenBaoTaskList(TSocialSoldierShenBaoTask tSocialSoldierShenBaoTask) {
return baseMapper.getTSocialSoldierShenBaoTaskList(tSocialSoldierShenBaoTask);
}
/**
* 获取任务id
* @return
*/
@Override
public String getSoldierTaskAddIdByType(String type) {
return baseMapper.getSoldierTaskAddIdByType(type);
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TAutoPaymentDetailMapper.xml
View file @ d48c5333
......@@ -146,4 +146,9 @@
<include refid="tAutoPaymentDetail_where"/>
</where>
</select>
<delete id="deleteByParentId">
delete from t_auto_payment_detail where PARENT_ID = #{parentId}
</delete>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TAutoPaymentInfoMapper.xml
View file @ d48c5333
......@@ -25,7 +25,13 @@
<resultMap id="tAutoPaymentInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo">
<id property="id" column="ID"/>
<result property="dataIntegrationFlag" column="DATA_INTEGRATION_FLAG"/>
<result property="createMonth" column="CREATE_MONTH"/>
<result property="dataOneFlag" column="DATA_ONE_FLAG"/>
<result property="dataTwoFlag" column="DATA_TWO_FLAG"/>
<result property="dataThreeFlag" column="DATA_THREE_FLAG"/>
<result property="dataOneRemark" column="DATA_ONE_REMARK"/>
<result property="dataTwoRemark" column="DATA_TWO_REMARK"/>
<result property="dataThreeRemark" column="DATA_THREE_REMARK"/>
<result property="systemReviewFlag" column="SYSTEM_REVIEW_FLAG"/>
<result property="repeatReviewFlag" column="REPEAT_REVIEW_FLAG"/>
<result property="createBy" column="CREATE_BY"/>
......@@ -33,25 +39,52 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="attaSrc" column="ATTA_SRC"/>
<result property="attaUrl" column="ATTA_URL"/>
<result property="attaUrlOne" column="ATTA_URL_ONE"/>
<result property="attaUrlTwo" column="ATTA_URL_TWO"/>
<result property="attaUrlThree" column="ATTA_URL_THREE"/>
<result property="attaUrlFour" column="ATTA_URL_FOUR"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.DATA_INTEGRATION_FLAG,
a.CREATE_MONTH,
a.DATA_ONE_FLAG,
a.DATA_TWO_FLAG,
a.DATA_THREE_FLAG,
a.DATA_ONE_REMARK,
a.DATA_TWO_REMARK,
a.DATA_THREE_REMARK,
a.SYSTEM_REVIEW_FLAG,
a.REPEAT_REVIEW_FLAG,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
</sql>
a.UPDATE_TIME,
a.ATTA_SRC,
a.ATTA_URL,
a.ATTA_URL_ONE,
a.ATTA_URL_TWO,
a.ATTA_URL_THREE,
a.ATTA_URL_FOUR
</sql>
<sql id="tAutoPaymentInfo_where">
<if test="tAutoPaymentInfo != null">
<if test="tAutoPaymentInfo.id != null and tAutoPaymentInfo.id.trim() != ''">
AND a.ID = #{tAutoPaymentInfo.id}
</if>
<if test="tAutoPaymentInfo.dataIntegrationFlag != null and tAutoPaymentInfo.dataIntegrationFlag.trim() != ''">
AND a.DATA_INTEGRATION_FLAG = #{tAutoPaymentInfo.dataIntegrationFlag}
<if test="tAutoPaymentInfo.createMonth != null and tAutoPaymentInfo.createMonth.trim() != ''">
AND a.CREATE_MONTH = #{tAutoPaymentInfo.createMonth}
</if>
<if test="tAutoPaymentInfo.dataOneFlag != null and tAutoPaymentInfo.dataOneFlag.trim() != ''">
AND a.DATA_ONE_FLAG = #{tAutoPaymentInfo.dataOneFlag}
</if>
<if test="tAutoPaymentInfo.dataTwoFlag != null and tAutoPaymentInfo.dataTwoFlag.trim() != ''">
AND a.DATA_TWO_FLAG = #{tAutoPaymentInfo.dataTwoFlag}
</if>
<if test="tAutoPaymentInfo.dataThreeFlag != null and tAutoPaymentInfo.dataThreeFlag.trim() != ''">
AND a.DATA_THREE_FLAG = #{tAutoPaymentInfo.dataThreeFlag}
</if>
<if test="tAutoPaymentInfo.systemReviewFlag != null and tAutoPaymentInfo.systemReviewFlag.trim() != ''">
AND a.SYSTEM_REVIEW_FLAG = #{tAutoPaymentInfo.systemReviewFlag}
......@@ -98,4 +131,11 @@
<include refid="tAutoPaymentInfo_where"/>
</where>
</select>
<!--获取当前月的主表-->
<select id="getThisMonthMainAuto" resultMap="tAutoPaymentInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_auto_payment_info a
where a.CREATE_MONTH = DATE_FORMAT(now(),'%Y%m')
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @ d48c5333
......@@ -171,7 +171,7 @@
</select>
<!-- 社保士兵养工失神恶化结果查询的模板-->
<!-- 社保士兵养工失审核结果查询的模板-->
<select id="getSocialSoldierYgsAuditVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAuditVo">
SELECT
s.id as socialId,
......@@ -246,7 +246,7 @@
from t_social_info s
left join t_dispatch_info d on s.id=d.SOCIAL_ID
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS = '3' and d.type = '0' and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m') <![CDATA[ < ]]> DATE_FORMAT(now(),'%Y%m')
and s.HANDLE_STATUS = '3' and d.type = '1' and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m') <![CDATA[ < ]]> DATE_FORMAT(now(),'%Y%m')
) a GROUP BY a.empIdCard
</select>
<!-- 工资调整 -->
......@@ -275,9 +275,37 @@
from t_social_info s
left join t_dispatch_info d on s.id=d.SOCIAL_ID
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS = '3' and d.type = '0'
and s.HANDLE_STATUS = '3' and d.type = '1'
and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m') <![CDATA[ < ]]> DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 YEAR),'%Y12')
) a GROUP BY a.empIdCard
</select>
<!-- 社保士兵实缴3张表查询1_合肥-社保费管理客户端-日常申报导出 -->
<select id="getSoldierPaymentSelectOneList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectOneVo">
select
'' companyNo ,s.NAME companyName,'' isPrint,'' createMonth,'是' isDownLoad,'' danDuoSheet
,'' danDanSheet,'' duoDanSheet,'' startDate,'' endDate,'' isSalary,'' returnInfo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and s.AUTO_STATUS = '0'
</select>
<!-- 社保士兵实缴3张表查询2_合肥-社保-人员缴费明细打印 -->
<select id="getSoldierPaymentSelectTwoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectTwoVo">
select
s.NAME companyName,'' paymentType,'' payMonth,'' returnInfo,'' returnInfoOne,'' returnInfoTwo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and s.AUTO_STATUS = '0'
</select>
<!-- 社保士兵实缴3张表查询3_合肥-医保-单位缴费明细查询 -->
<select id="getSoldierPaymentSelectThreeList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectThreeVo">
select
s.NAME companyName
,'' createMonth
,'' paymentType
,'' returnInfo
,'' returnInfoOne
,'' returnInfoTwo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and s.AUTO_STATUS = '0'
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierShenBaoTaskMapper.xml
View file @ d48c5333
......@@ -81,4 +81,12 @@
<include refid="tSocialSoldierShenBaoTask_where"/>
</where>
</select>
<!--获取任务id-->
<select id="getSoldierTaskAddIdByType" resultType="java.lang.String">
SELECT
a.ADD_ID
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>
</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