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
Expand all
Hide 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
...
...
@@ -592,12 +592,24 @@
<select
id=
"getLeavePageCount"
resultType=
"java.lang.Long"
>
SELECT
count(1)
FROM t_employee_info a
LEFT JOIN t_employee_project b
ON a.id = b.EMP_ID
FROM t_employee_info a
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
This diff is collapsed.
Click to expand it.
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