Skip to content

Y
yifu-mvp
Commit d9ec7f77 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

# Conflicts:
#	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
#	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
parents 3c182adc cd7adf9e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 44 deletions
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ d9ec7f77
...@@ -57,13 +57,8 @@ ...@@ -57,13 +57,8 @@
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/> <result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/> <result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
<result property="providentSum" column="PROVIDENT_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="inauguralTeam" column="INAUGURAL_TEAM"/>
<result property="telecomNumber" column="TELECOM_NUMBER"/>
<result property="sortTime" column="SORT_TIME"/> <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="companyAccrual" column="COMPANY_ACCRUAL"/>
<result property="personalAccrual" column="PERSONAL_ACCRUAL"/> <result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
<result property="unitPensionSet" column="UNIT_PENSION_SET"/> <result property="unitPensionSet" column="UNIT_PENSION_SET"/>
...@@ -141,15 +136,10 @@ ...@@ -141,15 +136,10 @@
a.UNIT_SOCIAL_SUM, a.UNIT_SOCIAL_SUM,
a.SOCIAL_SECURITY_PERSONAL_SUM, a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM, a.PROVIDENT_SUM,
a.SOCIAL_SETTLEMENT_ID,
a.FUND_SETTLEMENT_ID,
a.INAUGURAL_TEAM, a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.SORT_TIME, a.SORT_TIME,
a.AGENT_ID,
a.SALARY_SOCIAL_FLAG, a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG, a.SALARY_FUND_FLAG,
a.FINANCE_BILL_ID,
a.COMPANY_ACCRUAL, a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL, a.PERSONAL_ACCRUAL,
a.UNIT_PENSION_SET, a.UNIT_PENSION_SET,
...@@ -229,7 +219,6 @@ ...@@ -229,7 +219,6 @@
a.SOCIAL_SECURITY_PERSONAL_SUM, a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM, a.PROVIDENT_SUM,
a.INAUGURAL_TEAM, a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.COMPANY_ACCRUAL, a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL, a.PERSONAL_ACCRUAL,
...@@ -366,27 +355,12 @@ ...@@ -366,27 +355,12 @@
<if test="tPaymentInfo.providentSum != null"> <if test="tPaymentInfo.providentSum != null">
AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum} AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum}
</if> </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() != ''"> <if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam} AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
</if> </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() != ''"> <if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
AND a.SORT_TIME = #{tPaymentInfo.sortTime} AND a.SORT_TIME = #{tPaymentInfo.sortTime}
</if> </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"> <if test="tPaymentInfo.companyAccrual != null">
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual} AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
</if> </if>
...@@ -616,27 +590,12 @@ ...@@ -616,27 +590,12 @@
<if test="tPaymentInfo.providentSum != null"> <if test="tPaymentInfo.providentSum != null">
AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum} AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum}
</if> </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() != ''"> <if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam} AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
</if> </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() != ''"> <if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
AND a.SORT_TIME = #{tPaymentInfo.sortTime} AND a.SORT_TIME = #{tPaymentInfo.sortTime}
</if> </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"> <if test="tPaymentInfo.companyAccrual != null">
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual} AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
</if> </if>
...@@ -784,8 +743,6 @@ ...@@ -784,8 +743,6 @@
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/> <result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/> <result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
<result property="providentSum" column="PROVIDENT_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="companyAccrual" column="COMPANY_ACCRUAL"/>
<result property="personalAccrual" column="PERSONAL_ACCRUAL"/> <result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
...@@ -837,7 +794,6 @@ ...@@ -837,7 +794,6 @@
<result property="fundCity" column="FUND_CITY"/> <result property="fundCity" column="FUND_CITY"/>
<result property="fundTown" column="FUND_TOWN"/> <result property="fundTown" column="FUND_TOWN"/>
<result property="inauguralTeam" column="INAUGURAL_TEAM"/> <result property="inauguralTeam" column="INAUGURAL_TEAM"/>
<result property="telecomNumber" column="TELECOM_NUMBER"/>
</resultMap> </resultMap>
<!--tPaymentInfo简单分页查询--> <!--tPaymentInfo简单分页查询-->
<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap"> <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