Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
8d74cd06
Commit
8d74cd06
authored
Apr 21, 2025
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):西安电梯历史数据导入接口添加错误记录
parent
0e59622e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
XiAnDataDockServiceImpl.java
...oin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
+2
-2
DataDockServiceImpl.java
.../boot/module/jg/biz/service/impl/DataDockServiceImpl.java
+3
-0
No files found.
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
View file @
8d74cd06
...
...
@@ -656,11 +656,11 @@ public class XiAnDataDockServiceImpl {
private
void
checkResumeInfo
(
XiAnElevatorExcelDto
data
,
StringBuffer
rowError
)
{
checkNotBlank
(
data
.
getResumeSeq
(),
"监管履历主键不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getBusinessType
(),
"业务类型不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getCreateDate
(),
"创建时间不能为空;"
,
rowError
);
//
checkNotBlank(data.getCreateDate(), "创建时间不能为空;", rowError);
// Optional.ofNullable(data.getCreateDate()).ifPresent(v -> checkDateFormatCorrect(v, "创建时间格式不正确;", rowError));
checkNotBlank
(
data
.
getCreateUserName
(),
"创建人名称不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getBusinessId
(),
"业务单号不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getApprovalUnit
(),
"审批单位不能为空;"
,
rowError
);
//
checkNotBlank(data.getApprovalUnit(), "审批单位不能为空;", rowError);
checkNotBlank
(
data
.
getApprovalDate
(),
"审批通过时间不能为空;"
,
rowError
);
// Optional.ofNullable(data.getApprovalDate()).ifPresent(v -> checkDateFormatCorrect(v, "审批通过时间格式不正确;", rowError));
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java
View file @
8d74cd06
...
...
@@ -2222,6 +2222,8 @@ public class DataDockServiceImpl {
}
}
else
{
this
.
saveResumeInfo
(
equ
);
equ
.
put
(
"record"
,
equ
.
get
(
"resumeSeq"
));
equ
.
put
(
"xaSerial"
,
equ
.
get
(
"resumeSeq"
));
}
}
catch
(
Exception
e
)
{
esEquipmentCategory
.
deleteById
(
record
);
...
...
@@ -2338,6 +2340,7 @@ public class DataDockServiceImpl {
jgUseRegistration
.
setApplyNo
(
listResponseModel
.
getResult
().
get
(
0
));
}
jgUseRegistration
.
setAuditPassDate
(
new
Date
());
jgUseRegistration
.
setCreateDate
(
new
Date
());
jgUseRegistration
.
setManageType
(
"set"
);
jgUseRegistration
.
setIsXixian
(
"0"
);
jgUseRegistration
.
setAuditStatus
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
());
...
...
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