项目基本信息推送

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

@@ -90,15 +90,40 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelAttribute(name = "客户名称" )
     @Schema(description ="客户名称")
     @ExcelProperty("客户名称")
+    private String unitName;
+
+	/**
+	 * 客户Id
+	 */
+	@ExcelAttribute(name = "客户Id" )
+	@Schema(description ="客户Id")
+	@ExcelProperty("客户Id")
 	private String unitId;
 
+    /**
+     * 项目id
+     */
+    @ExcelAttribute(name = "项目id" )
+    @Schema(description ="项目id")
+    @ExcelProperty("项目id")
+    private String settleDomainId;
+
 	/**
 	 * 项目名称
 	 */
 	@ExcelAttribute(name = "项目名称" )
 	@Schema(description ="项目名称")
 	@ExcelProperty("项目名称")
-    private String settleDomainId;
+	private String settleDomainName;
+
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 50, message = "项目编码不能超过50个字符" )
+	@ExcelAttribute(name = "项目编码", maxLength = 50)
+	@Schema(description = "项目编码" )
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
 
     /**
      * 社保户

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

@@ -81,21 +81,43 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证号")
 	private String empIdcard;
 	/**
-	 * 客户名称
+	 * 项目id
 	 */
-	@Length(max = 50, message = "客户名称 不能超过50 个字符")
-	@ExcelAttribute(name = "客户名称", maxLength = 50)
-	@Schema(description = "客户名称")
-	@ExcelProperty("客户名称")
-	private String unitId;
+	@ExcelAttribute(name = "项目id")
+	@Schema(description ="项目id")
+	@ExcelProperty("项目id")
+	private String settleDomainId;
+
 	/**
 	 * 项目名称
 	 */
-	@Length(max = 50, message = "项目名称 不能超过50 个字符")
 	@ExcelAttribute(name = "项目名称", maxLength = 50)
-	@Schema(description = "项目名称")
+	@Schema(description ="项目名称")
 	@ExcelProperty("项目名称")
-	private String settleDomainId;
+	private String settleDomainName;
+
+	/**
+	 * 项目编码
+	 */
+	@ExcelAttribute(name = "项目编码", maxLength = 50)
+	@Schema(description = "项目编码" )
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
+	/**
+	 * 客户名称
+	 */
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Schema(description ="客户名称")
+	@ExcelProperty("客户名称")
+	private String unitName;
+
+	/**
+	 * 客户Id
+	 */
+	@ExcelAttribute(name = "客户Id" )
+	@Schema(description ="客户Id")
+	@ExcelProperty("客户Id")
+	private String unitId;
 	/**
 	 * 社保户
 	 */

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

@@ -925,8 +925,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					paymentInfo.setEmpId(socialInfo.getEmpId());
 					paymentInfo.setEmpIdcard(socialInfo.getEmpIdcard());
 					paymentInfo.setEmpName(socialInfo.getEmpName());
