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
5cef4e44
Commit
5cef4e44
authored
May 07, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.3-HCM HCM的出差接口-历史单子出行工具、人员,置为空,人数为1
parent
49e64045
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+26
-18
No files found.
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
5cef4e44
...
...
@@ -16,10 +16,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.EkpQiwiChuchai
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.QiWeiUserVo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
org.apache.commons.codec.binary.Hex
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
...
...
@@ -27,9 +23,6 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio
import
org.springframework.stereotype.Service
;
import
org.springframework.web.client.RestTemplate
;
import
java.nio.charset.StandardCharsets
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.text.SimpleDateFormat
;
import
java.time.*
;
import
java.time.format.DateTimeFormatter
;
...
...
@@ -281,6 +274,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
String
tools
;
String
dataSource
=
"HCM"
;
DateTimeFormatter
df
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
List
<
JSONObject
>
toolList
;
for
(
JSONObject
datas
:
dataList
)
{
person
=
null
;
renShu
=
1
;
...
...
@@ -307,19 +301,33 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
formData
=
JSON
.
parseObject
(
datas
.
getString
(
"formData"
));
try
{
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
;
toolList
=
JSON
.
parseArray
(
formData
.
getString
(
"随行人员"
),
JSONObject
.
class
);
int
i
=
0
;
if
(
toolList
!=
null
&&
!
toolList
.
isEmpty
())
{
for
(
JSONObject
tool
:
toolList
)
{
if
(
i
++
==
0
)
{
person
=
tool
.
getString
(
"name"
);
}
else
{
person
+=
","
+
tool
.
getString
(
"name"
);
}
renShu
++;
}
}
else
{
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
);
int
i
=
0
;
toolList
=
JSON
.
parseArray
(
formData
.
getString
(
"出行工具"
),
JSONObject
.
class
);
i
=
0
;
if
(
toolList
!=
null
&&
!
toolList
.
isEmpty
())
{
for
(
JSONObject
tool
:
toolList
)
{
if
(
i
++
==
0
)
{
...
...
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