Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/base/controller/EnterpriseInfoController.java

@@ -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;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/RecruitInformationInfoController.java

@@ -78,6 +78,7 @@ public class RecruitInformationInfoController {
             recruitInformationInfo.setUpdateTime(new Date());
             recruitInformationInfo.setStatus("0");
             recruitInformationInfo.setBrowseNumber(0);
+            recruitInformationInfo.setIsOnline(true);
 
             int affectCount = recruitInformationInfoService.insert(recruitInformationInfo);
 
@@ -331,6 +332,45 @@ public class RecruitInformationInfoController {
     }
 
 
+    @ApiOperation(value="修改是否在线")
+    @PostMapping("changeIsOnline/{id}")
+    public MessageResult<RecruitInformationInfo> changeIsOnline(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<RecruitInformationInfo> msgResult = new MessageResult<>();
+
+        try {
+
+            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
+            recruitInformationInfo.setUpdateBy(subject);
+            recruitInformationInfo.setUpdateTime(new Date());
+
+            if(recruitInformationInfo.getIsOnline()){
+                recruitInformationInfo.setIsOnline(false);
+            }
+            else{
+                recruitInformationInfo.setIsOnline(true);
+            }
+
+            int affectCount = recruitInformationInfoService.update(recruitInformationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库修改失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+
     @ApiOperation(value = "导入招聘信息")
     @PostMapping("importXls")
     @ApiImplicitParams({
@@ -475,6 +515,7 @@ public class RecruitInformationInfoController {
                     recruitInformationInfo.setContactsPhone(contactsPhone);
                     recruitInformationInfo.setWorkArea(workArea);
                     recruitInformationInfo.setAddress(address);
+                    recruitInformationInfo.setIsOnline(true);
 
 
                     //保存新企业