Merge remote-tracking branch 'origin/develop' into develop

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

@@ -148,22 +148,6 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("锁定状态 0 未锁定 1 锁定")
     private String lockStatus;
 
-    /**
-     * 社保结算状态  0: 未结算  1: 待结算  2: 已结算
-     */
-    @ExcelAttribute(name = "社保结算状态  0: 未结算  1: 待结算  2: 已结算" )
-    @Schema(description ="社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-    @ExcelProperty("社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-    private String socialSettlementFlag;
-
-    /**
-     * 公积金结算状态
-     */
-    @ExcelAttribute(name = "公积金结算状态" )
-    @Schema(description ="公积金结算状态")
-    @ExcelProperty("公积金结算状态")
-    private String fundSettlementFlag;
-
     /**
      * 总合计
      */
@@ -316,22 +300,6 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("公积金核准表ID")
     private String fundSettlementId;
 
-    /**
-     * 工资社保结算状态  0: 未结算  1:  已结算
-     */
-    @ExcelAttribute(name = "工资社保结算状态  0: 未结算  1:  已结算" )
-    @Schema(description ="工资社保结算状态  0: 未结算  1:  已结算")
-    @ExcelProperty("工资社保结算状态  0: 未结算  1:  已结算")
-    private String salarySocialFlag;
-
-    /**
-     * 工资公积金结算状态  0: 未结算  1: 已结算
-     */
-    @ExcelAttribute(name = "工资公积金结算状态  0: 未结算  1: 已结算" )
-    @Schema(description ="工资公积金结算状态  0: 未结算  1: 已结算")
-    @ExcelProperty("工资公积金结算状态  0: 未结算  1: 已结算")
-    private String salaryFundFlag;
-
     /**
      * 就职班组
      */
@@ -372,6 +340,14 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("财务账单ID")
     private String financeBillId;
 
+	/**
+	 * 财务账单ID
+	 */
+	@ExcelAttribute(name = "推送状态 0已推送 1未推送" )
+	@Schema(description ="推送状态 0已推送 1未推送")
+	@ExcelProperty("推送状态 0已推送 1未推送")
+	private String pushStatus;
+
 	/**
 	 * 单位社保补缴利息
 	 */

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

@@ -145,22 +145,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@Schema(description = "锁定状态 0 未锁定 1 锁定")
 	@ExcelProperty("锁定状态 0 未锁定 1 锁定")
 	private String lockStatus;
-	/**
-	 * 社保结算状态  0: 未结算  1: 待结算  2: 已结算
-	 */
-	@Length(max = 1, message = "社保结算状态  0: 未结算  1: 待结算  2: 已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "社保结算状态  0: 未结算  1: 待结算  2: 已结算", maxLength = 1)
-	@Schema(description = "社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-	@ExcelProperty("社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-	private String socialSettlementFlag;
-	/**
-	 * 公积金结算状态
-	 */
-	@Length(max = 1, message = "公积金结算状态 不能超过1 个字符")
-	@ExcelAttribute(name = "公积金结算状态", maxLength = 1)
-	@Schema(description = "公积金结算状态")
-	@ExcelProperty("公积金结算状态")
-	private String fundSettlementFlag;
 	/**
 	 * 总合计
 	 */
@@ -308,22 +292,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@Schema(description = "公积金核准表ID")
 	@ExcelProperty("公积金核准表ID")
 	private String fundSettlementId;
-	/**
-	 * 工资社保结算状态  0: 未结算  1:  已结算
-	 */
-	@Length(max = 1, message = "工资社保结算状态  0: 未结算  1:  已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "工资社保结算状态  0: 未结算  1:  已结算", maxLength = 1)
-	@Schema(description = "工资社保结算状态  0: 未结算  1:  已结算")
-	@ExcelProperty("工资社保结算状态  0: 未结算  1:  已结算")
-	private String salarySocialFlag;
-	/**
-	 * 工资公积金结算状态  0: 未结算  1: 已结算
-	 */
-	@Length(max = 1, message = "工资公积金结算状态  0: 未结算  1: 已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "工资公积金结算状态  0: 未结算  1: 已结算", maxLength = 1)
-	@Schema(description = "工资公积金结算状态  0: 未结算  1: 已结算")
-	@ExcelProperty("工资公积金结算状态  0: 未结算  1: 已结算")
-	private String salaryFundFlag;
 	/**
 	 * 就职班组
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PaymentConstants.java

@@ -7,17 +7,6 @@ package com.yifu.cloud.plus.v1.yifu.social.constants;
  **/
 public class PaymentConstants {
 
-    public static  final  String saveFailExistsSocialSettlement = "社保数据已生成核准表，无法删除！";
-
-    public static  final  String saveFailExistsSalarySocialSettlement = "社保数据已工资结算，无法删除！";
-
-    public static  final  String saveFailExistsFundSettlement = "公积金数据已生成核准表，无法删除！";
-
-    public static  final  String saveFailExistsSalaryFundSettlement = "公积金数据已工资结算，无法删除！";
-
-    public static  final  String saveFailExistsAgentSettlement = "对应缴费库数据已生成代理类结算单，无法删除！";
-
-    public static  final  String saveFailExistsFinanceBillSettlement = "数据已生成财务账单，无法删除！";
     public static  final  String PENSION_RISK = "养老保险";
     public static  final  String PENSION = "养老";
     public static  final  String UNEMPLOYEEMENT_RISK = "失业保险";

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

@@ -96,24 +96,21 @@ public class TPaymentInfoController {
 	@SysLog("通过id删除缴费库" )
 	@DeleteMapping("/{id}" )
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')" )
-	public R<Boolean> removeById(@PathVariable String id) {
-		return R.ok(tPaymentInfoService.removeById(id));
+	public R removeById(@PathVariable String id) {
+		return tPaymentInfoService.removeInFoById(id);
 	}
 
 	/**
-	 * 按类型删除
-	 * @author huyc
-	 * @date 2022-07-22 17:01:22
-	 * @param id
-	 * @param type
-	 * @return
-	 **/
-	@Operation(summary = "按类型删除", description = "按类型删除：hasPermission('social_tpaymentinfo_del')")
-	@SysLog("按类型删除缴费库")
-	@GetMapping("/removeByIdAndType")
+	 * 通过ids删除一条记录
+	 * @param ids
+	 * @return R
+	 */
+	@Operation(summary = "通过ids删除缴费库", description = "通过ids删除缴费库：hasPermission('social_tpaymentinfo_del')")
+	@SysLog("删除缴费库")
+	@DeleteMapping("/removeBatchByIds")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')")
-	public R<Boolean> removeByIdAndType(@RequestParam String id, @RequestParam String type) {
-		return tPaymentInfoService.removeByIdAndType(id,type);
+	public R<Boolean> removeBatchByIds(String ids) {
+		return tPaymentInfoService.removeAllInfoById(ids);
 	}
 
 	/**
@@ -177,31 +174,9 @@ public class TPaymentInfoController {
 	 **/
 	@Operation(description = "导出缴费库 hasPermission('social_tpaymentinfo_export')")
 	@PostMapping("/export")
-//	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
+	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
 	public void export(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) {
 		tPaymentInfoService.listExport(response,searchVo);
 	}
 
-	/**
-	 * 删除当前登录人当前月的社保或公积金数据
-	 * @param type 0 全部删除 1 删除社保 2 删除公积金 必填
-	 * @param settleDepartId 项目ID 可选
-	 * @param unitId 单位ID 可选
-	 * @param empIdCard 员工身份证 可选
-	 * @param socialHouseId 社保户 可选
-	 * @param fundHouseId  公积金户 可选
-	 * @return R
-	 */
-	@Operation(description = "删除(social_tpaymentinfo_del)")
-	@SysLog("删除缴费库")
-	@PostMapping("/removeBatchByIdsAndType")
-	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')")
-	public R removeBatchByIdsAndType(@RequestParam(name = "type",required = true) String type,
-									 @RequestParam(name = "settleDepartId",required = false) String settleDepartId,
-									 @RequestParam(name = "unitId",required = false) String unitId,
-									 @RequestParam(name = "empIdCard",required = false) String empIdCard,
-									 @RequestParam(name = "socialHouseId",required = false) String socialHouseId,
-									 @RequestParam(name = "fundHouseId",required = false) String fundHouseId) {
-		return tPaymentInfoService.removeBatchByIdsAndType(type,settleDepartId,unitId,empIdCard,socialHouseId,fundHouseId);
-	}
 }

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

@@ -71,36 +71,32 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 */
 	void listExport(HttpServletResponse response, TPaymentInfoSearchVo searchVo);
 
+
 	/**
-	 * 按类型删除
+	 * 删除缴费库数据 包括明细
 	 * @Author huyc
 	 * @Date 2022-07-24
 	 * @param id
-	 * @param type
 	 * @return
 	 **/
-	R<Boolean> removeByIdAndType(String id, String type);
+	R removeInFoById(String id);
 
 	/**
-	 * 通过ID获取缴费库 及社保、公积金明细
+	 * 删除缴费库数据 包括明细
 	 * @Author huyc
 	 * @Date 2022-07-24
-	 * @param id
+	 * @param ids
 	 * @return
 	 **/
-	R getAllInfoById(String id);
+	R<Boolean> removeAllInfoById(String ids);
 
 	/**
-	 * 删除当月 当前登录人的 指定类型的缴费库数据
+	 * 通过ID获取缴费库 及社保、公积金明细
 	 * @Author huyc
-	 * @Date 2022-07-27
-	 * @param type
-	 * @param settleDepartId
-	 * @param unitId
-	 * @param empIdCard
-	 * @param socialHouseId
-	 * @param fundHouseId
+	 * @Date 2022-07-24
+	 * @param id
 	 * @return
 	 **/
-	R removeBatchByIdsAndType(String type, String settleDepartId, String unitId, String empIdCard, String socialHouseId, String fundHouseId);
+	R getAllInfoById(String id);
+
 }

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

@@ -36,8 +36,7 @@
 		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
 		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
 		<result property="lockStatus" column="LOCK_STATUS"/>
-		<result property="socialSettlementFlag" column="SOCIAL_SETTLEMENT_FLAG"/>
-		<result property="fundSettlementFlag" column="FUND_SETTLEMENT_FLAG"/>
+		<result property="pushStatus" column="PUSH_STATUS"/>
 		<result property="sumAll" column="SUM_ALL"/>
 		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
 		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
@@ -57,8 +56,6 @@
 		<result property="providentSum" column="PROVIDENT_SUM"/>
 		<result property="socialSettlementId" column="SOCIAL_SETTLEMENT_ID"/>
 		<result property="fundSettlementId" column="FUND_SETTLEMENT_ID"/>
-		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
-		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
 		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
 		<result property="telecomNumber" column="TELECOM_NUMBER"/>
 		<result property="sortTime" column="SORT_TIME"/>
@@ -120,6 +117,7 @@
                 a.SOCIAL_PAY_MONTH,
                 a.SOCIAL_CREATE_MONTH,
                 a.LOCK_STATUS,
+                a.PUSH_STATUS,
                 a.SOCIAL_SETTLEMENT_FLAG,
                 a.FUND_SETTLEMENT_FLAG,
                 a.SUM_ALL,
@@ -310,11 +308,8 @@
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
 			</if>
-			<if test="tPaymentInfo.socialSettlementFlag != null and tPaymentInfo.socialSettlementFlag.trim() != ''">
-				AND a.SOCIAL_SETTLEMENT_FLAG = #{tPaymentInfo.socialSettlementFlag}
-			</if>
-			<if test="tPaymentInfo.fundSettlementFlag != null and tPaymentInfo.fundSettlementFlag.trim() != ''">
-				AND a.FUND_SETTLEMENT_FLAG = #{tPaymentInfo.fundSettlementFlag}
+			<if test="tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''">
+				AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
 			</if>
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
@@ -383,12 +378,6 @@
 			<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
 				AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
 			</if>
-			<if test="tPaymentInfo.salarySocialFlag != null and tPaymentInfo.salarySocialFlag.trim() != ''">
-				AND a.SALARY_SOCIAL_FLAG = #{tPaymentInfo.salarySocialFlag}
-			</if>
-			<if test="tPaymentInfo.salaryFundFlag != null and tPaymentInfo.salaryFundFlag.trim() != ''">
-				AND a.SALARY_FUND_FLAG = #{tPaymentInfo.salaryFundFlag}
-			</if>
 			<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
 				AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
 			</if>
@@ -578,12 +567,6 @@
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
 			</if>
-			<if test="tPaymentInfo.socialSettlementFlag != null and tPaymentInfo.socialSettlementFlag.trim() != ''">
-				AND a.SOCIAL_SETTLEMENT_FLAG = #{tPaymentInfo.socialSettlementFlag}
-			</if>
-			<if test="tPaymentInfo.fundSettlementFlag != null and tPaymentInfo.fundSettlementFlag.trim() != ''">
-				AND a.FUND_SETTLEMENT_FLAG = #{tPaymentInfo.fundSettlementFlag}
-			</if>
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
 			</if>
@@ -651,12 +634,6 @@
 			<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
 				AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
 			</if>
-			<if test="tPaymentInfo.salarySocialFlag != null and tPaymentInfo.salarySocialFlag.trim() != ''">
-				AND a.SALARY_SOCIAL_FLAG = #{tPaymentInfo.salarySocialFlag}
-			</if>
-			<if test="tPaymentInfo.salaryFundFlag != null and tPaymentInfo.salaryFundFlag.trim() != ''">
-				AND a.SALARY_FUND_FLAG = #{tPaymentInfo.salaryFundFlag}
-			</if>
 			<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
 				AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
 			</if>
@@ -814,8 +791,6 @@
 		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
 		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
 		<result property="lockStatus" column="LOCK_STATUS"/>
-		<result property="socialSettlementFlag" column="SOCIAL_SETTLEMENT_FLAG"/>
-		<result property="fundSettlementFlag" column="FUND_SETTLEMENT_FLAG"/>
 		<result property="sumAll" column="SUM_ALL"/>
 		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
 		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
@@ -884,9 +859,6 @@
 		<result property="fundTown" column="FUND_TOWN"/>
 		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
 		<result property="telecomNumber" column="TELECOM_NUMBER"/>
-
-		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
-		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
 	</resultMap>
 	<!--tPaymentInfo简单分页查询-->
 	<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">