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
9ffc22d9
Commit
9ffc22d9
authored
Jan 11, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
B端调优---社保查询BUG & 结算列表调试
parent
c4a405a2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
TBusSettleServiceImpl.java
...1/business/service/settle/impl/TBusSettleServiceImpl.java
+3
-1
application.yml
...ness/yifu-business-biz/src/main/resources/application.yml
+6
-1
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+5
-5
No files found.
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/settle/impl/TBusSettleServiceImpl.java
View file @
9ffc22d9
...
...
@@ -101,11 +101,13 @@ public class TBusSettleServiceImpl extends ServiceImpl<TBusSettleMapper, TBusSet
File
etractFile
=
null
;
try
{
String
fileType
=
FileTypeUtil
.
getType
(
file
.
getInputStream
());
if
(!
StringUtils
.
equalsIgnoreCase
(
fileType
,
CommonConstants
.
ZIP
_TYPE
))
{
if
(!
StringUtils
.
equalsIgnoreCase
(
fileType
,
CommonConstants
.
JAR
_TYPE
))
{
return
R
.
failed
(
"导入的文件格式不正确"
);
}
String
[]
destoryName
=
StringUtils
.
split
(
StringUtils
.
removeEndIgnoreCase
(
file
.
getOriginalFilename
()
.
replace
(
".jar"
,
""
)
.
replace
(
".zip"
,
""
)
,
CommonConstants
.
SPOT
.
concat
(
fileType
)),
CommonConstants
.
DOWN_LINE_CHAR
);
if
(
null
!=
destoryName
&&
destoryName
.
length
==
2
)
{
TBusSettle
busSettle
=
this
.
lambdaQuery
()
...
...
yifu-business/yifu-business-biz/src/main/resources/application.yml
View file @
9ffc22d9
...
...
@@ -46,7 +46,12 @@ mybatis-plus:
spring
:
application
:
name
:
@
artifactId@
servlet
:
multipart
:
#所有上传文件最大大小
max-request-size
:
100MB
#单个文件最大大小
max-file-size
:
50MB
#swagger 文档 https://springdoc.org/
### OpenAPI3 注解
# OpenAPI 3 注解位置
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
9ffc22d9
...
...
@@ -334,6 +334,8 @@ public interface CommonConstants {
int
EIGHT_INT
=
8
;
public
static
final
String
ZIP_TYPE
=
"zip"
;
public
static
final
String
JAR_TYPE
=
"jar"
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT1
=
2000
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
9ffc22d9
...
...
@@ -1423,9 +1423,9 @@
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.
UNIT_PENSION_SET as
PERSONAL_PENSION_SET,
a.
UNIT_MEDICAL_SET as
PERSONAL_MEDICAL_SET,
a.
UNIT_UNEMPLOYMENT_SET as
PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER,
...
...
@@ -1509,12 +1509,12 @@
<if
test=
"tPaymentInfo.createTime != null"
>
AND a.CREATE_TIME = #{tPaymentInfo.createTime}
</if>
<if
test=
"tPaymentInfo.lastUpdateUser != null and tPaymentInfo.lastUpdateUser.trim() != ''"
>
<
!--<
if test="tPaymentInfo.lastUpdateUser != null and tPaymentInfo.lastUpdateUser.trim() != ''">
AND a.UPDATE_BY = #{tPaymentInfo.lastUpdateUser}
</if>
<if test="tPaymentInfo.lastUpdateTime != null">
AND a.UPDATE_TIME = #{tPaymentInfo.lastUpdateTime}
</if>
</if>
-->
<if
test=
"tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"
>
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
</if>
...
...
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