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
1e1d4727
Commit
1e1d4727
authored
Mar 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
4697c4a9
939e6507
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+1
-0
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+5
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
1e1d4727
...
...
@@ -462,6 +462,7 @@ public class TSettleDomainController {
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
}
log
.
error
(
"jsonStr:"
+
jsonStr
);
List
<
TDomainUpCsVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TDomainUpCsVo
.
class
);
return
tSettleDomainService
.
updateProjectCsInfo
(
list
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
1e1d4727
...
...
@@ -193,7 +193,8 @@
a.NEW_LINE,
a.DIVISION,
a.cs_name,
a.cs_phone
a.cs_phone,
a.cs_login_name
</sql>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
...
...
@@ -232,6 +233,7 @@
<result
property=
"csName"
column=
"cs_name"
/>
<result
property=
"csPhone"
column=
"cs_phone"
/>
<result
property=
"csLoginName"
column=
"cs_login_name"
/>
</resultMap>
<select
id=
"getPage"
resultMap=
"tSettleDomainMap"
>
...
...
@@ -431,7 +433,8 @@
a.NEW_LINE,
a.DIVISION,
a.cs_name,
a.cs_phone
a.cs_phone,
a.cs_login_name
FROM
t_settle_domain a
<if
test=
"userId != null and userId.trim() != '-999'"
>
...
...
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