Commit 67d943c8 authored by chenzhao's avatar chenzhao

修改水源导入bug

parent b2cb026a
......@@ -975,8 +975,7 @@ public class ExcelServiceImpl {
if (item.getEquipName() == null || item.getEquipName().equals(" ")) {
throw new RuntimeException("设备定义名称为必填字段,填写后重新上传");
}
//水源的isdelete是反着的
item.setIsDelete(true);
// BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召开始
item.setEquipCode(QRCodeUtil.generateQRCode());
// BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召结束
......@@ -1090,6 +1089,8 @@ public class ExcelServiceImpl {
item.setContactUserId(contactUser[1]);
}
item = Bean.toPo(getCurrentInfo(), item);
//水源的isdelete是反着的
item.setIsDelete(true);
waterResourceServiceImpl.importByExcel(item);
});
}
......
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