Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
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
INET-TWO
server
dcs-plan
Commits
7044afb0
Commit
7044afb0
authored
Oct 22, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购计划导入校验,增加预算必填和错误行信息
parent
95f1b0f7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
PurchasePlanExcelDataVerifyListenner.java
...n/core/listener/PurchasePlanExcelDataVerifyListenner.java
+7
-1
PurchasePlanExcelReadListenner.java
...cs/plan/core/listener/PurchasePlanExcelReadListenner.java
+1
-1
ExtPuchasePlanAttributeServiceImpl.java
...core/service/impl/ExtPuchasePlanAttributeServiceImpl.java
+0
-1
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/listener/PurchasePlanExcelDataVerifyListenner.java
View file @
7044afb0
...
@@ -54,7 +54,7 @@ public class PurchasePlanExcelDataVerifyListenner extends AnalysisEventListener<
...
@@ -54,7 +54,7 @@ public class PurchasePlanExcelDataVerifyListenner extends AnalysisEventListener<
/**
/**
* excel数据行数
* excel数据行数
*/
*/
private
Integer
excelDataRow
=
0
;
private
Integer
excelDataRow
=
2
;
/**
/**
* 错误信息列表
* 错误信息列表
...
@@ -196,6 +196,12 @@ public class PurchasePlanExcelDataVerifyListenner extends AnalysisEventListener<
...
@@ -196,6 +196,12 @@ public class PurchasePlanExcelDataVerifyListenner extends AnalysisEventListener<
errorList
.
add
(
errString
);
errorList
.
add
(
errString
);
return
;
return
;
}
}
//预算不能为空
if
(
ObjectUtils
.
isEmpty
(
extPuchasePlanExcelVO
.
getPurchaseBudget
())){
errString
.
append
(
"计划编号是:"
+
extPuchasePlanExcelVO
.
getPlanCode
()
+
"的预算不能为空"
);
errorList
.
add
(
errString
);
return
;
}
//采购技术负责人
//采购技术负责人
if
(
StringUtils
.
isEmpty
(
extPuchasePlanExcelVO
.
getPurDesignFileManager
())){
if
(
StringUtils
.
isEmpty
(
extPuchasePlanExcelVO
.
getPurDesignFileManager
())){
errString
.
append
(
"解析到数据第"
+
excelDataRow
+
"行,计划编号是:"
+
extPuchasePlanExcelVO
.
getPlanCode
()
+
"的采购技术文件负责人不能为空"
);
errString
.
append
(
"解析到数据第"
+
excelDataRow
+
"行,计划编号是:"
+
extPuchasePlanExcelVO
.
getPlanCode
()
+
"的采购技术文件负责人不能为空"
);
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/listener/PurchasePlanExcelReadListenner.java
View file @
7044afb0
...
@@ -271,7 +271,7 @@ public class PurchasePlanExcelReadListenner extends AnalysisEventListener<ExtPuc
...
@@ -271,7 +271,7 @@ public class PurchasePlanExcelReadListenner extends AnalysisEventListener<ExtPuc
}
}
//预算不能为空
//预算不能为空
if
(
ObjectUtils
.
isEmpty
(
extPuchasePlanExcelVO
.
getPurchaseBudget
())){
if
(
ObjectUtils
.
isEmpty
(
extPuchasePlanExcelVO
.
getPurchaseBudget
())){
errString
.
append
(
"计划编号是:"
+
extPuchasePlanExcelVO
.
getP
urchaseBudget
()
+
"的预算不能为空"
);
errString
.
append
(
"计划编号是:"
+
extPuchasePlanExcelVO
.
getP
lanCode
()
+
"的预算不能为空"
);
errorList
.
add
(
errString
);
errorList
.
add
(
errString
);
return
;
return
;
}
}
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPuchasePlanAttributeServiceImpl.java
View file @
7044afb0
...
@@ -82,7 +82,6 @@ public class ExtPuchasePlanAttributeServiceImpl<V extends ExtPuchasePlanAttribut
...
@@ -82,7 +82,6 @@ public class ExtPuchasePlanAttributeServiceImpl<V extends ExtPuchasePlanAttribut
@Override
@Override
public
String
exportPurchasePlanFile
(
HttpServletResponse
response
,
List
<
String
>
ids
)
throws
IOException
{
public
String
exportPurchasePlanFile
(
HttpServletResponse
response
,
List
<
String
>
ids
)
throws
IOException
{
InputStream
inputStream
=
null
;
InputStream
inputStream
=
null
;
CustomMultipartFile
multipartFile
=
null
;
CustomMultipartFile
multipartFile
=
null
;
Long
fileId
=
null
;
Long
fileId
=
null
;
...
...
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