Skip to content

M
manager
Commit 6ea18db0 by kangxiaoshan
Options

修改中文大括号

parent 8ce81009
master … 0727_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 2578_bugfix 2580_fix bigfix_20201028 bugfix_1608_new bugfix_1760 bugfix_master_1760 change_double liushaowei master_mv mobvista_master month_flow
No related merge requests found
Showing with 10 additions and 10 deletions
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -2268,8 +2268,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -2268,8 +2268,8 @@ public class ContractServiceImpl implements ContractService {
Cell cell = row_data.getCell(w); Cell cell = row_data.getCell(w);
int line_num = j + 1; int line_num = j + 1;
if (null == cell || cell.getCellTypeEnum().equals(CellType.BLANK)) { if (null == cell || cell.getCellTypeEnum().equals(CellType.BLANK)) {
return ResultModel.ERROR("第" + line_num + "行[" + return ResultModel.ERROR("第" + line_num + "行【" +
SHEET_TITLE_RESERVE.get(sheetTitle) + "]不能为空,请重新上传"); SHEET_TITLE_RESERVE.get(sheetTitle) + "】不能为空,请重新上传");
} else { } else {
String dataSTR = formatter.formatCellValue(cell).trim(); String dataSTR = formatter.formatCellValue(cell).trim();
//校验合同编号 //校验合同编号
...@@ -2278,19 +2278,19 @@ public class ContractServiceImpl implements ContractService { ...@@ -2278,19 +2278,19 @@ public class ContractServiceImpl implements ContractService {
codeUniqueDic.put(dataSTR, "1"); codeUniqueDic.put(dataSTR, "1");
} else { } else {
return ResultModel.ERROR(ResultStatus.CCODE_EXITS.getCode(), return ResultModel.ERROR(ResultStatus.CCODE_EXITS.getCode(),
"合同编号[" + dataSTR + "]已存在,请重新上传"); "合同编号【" + dataSTR + "】已存在,请重新上传");
} }
Contract contractExist = contractRepository.checkByCode(dataSTR); Contract contractExist = contractRepository.checkByCode(dataSTR);
if (contractExist != null) { if (contractExist != null) {
return ResultModel.ERROR(ResultStatus.CCODE_EXITS.getCode(), return ResultModel.ERROR(ResultStatus.CCODE_EXITS.getCode(),
"合同编号[" + dataSTR + "]已存在,请重新上传"); "合同编号【" + dataSTR + "】已存在,请重新上传");
} }
} }
if ("my_body_name".equals(sheetTitle)) { if ("my_body_name".equals(sheetTitle)) {
if (!cBodyMap.containsKey(dataSTR)) { if (!cBodyMap.containsKey(dataSTR)) {
return ResultModel.ERROR("第" + line_num + "行[我方签约主体]错误"); return ResultModel.ERROR("第" + line_num + "行【我方签约主体】错误");
} else { } else {
s_data[w] = dataSTR; s_data[w] = dataSTR;
bodyCode = cBodyMap.get(dataSTR); bodyCode = cBodyMap.get(dataSTR);
...@@ -2298,25 +2298,25 @@ public class ContractServiceImpl implements ContractService { ...@@ -2298,25 +2298,25 @@ public class ContractServiceImpl implements ContractService {
} else if ("trade_type".equals(sheetTitle)) { } else if ("trade_type".equals(sheetTitle)) {
if (!tradTypeMap.containsKey(dataSTR)) { if (!tradTypeMap.containsKey(dataSTR)) {
return ResultModel.ERROR("第" + line_num + "行[行业分类]错误"); return ResultModel.ERROR("第" + line_num + "行【行业分类】错误");
} else { } else {
s_data[w] = tradTypeMap.get(dataSTR); s_data[w] = tradTypeMap.get(dataSTR);
} }
} else if ("sale".equals(sheetTitle)) { } else if ("sale".equals(sheetTitle)) {
if (!salseMap.containsKey(dataSTR)) { if (!salseMap.containsKey(dataSTR)) {
return ResultModel.ERROR("第" + line_num + "行[签约销售]错误"); return ResultModel.ERROR("第" + line_num + "行【签约销售】错误");
} else { } else {
s_data[w] = salseMap.get(dataSTR); s_data[w] = salseMap.get(dataSTR);
} }
} else if ("contract_type".equals(sheetTitle)) { } else if ("contract_type".equals(sheetTitle)) {
if (!CONTRACT_TYPE_NAME.containsKey(dataSTR)) { if (!CONTRACT_TYPE_NAME.containsKey(dataSTR)) {
return ResultModel.ERROR("第" + line_num + "行[签约类型]错误"); return ResultModel.ERROR("第" + line_num + "行【签约类型】错误");
} else { } else {
s_data[w] = CONTRACT_TYPE_NAME.get(dataSTR); s_data[w] = CONTRACT_TYPE_NAME.get(dataSTR);
} }
} else if ("price_level".equals(sheetTitle)) { } else if ("price_level".equals(sheetTitle)) {
if (packageMap != null && !packageMap.containsKey(dataSTR)) { if (packageMap != null && !packageMap.containsKey(dataSTR)) {
return ResultModel.ERROR("第" + line_num + "行[套餐]错误"); return ResultModel.ERROR("第" + line_num + "行【套餐】错误");
} else { } else {
s_data[w] = packageMap.get(dataSTR); s_data[w] = packageMap.get(dataSTR);
} }
...@@ -2330,7 +2330,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -2330,7 +2330,7 @@ public class ContractServiceImpl implements ContractService {
&& !"dd-mmm-yy".equals(dfmate) && !"dd-mmm-yy".equals(dfmate)
&& !"yyyy/m/d".equals(dfmate) && !"yyyy/m/d".equals(dfmate)
) { ) {
return ResultModel.ERROR("第" + line_num + "行[日期单元格]错误"); return ResultModel.ERROR("第" + line_num + "行【日期单元格】错误");
} }
if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) { if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) {
......
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