-					paymentInfo.setSettleDomainId(socialInfo.getSettleDomainName());
-					paymentInfo.setUnitId(socialInfo.getUnitName());
+					paymentInfo.setSettleDomainId(socialInfo.getSettleDomain());
+					paymentInfo.setSettleDomainName(socialInfo.getSettleDomainName());
+					paymentInfo.setSettleDomainCode(socialInfo.getSettleDomainCode());
+					paymentInfo.setUnitId(socialInfo.getUnitId());
+					paymentInfo.setUnitName(socialInfo.getUnitName());
 					if (Common.isNotNull(tSocialInfo)) {
 						paymentInfo.setInauguralTeam(tSocialInfo.getInauguralTeam());
 						paymentInfo.setEmpNo(tSocialInfo.getEmpNo());
@@ -1362,7 +1365,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							paymentInfo.setEmpIdcard(fund.getEmpIdcard());
 							paymentInfo.setEmpName(fund.getEmpName());
 							paymentInfo.setSettleDomainId(fund.getSettleDomainNameFund());
-							paymentInfo.setUnitId(fund.getUnitNameFund());
+							paymentInfo.setSettleDomainName(fund.getSettleDomainNameFund());
+							paymentInfo.setSettleDomainCode(fund.getSettleDomainCodeFund());
+							paymentInfo.setUnitId(fund.getUnitIdFund());
+							paymentInfo.setUnitName(fund.getUnitNameFund());
+
 							if (Common.isNotNull(tProvidentFund)) {
 								paymentInfo.setInauguralTeam(tProvidentFund.getInauguralTeam());
 								paymentInfo.setEmpNo(tProvidentFund.getEmpNo());
@@ -1902,8 +1909,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					payExists.setEmpId(socialInfo.getEmpId());
 					payExists.setEmpIdcard(socialInfo.getEmpIdcard());
 					payExists.setEmpName(socialInfo.getEmpName());
-					payExists.setSettleDomainId(socialInfo.getSettleDomainName());
-					payExists.setUnitId(socialInfo.getUnitName());
+					payExists.setSettleDomainId(socialInfo.getSettleDomain());
+					payExists.setSettleDomainName(socialInfo.getSettleDomainName());
+					payExists.setSettleDomainCode(socialInfo.getSettleDomainCode());
+					payExists.setUnitId(socialInfo.getUnitId());
+					payExists.setUnitName(socialInfo.getUnitName());
 					if (Common.isNotNull(tSocialInfo)) {
 						payExists.setInauguralTeam(tSocialInfo.getInauguralTeam());
 						payExists.setEmpNo(tSocialInfo.getEmpNo());

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

@@ -29,6 +29,9 @@
 		<result property="empId" column="EMP_ID"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>
 		<result property="unitId" column="UNIT_ID"/>
+		<result property="unitName" column="UNIT_NAME"/>
+		<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
+		<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
 		<result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
 		<result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
 		<result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>
@@ -109,6 +112,9 @@
                 a.EMP_ID,
                 a.EMP_IDCARD,
                 a.UNIT_ID,
+                a.UNIT_NAME,
+                a.SETTLE_DOMAIN_CODE,
+                a.SETTLE_DOMAIN_NAME,
                 a.SETTLE_DOMAIN_ID,
                 a.SOCIAL_HOUSEHOLD,
                 a.SOCIAL_SECURITY_NO,
@@ -192,6 +198,9 @@
         a.EMP_ID,
         a.EMP_IDCARD,
         a.UNIT_ID,
+        a.UNIT_NAME,
+        a.SETTLE_DOMAIN_CODE,
+        a.SETTLE_DOMAIN_NAME,
         a.SETTLE_DOMAIN_ID,
         a.SOCIAL_HOUSEHOLD,
         a.SOCIAL_SECURITY_NO,
@@ -283,6 +292,15 @@
 			<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tPaymentInfo.unitId}
 			</if>
+			<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
+				AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
+			</if>
+			<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
+				AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
+			</if>
+			<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
+				AND a.UNIT_NAME = #{tPaymentInfo.unitName}
+			</if>
 			<if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
 				AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
 			</if>
@@ -296,10 +314,10 @@
 				AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
 			</if>
 			<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
-				AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
+				AND (a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
 			</if>
 			<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
-				AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
+				AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
 			</if>
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
@@ -310,12 +328,6 @@
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
 			</if>
-			<if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
-				AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
-			</if>
-			<if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
-				AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
-			</if>
 			<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
 				AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
 			</if>
@@ -524,6 +536,15 @@
 			<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tPaymentInfo.unitId}
 			</if>
+			<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
+				AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
+			</if>
+			<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
+				AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
+			</if>
+			<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
+				AND a.UNIT_NAME = #{tPaymentInfo.unitName}
+			</if>
 			<if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
 				AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
 			</if>
@@ -537,10 +558,10 @@
 				AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
 			</if>
 			<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
-				AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
+				AND (a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
 			</if>
 			<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
-				AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
+				AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
 			</if>
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
@@ -548,12 +569,6 @@
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
 			</if>
-			<if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
-				AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
-			</if>
-			<if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
-				AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
-			</if>
 			<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
 				AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
 			</if>
@@ -753,6 +768,9 @@
 		<result property="empId" column="EMP_ID"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>
 		<result property="unitId" column="UNIT_ID"/>
+		<result property="unitName" column="UNIT_NAME"/>
+		<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
+		<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
 		<result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
 		<result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
 		<result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>