Commit 7044afb0 authored by wangqiang's avatar wangqiang

采购计划导入校验,增加预算必填和错误行信息

parent 95f1b0f7
...@@ -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() + "的采购技术文件负责人不能为空");
......
...@@ -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.getPurchaseBudget() + "的预算不能为空"); errString.append("计划编号是:" + extPuchasePlanExcelVO.getPlanCode() + "的预算不能为空");
errorList.add(errString); errorList.add(errString);
return; return;
} }
......
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment