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
f55cfbe9
Commit
f55cfbe9
authored
Nov 15, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
138578ef
a4812b95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
5 deletions
+26
-5
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+4
-4
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+22
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
f55cfbe9
...
...
@@ -185,12 +185,12 @@ public class TPaymentInfo extends BaseEntity {
private
String
socialCreateMonth
;
/**
*
锁定状态 0 未锁定 1 锁定
*
确认无误状态 0 未确认 1 已确认
*/
@ExcelAttribute
(
name
=
"
锁定状态 0 未锁定 1 锁定
"
)
@Schema
(
description
=
"
锁定状态 0 未锁定 1 锁定
"
)
@ExcelAttribute
(
name
=
"
确认无误状态 0 未确认 1 已确认
"
)
@Schema
(
description
=
"
确认无误状态 0 未确认 1 已确认
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"
锁定状态 0 未锁定 1 锁定
"
)
@ExcelProperty
(
"
确认无误状态 0 未确认 1 已确认
"
)
private
String
lockStatus
;
/**
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
f55cfbe9
...
...
@@ -631,7 +631,28 @@
<!--tPaymentInfo简单分页查询-->
<select
id=
"getTPaymentInfoPage"
resultMap=
"tPaymentInfoMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
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.LOCK_STATUS,
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,
a.CREATE_TIME
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