Skip to content

Y
yifu-mvp
Commit cd7adf9e authored by huyuchen's avatar huyuchen
Browse files
Options

线上问题修改

parent fac52be1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 124 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @ cd7adf9e
......@@ -313,22 +313,6 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty("公积金总合计")
private BigDecimal providentSum;
/**
* 社保核准表ID
*/
@ExcelAttribute(name = "社保核准表ID" )
@Schema(description ="社保核准表ID")
@ExcelProperty("社保核准表ID")
private String socialSettlementId;
/**
* 公积金核准表ID
*/
@ExcelAttribute(name = "公积金核准表ID" )
@Schema(description ="公积金核准表ID")
@ExcelProperty("公积金核准表ID")
private String fundSettlementId;
/**
* 就职班组
*/
......@@ -337,14 +321,6 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty("就职班组")
private String inauguralTeam;
/**
* 电信编号
*/
@ExcelAttribute(name = "电信编号" )
@Schema(description ="电信编号")
@ExcelProperty("电信编号")
private String telecomNumber;
/**
* 排序字段
*/
......@@ -353,22 +329,6 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty("排序字段")
private String sortTime;
/**
* 代理结算id
*/
@ExcelAttribute(name = "代理结算id" )
@Schema(description ="代理结算id")
@ExcelProperty("代理结算id")
private String agentId;
/**
* 财务账单ID
*/
@ExcelAttribute(name = "财务账单ID" )
@Schema(description ="财务账单ID")
@ExcelProperty("财务账单ID")
private String financeBillId;
/**
* 推送状态
*/
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
View file @ cd7adf9e
......@@ -293,22 +293,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@Schema(description = "公积金总合计")
@ExcelProperty("公积金总合计")
private BigDecimal providentSum;
/**
* 社保核准表ID
*/
@Length(max = 32, message = "社保核准表ID 不能超过32 个字符")
@ExcelAttribute(name = "社保核准表ID", maxLength = 32)
@Schema(description = "社保核准表ID")
@ExcelProperty("社保核准表ID")
private String socialSettlementId;
/**
* 公积金核准表ID
*/
@Length(max = 32, message = "公积金核准表ID 不能超过32 个字符")
@ExcelAttribute(name = "公积金核准表ID", maxLength = 32)
@Schema(description = "公积金核准表ID")
@ExcelProperty("公积金核准表ID")
private String fundSettlementId;
/**
* 就职班组
*/
......@@ -317,14 +301,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@Schema(description = "就职班组")
@ExcelProperty("就职班组")
private String inauguralTeam;
/**
* 电信编号
*/
@Length(max = 50, message = "电信编号 不能超过50 个字符")
@ExcelAttribute(name = "电信编号", maxLength = 50)
@Schema(description = "电信编号")
@ExcelProperty("电信编号")
private String telecomNumber;
/**
* 排序字段
*/
......@@ -333,22 +309,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@Schema(description = "排序字段")
@ExcelProperty("排序字段")
private String sortTime;
/**
* 代理结算id
*/
@Length(max = 32, message = "代理结算id 不能超过32 个字符")
@ExcelAttribute(name = "代理结算id", maxLength = 32)
@Schema(description = "代理结算id")
@ExcelProperty("代理结算id")
private String agentId;
/**
* 财务账单ID
*/
@Length(max = 32, message = "财务账单ID 不能超过32 个字符")
@ExcelAttribute(name = "财务账单ID", maxLength = 32)
@Schema(description = "财务账单ID")
@ExcelProperty("财务账单ID")
private String financeBillId;
/**
* 单位补缴利息
*/
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ cd7adf9e
......@@ -57,13 +57,8 @@
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
<result property="providentSum" column="PROVIDENT_SUM"/>
<result property="socialSettlementId" column="SOCIAL_SETTLEMENT_ID"/>
<result property="fundSettlementId" column="FUND_SETTLEMENT_ID"/>
<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
<result property="telecomNumber" column="TELECOM_NUMBER"/>
<result property="sortTime" column="SORT_TIME"/>
<result property="agentId" column="AGENT_ID"/>
<result property="financeBillId" column="FINANCE_BILL_ID"/>
<result property="companyAccrual" column="COMPANY_ACCRUAL"/>
<result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
<result property="unitPensionSet" column="UNIT_PENSION_SET"/>
......@@ -141,15 +136,10 @@
a.UNIT_SOCIAL_SUM,
a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM,
a.SOCIAL_SETTLEMENT_ID,
a.FUND_SETTLEMENT_ID,
a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.SORT_TIME,
a.AGENT_ID,
a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG,
a.FINANCE_BILL_ID,
a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL,
a.UNIT_PENSION_SET,
......@@ -229,7 +219,6 @@
a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM,
a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL,
......@@ -366,27 +355,12 @@
<if test="tPaymentInfo.providentSum != null">
AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum}
</if>
<if test="tPaymentInfo.socialSettlementId != null and tPaymentInfo.socialSettlementId.trim() != ''">
AND a.SOCIAL_SETTLEMENT_ID = #{tPaymentInfo.socialSettlementId}
</if>
<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
</if>
<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
</if>
<if test="tPaymentInfo.telecomNumber != null and tPaymentInfo.telecomNumber.trim() != ''">
AND a.TELECOM_NUMBER = #{tPaymentInfo.telecomNumber}
</if>
<if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
AND a.SORT_TIME = #{tPaymentInfo.sortTime}
</if>
<if test="tPaymentInfo.agentId != null and tPaymentInfo.agentId.trim() != ''">
AND a.AGENT_ID = #{tPaymentInfo.agentId}
</if>
<if test="tPaymentInfo.financeBillId != null and tPaymentInfo.financeBillId.trim() != ''">
AND a.FINANCE_BILL_ID = #{tPaymentInfo.financeBillId}
</if>
<if test="tPaymentInfo.companyAccrual != null">
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
</if>
......@@ -616,27 +590,12 @@
<if test="tPaymentInfo.providentSum != null">
AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum}
</if>
<if test="tPaymentInfo.socialSettlementId != null and tPaymentInfo.socialSettlementId.trim() != ''">
AND a.SOCIAL_SETTLEMENT_ID = #{tPaymentInfo.socialSettlementId}
</if>
<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
</if>
<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
</if>
<if test="tPaymentInfo.telecomNumber != null and tPaymentInfo.telecomNumber.trim() != ''">
AND a.TELECOM_NUMBER = #{tPaymentInfo.telecomNumber}
</if>
<if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
AND a.SORT_TIME = #{tPaymentInfo.sortTime}
</if>
<if test="tPaymentInfo.agentId != null and tPaymentInfo.agentId.trim() != ''">
AND a.AGENT_ID = #{tPaymentInfo.agentId}
</if>
<if test="tPaymentInfo.financeBillId != null and tPaymentInfo.financeBillId.trim() != ''">
AND a.FINANCE_BILL_ID = #{tPaymentInfo.financeBillId}
</if>
<if test="tPaymentInfo.companyAccrual != null">
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
</if>
......@@ -784,8 +743,6 @@
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
<result property="providentSum" column="PROVIDENT_SUM"/>
<result property="socialSettlementId" column="SOCIAL_SETTLEMENT_ID"/>
<result property="fundSettlementId" column="FUND_SETTLEMENT_ID"/>
<result property="companyAccrual" column="COMPANY_ACCRUAL"/>
<result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
......@@ -837,7 +794,6 @@
<result property="fundCity" column="FUND_CITY"/>
<result property="fundTown" column="FUND_TOWN"/>
<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
<result property="telecomNumber" column="TELECOM_NUMBER"/>
</resultMap>
<!--tPaymentInfo简单分页查询-->
<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">
......
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