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
a1109621
Commit
a1109621
authored
Dec 10, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
历史缺陷修复-fxj
parent
b6c29dfc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
TCustomerInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TCustomerInfo.java
+3
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-7
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TCustomerInfo.java
View file @
a1109621
...
@@ -17,10 +17,12 @@
...
@@ -17,10 +17,12 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
jdk.nashorn.internal.ir.annotations.Ignore
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -251,6 +253,7 @@ public class TCustomerInfo extends BaseEntity {
...
@@ -251,6 +253,7 @@ public class TCustomerInfo extends BaseEntity {
@Schema
(
description
=
"账户余额"
)
@Schema
(
description
=
"账户余额"
)
private
BigDecimal
balance
;
private
BigDecimal
balance
;
@TableField
(
exist
=
false
)
private
List
<
String
>
customerIds
;
private
List
<
String
>
customerIds
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
a1109621
...
@@ -467,13 +467,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -467,13 +467,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getSubjectDepart
()))
{
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getSubjectDepart
()))
{
tEmployeeContractInfo
.
setSubjectDepart
(
settleDomain
.
getDepartName
());
tEmployeeContractInfo
.
setSubjectDepart
(
settleDomain
.
getDepartName
());
tEmployeeContractInfo
.
setDeptNo
(
settleDomain
.
getDepartNo
());
tEmployeeContractInfo
.
setDeptNo
(
settleDomain
.
getDepartNo
());
}
tEmployeeContractInfo
.
setSubjectUnit
(
settleDomain
.
getCustomerName
());
if
(
null
!=
settleDomain
.
getCustomerId
()
&&
Common
.
isEmpty
(
tEmployeeContractInfo
.
getSubjectUnit
()))
{
tEmployeeContractInfo
.
setUnitNo
(
settleDomain
.
getCustomerNo
());
TCustomerInfo
customerInfo
=
tCustomerInfoService
.
getById
(
settleDomain
.
getCustomerId
());
if
(
null
!=
customerInfo
)
{
tEmployeeContractInfo
.
setSubjectUnit
(
customerInfo
.
getCustomerName
());
tEmployeeContractInfo
.
setUnitNo
(
customerInfo
.
getCustomerCode
());
}
}
}
}
}
}
}
...
...
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