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
bc24b35a
Commit
bc24b35a
authored
Oct 09, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b0ac33cf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
ExcelServiceImpl.java
...os/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
+4
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @
bc24b35a
...
@@ -763,6 +763,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
...
@@ -763,6 +763,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
List
<
WaterResourceDto
>
excelDtoList
=
ExcelUtil
.
readFirstSheetExcel
(
multipartFile
,
WaterResourceDto
.
class
,
1
);
List
<
WaterResourceDto
>
excelDtoList
=
ExcelUtil
.
readFirstSheetExcel
(
multipartFile
,
WaterResourceDto
.
class
,
1
);
excelDtoList
.
forEach
(
item
->
{
excelDtoList
.
forEach
(
item
->
{
/*Bug 2950 消防水源,缺失设施分类、设施定义等必填字段可以上传成功 陈召 2021-10-09 */
if
(
item
.
getEquipName
()
==
null
||
item
.
getEquipName
().
equals
(
" "
))
{
throw
new
RuntimeException
(
"设备定义名称为必填字段,填写后重新上传"
);
}
//BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召开始
//BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召开始
item
.
setEquipCode
(
QRCodeUtil
.
generateQRCode
());
item
.
setEquipCode
(
QRCodeUtil
.
generateQRCode
());
//BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召结束
//BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召结束
...
...
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