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
e63828ca
Commit
e63828ca
authored
May 07, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.3-HCM HCM的出差接口-历史单子出行工具、人员,置为空,人数为1
parent
3ecb59a2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
19 deletions
+29
-19
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+29
-19
No files found.
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
e63828ca
...
...
@@ -278,9 +278,13 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
int
renShu
;
int
renShu1
;
int
renShu2
;
String
tools
;
String
dataSource
=
"HCM"
;
DateTimeFormatter
df
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
for
(
JSONObject
datas
:
dataList
)
{
person
=
null
;
renShu
=
1
;
tools
=
null
;
reimburse
=
new
EkpQiwiChuchai
();
reimburse
.
setFdDataSource
(
dataSource
);
if
(
Common
.
isNotNull
(
datas
.
getString
(
"applyTimeFormat"
)))
{
...
...
@@ -301,28 +305,34 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
if
(
Common
.
isNotNull
(
datas
.
getString
(
"formData"
)))
{
formData
=
JSON
.
parseObject
(
datas
.
getString
(
"formData"
));
person
=
formData
.
getString
(
"随行人员"
);
renShu
=
1
;
if
(
Common
.
isNotNull
(
person
))
{
renShu1
=
person
.
split
(
","
).
length
;
renShu2
=
person
.
split
(
","
).
length
;
if
(
renShu1
>
renShu2
)
{
renShu
+=
renShu1
;
}
else
{
renShu
+=
renShu2
;
}
}
List
<
JSONObject
>
toolList
=
JSON
.
parseArray
(
formData
.
getString
(
"出行工具"
),
JSONObject
.
class
);
String
tools
=
null
;
int
i
=
0
;
if
(
toolList
!=
null
&&
!
toolList
.
isEmpty
())
{
for
(
JSONObject
tool
:
toolList
)
{
if
(
i
++
==
0
)
{
tools
=
tool
.
getString
(
"label"
);
try
{
person
=
formData
.
getString
(
"随行人员"
);
renShu
=
1
;
if
(
Common
.
isNotNull
(
person
))
{
renShu1
=
person
.
split
(
","
).
length
;
renShu2
=
person
.
split
(
","
).
length
;
if
(
renShu1
>
renShu2
)
{
renShu
+=
renShu1
;
}
else
{
tools
+=
";"
+
tool
.
getString
(
"label"
);
renShu
+=
renShu2
;
}
}
List
<
JSONObject
>
toolList
=
JSON
.
parseArray
(
formData
.
getString
(
"出行工具"
),
JSONObject
.
class
);
int
i
=
0
;
if
(
toolList
!=
null
&&
!
toolList
.
isEmpty
())
{
for
(
JSONObject
tool
:
toolList
)
{
if
(
i
++
==
0
)
{
tools
=
tool
.
getString
(
"label"
);
}
else
{
tools
+=
","
+
tool
.
getString
(
"label"
);
}
}
}
}
catch
(
Exception
e
)
{
person
=
"-"
;
renShu
=
1
;
tools
=
null
;
}
reimburse
.
setFdRenShu
(
renShu
);
reimburse
.
setFdPerson
(
person
);
...
...
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