|
|
@@ -161,13 +161,13 @@ public class ExcelServiceImpl implements ExcelService{
|
|
|
String value = null;
|
|
|
JSONObject mainData = null;
|
|
|
JSONObject detailData = null;
|
|
|
+ //标识是否一个主表的数据
|
|
|
+ boolean difference = true;
|
|
|
dd.setCompanyid(companyId);
|
|
|
dd.setDd_diid(keyvalue);
|
|
|
//主从表循环
|
|
|
for (int j = 0; j < positions.size(); j++) {
|
|
|
String position = positions.get(j);
|
|
|
- //标识是否一个主表的数据
|
|
|
- boolean difference = true;
|
|
|
//依据主从表分类
|
|
|
if ("main".equals(position)) {
|
|
|
List<TempletSet> main = columns.get(position);
|
|
|
@@ -231,7 +231,7 @@ public class ExcelServiceImpl implements ExcelService{
|
|
|
//客户资料导入特殊处理
|
|
|
if ("Customer".equals(caller)) {
|
|
|
if (!difference) {
|
|
|
- throw new BizException(987654, "客户资料导入时,从表最多存在一条记录");
|
|
|
+ throw new BizException(987654, "第" + (i + 3) + "行 " + "客户资料导入时,从表最多存在一条记录");
|
|
|
}
|
|
|
for (TempletSet set : detail) {
|
|
|
//取excel值
|
guq