Commit d46cd2cc by jianshuqin

--story=1010559 --user=简曙勤 【费用系统】导入计划单增加所属项目和所属曲期并修复导入异常 https://www.tapd.cn/55346466/s/1013452

parent f3466a3a
...@@ -183,14 +183,14 @@ public class CostPlanServiceFactory { ...@@ -183,14 +183,14 @@ public class CostPlanServiceFactory {
//公司主体映射 //公司主体映射
Map<String, CostCompanyDomain> costCompanyDomainMap = getCostCompanyService().costCompanyMap(); Map<String, CostCompanyDomain> costCompanyDomainMap = getCostCompanyService().costCompanyMap();
UserDao userDao = getUserDao(); UserDao userDao = getUserDao();
for (int i = 1; i < sheet.getLastRowNum(); i++) { for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
for (int j = 0; j < firstRow.getLastCellNum(); j++) { for (int j = 0; j < firstRow.getLastCellNum(); j++) {
String costPlanField = CostPlanEnumVo.getCostPlanField(sheetName, firstRow.getCell(j).toString()); String costPlanField = CostPlanEnumVo.getCostPlanField(sheetName, firstRow.getCell(j).toString());
if (!costPlanField.equals("")) { if (!costPlanField.equals("")) {
if ((!costPlanField.equals("costRemark") && !costPlanField.equals("customerNum")) && (row.getCell(j) == null || row.getCell(j).toString().trim().equals(""))) { if ((!costPlanField.equals("costRemark") && !costPlanField.equals("customerNum") && !costPlanField.equals("projectType")) && (row.getCell(j) == null || row.getCell(j).toString().trim().equals(""))) {
throw new BizException("请填写必填项"); throw new BizException("请填写必填项");
} }
if (costPlanField.equals("costRemark") && sheetName.equals("付款") && (row.getCell(j) == null || row.getCell(j).toString().trim().equals(""))) { if (costPlanField.equals("costRemark") && sheetName.equals("付款") && (row.getCell(j) == null || row.getCell(j).toString().trim().equals(""))) {
......
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