|
|
@@ -303,7 +303,7 @@ public class EnterpriseInfoController {
|
|
|
|
|
|
int affectCount = 0;
|
|
|
int failCount = 0;
|
|
|
- int validateColIndex = 4;
|
|
|
+ int validateColIndex = 3;
|
|
|
|
|
|
int count = sheet1.getLastRowNum();
|
|
|
|
|
|
@@ -319,6 +319,13 @@ public class EnterpriseInfoController {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
+ EnterpriseInfo currItem = enterpriseInfoService.findByName(name);
|
|
|
+ if(currItem!=null){
|
|
|
+ sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("该企业名称已存在系统当中,不能重复添加!");
|
|
|
+ failCount++;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
//企业
|
|
|
EnterpriseInfo enterpriseInfo = new EnterpriseInfo();
|
|
|
enterpriseInfo.setId(UUID.randomUUID().toString());
|
|
|
@@ -369,4 +376,36 @@ public class EnterpriseInfoController {
|
|
|
|
|
|
return msgResult;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ @ApiOperation(value = "判断企业名称是否重复")
|
|
|
+ @PostMapping("nameIsRepeatCheck")
|
|
|
+ public MessageResult<Boolean> nameIsRepeatCheck(String id,String name) {
|
|
|
+ MessageResult<Boolean> msgResult = new MessageResult<>();
|
|
|
+
|
|
|
+ try {
|
|
|
+ Boolean flag = false;
|
|
|
+
|
|
|
+ EnterpriseInfo enterpriseInfo = enterpriseInfoService.findByName(name);
|
|
|
+
|
|
|
+ if (enterpriseInfo == null) {
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ if(id.equals(enterpriseInfo.getId())){
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData(flag);
|
|
|
+ } catch (Exception ex) {
|
|
|
+ logger.error(ex.getMessage(), ex);
|
|
|
+
|
|
|
+ msgResult.setResult(false);
|
|
|
+ msgResult.setMessage(ex.getMessage());
|
|
|
+ }
|
|
|
+
|
|
|
+ return msgResult;
|
|
|
+ }
|
|
|
}
|