Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
9b849b6c
Commit
9b849b6c
authored
Oct 09, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
753a253b
3d20c4ee
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
56 additions
and
297 deletions
+56
-297
TEmployeeInfoMapper.java
...oud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
+5
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+7
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+15
-3
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+4
-4
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+0
-40
TPaymentInfoVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
+0
-40
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+25
-207
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
View file @
9b849b6c
...
...
@@ -41,9 +41,12 @@ public interface TEmployeeInfoMapper extends BaseMapper<TEmployeeInfo> {
IPage
<
TEmployeeInfo
>
getPage
(
Page
<
TEmployeeInfo
>
page
,
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
);
long
getLeavePageCount
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
);
long
getLeavePageCount
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
,
@Param
(
"idList"
)
List
<
String
>
idList
);
List
<
TEmployeeInfo
>
getLeavePage
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
,
@Param
(
"page"
)
Long
page
,
@Param
(
"size"
)
Long
size
);
List
<
String
>
getProjectEmpId
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
);
List
<
TEmployeeInfo
>
getLeavePage
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
,
@Param
(
"page"
)
Long
page
,
@Param
(
"size"
)
Long
size
);
List
<
TEmployeeInfo
>
getList
(
@Param
(
"tEmployeeInfo"
)
TEmployeeInfo
tEmployeeInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
9b849b6c
...
...
@@ -94,7 +94,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
@Override
public
IPage
<
TEmployeeInfo
>
getLeavePage
(
Page
<
TEmployeeInfo
>
page
,
TEmployeeInfo
employeeInfo
)
{
long
leavePageCount
=
baseMapper
.
getLeavePageCount
(
employeeInfo
);
List
<
String
>
projectList
=
baseMapper
.
getProjectEmpId
(
employeeInfo
);
long
leavePageCount
;
if
(
projectList
.
isEmpty
())
{
leavePageCount
=
0L
;
}
else
{
leavePageCount
=
baseMapper
.
getLeavePageCount
(
employeeInfo
,
projectList
);
}
page
.
setTotal
(
leavePageCount
);
if
(
leavePageCount
>
0L
)
{
page
.
setPages
((
long
)
Math
.
ceil
(
leavePageCount
/
page
.
getSize
()));
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
9b849b6c
...
...
@@ -593,11 +593,23 @@
SELECT
count(1)
FROM t_employee_info a
LEFT JOIN t_employee_project b
ON a.id = b.EMP_ID
where 1=1
and a.DELETE_FLAG = '0'
<include
refid=
"employeeInfo_where"
/>
<if
test=
"idList != null and idList.size>0"
>
AND a.id in
<foreach
item=
"idStr"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
</select>
<select
id=
"getProjectEmpId"
resultType=
"java.lang.String"
>
SELECT
b.EMP_ID
FROM t_employee_project b
where 1=1
AND b.DELETE_FLAG = '0'
<if
test=
"tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''"
>
AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
</if>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
9b849b6c
...
...
@@ -377,10 +377,10 @@
<if
test=
"tEmployeeProject.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
</if>
<if
test=
"tEmployeeProject.
file
City != null"
>
<if
test=
"tEmployeeProject.
social
City != null"
>
AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
</if>
<if
test=
"tEmployeeProject.
file
Town != null"
>
<if
test=
"tEmployeeProject.
social
Town != null"
>
AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
</if>
<if
test=
"tEmployeeProject.empNatureArray != null"
>
...
...
@@ -528,10 +528,10 @@
<if
test=
"tEmployeeProject.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
</if>
<if
test=
"tEmployeeProject.
file
City != null"
>
<if
test=
"tEmployeeProject.
social
City != null"
>
AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
</if>
<if
test=
"tEmployeeProject.
file
Town != null"
>
<if
test=
"tEmployeeProject.
social
Town != null"
>
AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
</if>
<if
test=
"tEmployeeProject.idList != null"
>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
9b849b6c
...
...
@@ -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 @
9b849b6c
...
...
@@ -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 @
9b849b6c
...
...
@@ -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,
...
...
@@ -189,6 +179,30 @@
a.CREATE_NAME,
a.CREATE_TIME
</sql>
<sql
id=
"Base_Column_List1"
>
a.ID,
a.EMP_NAME,
a.EMP_NO,
a.EMP_IDCARD,
a.UNIT_NAME,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO,
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.PUSH_STATUS,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH,
a.PROVIDENT_HOUSEHOLD,
a.PROVIDENT_PAY_ADDR,
a.SOCIAL_SUM,
a.PROVIDENT_SUM,
a.CREATE_NAME
</sql>
<sql
id=
"base_column_list_all"
>
a.ID,
a.EMP_NAME,
...
...
@@ -205,12 +219,7 @@
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.CREATE_BY,
a.UPDATE_TIME,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.LOCK_STATUS,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH,
...
...
@@ -222,14 +231,9 @@
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.SOCIAL_ID,
a.FUND_ID,
a.SOCIAL_SUM,
a.UNIT_SOCIAL_SUM,
a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM,
a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL,
...
...
@@ -278,27 +282,15 @@
<if
test=
"tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''"
>
AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%')
</if>
<if
test=
"tPaymentInfo.empId != null and tPaymentInfo.empId.trim() != ''"
>
AND a.EMP_ID = #{tPaymentInfo.empId}
</if>
<if
test=
"tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
</if>
<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>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD like CONCAT(#{tPaymentInfo.socialHousehold},'%')
</if>
...
...
@@ -314,15 +306,9 @@
<if
test=
"tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"
>
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}
</if>
<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}
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if>
...
...
@@ -348,159 +334,9 @@
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
<if
test=
"tPaymentInfo.socialId != null and tPaymentInfo.socialId.trim() != ''"
>
AND a.SOCIAL_ID = #{tPaymentInfo.socialId}
</if>
<if
test=
"tPaymentInfo.fundId != null and tPaymentInfo.fundId.trim() != ''"
>
AND a.FUND_ID = #{tPaymentInfo.fundId}
</if>
<if
test=
"tPaymentInfo.socialSum != null"
>
AND a.SOCIAL_SUM = #{tPaymentInfo.socialSum}
</if>
<if
test=
"tPaymentInfo.unitSocialSum != null"
>
AND a.UNIT_SOCIAL_SUM = #{tPaymentInfo.unitSocialSum}
</if>
<if
test=
"tPaymentInfo.socialSecurityPersonalSum != null"
>
AND a.SOCIAL_SECURITY_PERSONAL_SUM = #{tPaymentInfo.socialSecurityPersonalSum}
</if>
<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>
<if
test=
"tPaymentInfo.personalAccrual != null"
>
AND a.PERSONAL_ACCRUAL = #{tPaymentInfo.personalAccrual}
</if>
<if
test=
"tPaymentInfo.unitPensionSet != null"
>
AND a.UNIT_PENSION_SET = #{tPaymentInfo.unitPensionSet}
</if>
<if
test=
"tPaymentInfo.unitMedicalSet != null"
>
AND a.UNIT_MEDICAL_SET = #{tPaymentInfo.unitMedicalSet}
</if>
<if
test=
"tPaymentInfo.unitUnemploymentSet != null"
>
AND a.UNIT_UNEMPLOYMENT_SET = #{tPaymentInfo.unitUnemploymentSet}
</if>
<if
test=
"tPaymentInfo.unitInjurySet != null"
>
AND a.UNIT_INJURY_SET = #{tPaymentInfo.unitInjurySet}
</if>
<if
test=
"tPaymentInfo.unitBirthSet != null"
>
AND a.UNIT_BIRTH_SET = #{tPaymentInfo.unitBirthSet}
</if>
<if
test=
"tPaymentInfo.unitPensionPer != null"
>
AND a.UNIT_PENSION_PER = #{tPaymentInfo.unitPensionPer}
</if>
<if
test=
"tPaymentInfo.unitMedicalPer != null"
>
AND a.UNIT_MEDICAL_PER = #{tPaymentInfo.unitMedicalPer}
</if>
<if
test=
"tPaymentInfo.unitUnemploymentPer != null"
>
AND a.UNIT_UNEMPLOYMENT_PER = #{tPaymentInfo.unitUnemploymentPer}
</if>
<if
test=
"tPaymentInfo.unitInjuryPer != null"
>
AND a.UNIT_INJURY_PER = #{tPaymentInfo.unitInjuryPer}
</if>
<if
test=
"tPaymentInfo.unitBirthPer != null"
>
AND a.UNIT_BIRTH_PER = #{tPaymentInfo.unitBirthPer}
</if>
<if
test=
"tPaymentInfo.personalPensionPer != null"
>
AND a.PERSONAL_PENSION_PER = #{tPaymentInfo.personalPensionPer}
</if>
<if
test=
"tPaymentInfo.personalMedicalPer != null"
>
AND a.PERSONAL_MEDICAL_PER = #{tPaymentInfo.personalMedicalPer}
</if>
<if
test=
"tPaymentInfo.personalUnemploymentPer != null"
>
AND a.PERSONAL_UNEMPLOYMENT_PER = #{tPaymentInfo.personalUnemploymentPer}
</if>
<if
test=
"tPaymentInfo.unitBigailmentPer != null"
>
AND a.UNIT_BIGAILMENT_PER = #{tPaymentInfo.unitBigailmentPer}
</if>
<if
test=
"tPaymentInfo.personalBigailmentPer != null"
>
AND a.PERSONAL_BIGAILMENT_PER = #{tPaymentInfo.personalBigailmentPer}
</if>
<if
test=
"tPaymentInfo.unitPensionMoney != null"
>
AND a.UNIT_PENSION_MONEY = #{tPaymentInfo.unitPensionMoney}
</if>
<if
test=
"tPaymentInfo.unitMedicalMoney != null"
>
AND a.UNIT_MEDICAL_MONEY = #{tPaymentInfo.unitMedicalMoney}
</if>
<if
test=
"tPaymentInfo.unitUnemploymentMoney != null"
>
AND a.UNIT_UNEMPLOYMENT_MONEY = #{tPaymentInfo.unitUnemploymentMoney}
</if>
<if
test=
"tPaymentInfo.unitInjuryMoney != null"
>
AND a.UNIT_INJURY_MONEY = #{tPaymentInfo.unitInjuryMoney}
</if>
<if
test=
"tPaymentInfo.unitBirthMoney != null"
>
AND a.UNIT_BIRTH_MONEY = #{tPaymentInfo.unitBirthMoney}
</if>
<if
test=
"tPaymentInfo.unitBigmailmentMoney != null"
>
AND a.UNIT_BIGMAILMENT_MONEY = #{tPaymentInfo.unitBigmailmentMoney}
</if>
<if
test=
"tPaymentInfo.personalPensionMoney != null"
>
AND a.PERSONAL_PENSION_MONEY = #{tPaymentInfo.personalPensionMoney}
</if>
<if
test=
"tPaymentInfo.personalMedicalMoney != null"
>
AND a.PERSONAL_MEDICAL_MONEY = #{tPaymentInfo.personalMedicalMoney}
</if>
<if
test=
"tPaymentInfo.personalUnemploymentMoney != null"
>
AND a.PERSONAL_UNEMPLOYMENT_MONEY = #{tPaymentInfo.personalUnemploymentMoney}
</if>
<if
test=
"tPaymentInfo.personalBigmailmentMoney != null"
>
AND a.PERSONAL_BIGMAILMENT_MONEY = #{tPaymentInfo.personalBigmailmentMoney}
</if>
<if
test=
"tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''"
>
AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
</if>
<if
test=
"tPaymentInfo.unitProvidentSet != null"
>
AND a.UNIT_PROVIDENT_SET = #{tPaymentInfo.unitProvidentSet}
</if>
<if
test=
"tPaymentInfo.providentPercent != null"
>
AND a.PROVIDENT_PERCENT = #{tPaymentInfo.providentPercent}
</if>
<if
test=
"tPaymentInfo.unitProvidentSum != null"
>
AND a.UNIT_PROVIDENT_SUM = #{tPaymentInfo.unitProvidentSum}
</if>
<if
test=
"tPaymentInfo.personalProidentSet != null"
>
AND a.PERSONAL_PROIDENT_SET = #{tPaymentInfo.personalProidentSet}
</if>
<if
test=
"tPaymentInfo.personalProvidentSum != null"
>
AND a.PERSONAL_PROVIDENT_SUM = #{tPaymentInfo.personalProvidentSum}
</if>
<if
test=
"tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''"
>
AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if>
<if
test=
"tPaymentInfo.updateTime != null"
>
AND a.UPDATE_TIME = #{tPaymentInfo.updateTime}
</if>
<if
test=
"tPaymentInfo.updateBy != null and tPaymentInfo.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tPaymentInfo.updateBy}
</if>
<if
test=
"tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tPaymentInfo.createName}
</if>
<if
test=
"tPaymentInfo.createTime != null"
>
AND a.CREATE_TIME = #{tPaymentInfo.createTime}
</if>
</if>
</sql>
...
...
@@ -616,27 +452,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 +605,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,12 +656,11 @@
<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"
>
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List
1
"
/>
FROM t_payment_info a
<where>
1=1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment