Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/job/Recruitment.xml

@@ -227,6 +227,7 @@
 				jr.title_ AS title,
 				jr.address_ AS address,
 				jr.requirements_ AS requirements,
+				jr.position_number AS positionNumber,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
 			    bci.city_name AS cityName,
@@ -275,6 +276,9 @@
 			<if test="searchParams.approveStatus != null">
 				and jr.approve_status = #{searchParams.approveStatus}
 			</if>
+			<if test="searchParams.id != null">
+				and jr.company_id like #{searchParams.id}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

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

@@ -4,8 +4,10 @@ import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.City;
 import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
+import com.jpsoft.employment.modules.base.entity.MessageNotice;
 import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.base.service.EnterpriseCertificationApproveService;
+import com.jpsoft.employment.modules.base.service.MessageNoticeService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
@@ -36,6 +38,8 @@ public class CompanyController {
     private CompanyService companyService;
     @Autowired
     private EnterpriseCertificationApproveService enterpriseCertificationApproveService;
+    @Autowired
+    private MessageNoticeService messageNoticeService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -301,12 +305,12 @@ public class CompanyController {
 
     @ApiOperation(value="更新用户")
     @PostMapping("checked")
-    public MessageResult<Company> checked(String id,String cid,@RequestAttribute String subject){
+    public MessageResult<Company> checked(String id,String cid,String approveStatus,@RequestAttribute String subject){
         MessageResult<Company> msgResult = new MessageResult<>();
 
         try {
             EnterpriseCertificationApprove enterpriseCertificationApprove = enterpriseCertificationApproveService.get(id);
-            enterpriseCertificationApprove.setApproveStatus("2");
+            enterpriseCertificationApprove.setApproveStatus(approveStatus);
             enterpriseCertificationApprove.setApprovePersonId(subject);
             enterpriseCertificationApprove.setApproveTime(new Date());
             enterpriseCertificationApprove.setUpdateBy(subject);
@@ -316,11 +320,27 @@ public class CompanyController {
 
             if (affectCount > 0) {
                 Company company = companyService.get(cid);
-                company.setIsCertification("2");
+                company.setIsCertification(approveStatus);
                 company.setUpdateBy(subject);
                 company.setUpdateTime(new Date());
                 companyService.update(company);
 
+                if(approveStatus.equals("4")){
+                    MessageNotice messageNotice = new MessageNotice();
+                    messageNotice.setId(UUID.randomUUID().toString());
+                    messageNotice.setTitle("企业信息审核");
+                    messageNotice.setContent("经过核对，数据存疑，请查实后再次提交审核。");
+                    messageNotice.setRecipientId(enterpriseCertificationApprove.getCreateBy());
+                    messageNotice.setStatus(true);
+                    messageNotice.setDelFlag(false);
+                    messageNotice.setCreateBy(subject);
+                    messageNotice.setCreateTime(new Date());
+                    messageNotice.setClassify("1");
+                    messageNotice.setType("1");
+                    messageNotice.setIsNeedAgree(false);
+                    messageNoticeService.insert(messageNotice);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(company);
             } else {

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

@@ -286,6 +286,7 @@ public class EnterpriseCertificationApproveController {
             switch (enterpriseCertificationApprove.getApproveStatus()){
                 case "1": enterpriseCertificationApprove.setApproveStatusName("未审批"); break;
                 case "2": enterpriseCertificationApprove.setApproveStatusName("已审批"); break;
+                case "4": enterpriseCertificationApprove.setApproveStatusName("退回"); break;
             }
             User user = userService.get(enterpriseCertificationApprove.getCreateBy());
             enterpriseCertificationApprove.setCreateByName(user.getRealName());

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

@@ -231,6 +231,7 @@ public class LabourServicesApproveController {
             switch (labourServicesApprove.getApproveStatus()){
                 case "1": labourServicesApprove.setApproveStatusName("未审批"); break;
                 case "2": labourServicesApprove.setApproveStatusName("已审批"); break;
+                case "4": labourServicesApprove.setApproveStatusName("退回"); break;
             }
             User user = userService.get(labourServicesApprove.getCreateBy());
             Company company = companyService.get(user.getCompanyId());

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

@@ -1,13 +1,11 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.Company;
-import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
-import com.jpsoft.employment.modules.base.entity.LabourServices;
-import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import com.jpsoft.employment.modules.base.entity.*;
 import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.base.service.LabourServicesApproveService;
 import com.jpsoft.employment.modules.base.service.LabourServicesService;
+import com.jpsoft.employment.modules.base.service.MessageNoticeService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
@@ -38,12 +36,12 @@ public class LabourServicesController {
     private LabourServicesApproveService labourServicesApproveService;
     @Autowired
     private DataDictionaryService dataDictionaryService;
-
     @Autowired
     private CompanyService companyService;
-
     @Autowired
     private UserService userService;
+    @Autowired
+    private MessageNoticeService messageNoticeService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -354,12 +352,12 @@ public class LabourServicesController {
 
     @ApiOperation(value="审核")
     @PostMapping("checked")
-    public MessageResult<LabourServices> checked(String id,String cid,@RequestAttribute String subject){
+    public MessageResult<LabourServices> checked(String id,String cid,String approveStatus,@RequestAttribute String subject){
         MessageResult<LabourServices> msgResult = new MessageResult<>();
 
         try {
             LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
-            labourServicesApprove.setApproveStatus("2");
+            labourServicesApprove.setApproveStatus(approveStatus);
             labourServicesApprove.setApprovePersonId(subject);
             labourServicesApprove.setApproveTime(new Date());
             labourServicesApprove.setUpdateBy(subject);
@@ -369,11 +367,27 @@ public class LabourServicesController {
 
             if (affectCount > 0) {
                 LabourServices labourServices = labourServicesService.get(cid);
-                labourServices.setApprovalStatus("2");
+                labourServices.setApprovalStatus(approveStatus);
                 labourServices.setUpdateBy(subject);
                 labourServices.setUpdateTime(new Date());
                 labourServicesService.update(labourServices);
 
+                if(approveStatus.equals("4")){
+                    MessageNotice messageNotice = new MessageNotice();
+                    messageNotice.setId(UUID.randomUUID().toString());
+                    messageNotice.setTitle("劳务对接审核");
+                    messageNotice.setContent("经过核对，数据存疑，请查实后再次提交审核。");
+                    messageNotice.setRecipientId(labourServicesApprove.getCreateBy());
+                    messageNotice.setStatus(true);
+                    messageNotice.setDelFlag(false);
+                    messageNotice.setCreateBy(subject);
+                    messageNotice.setCreateTime(new Date());
+                    messageNotice.setClassify("1");
+                    messageNotice.setType("1");
+                    messageNotice.setIsNeedAgree(false);
+                    messageNoticeService.insert(messageNotice);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(labourServices);
             } else {

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

@@ -1,7 +1,9 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.MessageNotice;
 import com.jpsoft.employment.modules.base.entity.UserAuthenticationApprove;
+import com.jpsoft.employment.modules.base.service.MessageNoticeService;
 import com.jpsoft.employment.modules.base.service.UserAuthenticationApproveService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -39,6 +41,8 @@ public class UserAuthenticationApproveController {
     private JobUserService jobUserService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private MessageNoticeService messageNoticeService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -244,14 +248,14 @@ public class UserAuthenticationApproveController {
     @ApiOperation(value="实名审核")
     @PostMapping("checked")
     @Transactional(rollbackFor = Exception.class)
-    public MessageResult<UserAuthenticationApprove> checked(String id,@RequestAttribute String subject){
+    public MessageResult<UserAuthenticationApprove> checked(String id,String approveStatus,@RequestAttribute String subject){
         MessageResult<UserAuthenticationApprove> msgResult = new MessageResult<>();
 
         try {
             UserAuthenticationApprove userAuthenticationApprove = userAuthenticationApproveService.get(id);
             userAuthenticationApprove.setApprovePersonId(subject);
             userAuthenticationApprove.setApproveTime(new Date());
-            userAuthenticationApprove.setApprovalStatus("1");
+            userAuthenticationApprove.setApprovalStatus(approveStatus);
             userAuthenticationApprove.setUpdateBy(subject);
             userAuthenticationApprove.setUpdateTime(new Date());
 
@@ -259,11 +263,27 @@ public class UserAuthenticationApproveController {
 
             if (affectCount > 0) {
                 JobUser jobUser = jobUserService.get(userAuthenticationApprove.getJobUserId());
-                jobUser.setIsAuthentication("1");
+                jobUser.setIsAuthentication(approveStatus);
                 jobUser.setUpdateBy(subject);
                 jobUser.setUpdateTime(new Date());
                 jobUserService.update(jobUser);
 
+                if(approveStatus.equals("4")){
+                    MessageNotice messageNotice = new MessageNotice();
+                    messageNotice.setId(UUID.randomUUID().toString());
+                    messageNotice.setTitle("用户实名审核");
+                    messageNotice.setContent("经过核对，数据存疑，请查实后再次提交审核。");
+                    messageNotice.setRecipientId(userAuthenticationApprove.getCreateBy());
+                    messageNotice.setStatus(true);
+                    messageNotice.setDelFlag(false);
+                    messageNotice.setCreateBy(subject);
+                    messageNotice.setCreateTime(new Date());
+                    messageNotice.setClassify("1");
+                    messageNotice.setType("1");
+                    messageNotice.setIsNeedAgree(false);
+                    messageNoticeService.insert(messageNotice);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(userAuthenticationApprove);
             } else {

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentApproveController.java

@@ -231,6 +231,7 @@ public class RecruitmentApproveController {
             switch (recruitmentApprove.getApproveStatus()){
                 case "2": recruitmentApprove.setApproveStatusName("未审批"); break;
                 case "3": recruitmentApprove.setApproveStatusName("已审批"); break;
+                case "4": recruitmentApprove.setApproveStatusName("退回"); break;
             }
             User user = userService.get(recruitmentApprove.getCreateBy());
             recruitmentApprove.setCreateByName(user.getRealName());

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -4,8 +4,10 @@ import com.github.pagehelper.Page;
 import com.google.gson.JsonObject;
 import com.jpsoft.employment.modules.base.entity.City;
 import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.entity.MessageNotice;
 import com.jpsoft.employment.modules.base.service.CityService;
 import com.jpsoft.employment.modules.base.service.CompanyService;
+import com.jpsoft.employment.modules.base.service.MessageNoticeService;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
@@ -50,9 +52,10 @@ public class RecruitmentController {
     private UserService userService;
     @Autowired
     private WorkCategoryService workCategoryService;
-
     @Autowired
     private CityService cityService;
+    @Autowired
+    private MessageNoticeService messageNoticeService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -146,7 +149,7 @@ public class RecruitmentController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value="HR企业信息维护-获取信息")
     @GetMapping("edit/{id}")
     public MessageResult<Recruitment> edit(@PathVariable("id") String id,@RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
@@ -735,14 +738,14 @@ public class RecruitmentController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value="审批")
     @PostMapping("checked")
-    public MessageResult<Recruitment> checked(String id, String approveId, @RequestAttribute String subject){
+    public MessageResult<Recruitment> checked(String id, String approveId, String approveStatus, @RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
             Recruitment recruitment = recruitmentService.get(id);
-            recruitment.setApproveStatus("3");
+            recruitment.setApproveStatus(approveStatus);
             recruitment.setUpdateBy(subject);
             recruitment.setUpdateTime(new Date());
 
@@ -750,11 +753,27 @@ public class RecruitmentController {
 
             if (affectCount > 0) {
                 RecruitmentApprove recruitmentApprove = recruitmentApproveService.get(approveId);
-                recruitmentApprove.setApproveStatus("3");
+                recruitmentApprove.setApproveStatus(approveStatus);
                 recruitmentApprove.setApprovePersonId(subject);
                 recruitmentApprove.setApproveTime(new Date());
                 recruitmentApproveService.update(recruitmentApprove);
 
+                if(approveStatus.equals("4")){
+                    MessageNotice messageNotice = new MessageNotice();
+                    messageNotice.setId(UUID.randomUUID().toString());
+                    messageNotice.setTitle("岗位信息审核");
+                    messageNotice.setContent("经过核对，数据存疑，请查实后再次提交审核。");
+                    messageNotice.setRecipientId(recruitmentApprove.getCreateBy());
+                    messageNotice.setStatus(true);
+                    messageNotice.setDelFlag(false);
+                    messageNotice.setCreateBy(subject);
+                    messageNotice.setCreateTime(new Date());
+                    messageNotice.setClassify("1");
+                    messageNotice.setType("1");
+                    messageNotice.setIsNeedAgree(false);
+                    messageNoticeService.insert(messageNotice);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(recruitment);
             } else {
@@ -771,4 +790,106 @@ public class RecruitmentController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("editD/{id}")
+    public MessageResult<Recruitment> editD(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Recruitment> msgResult = new MessageResult<>();
+
+        try {
+            Recruitment recruitment = recruitmentService.get(id);
+            Company company = companyService.get(recruitment.getCompanyId());
+
+            recruitment.setCompanyName(company.getName());
+            recruitment.setCompanyLogo(company.getLogo());
+
+            recruitment.setCompanyIndustryN(dataDictionaryService.getName(company.getIndustry()));
+            recruitment.setCompanyScaleN(dataDictionaryService.getName(company.getScale()));
+            recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
+            recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
+            recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
+
+            if (recruitment != null) {
+                if(StringUtils.isNotEmpty(recruitment.getWelfare())) {
+                    String welfare = recruitment.getWelfare();
+
+                    List<String> tagList = new ArrayList<>();
+
+                    JSONObject jsonObject = JSONObject.fromObject(welfare);
+                    if(jsonObject!=null&&jsonObject.size()>0){
+
+                        String checkboxGroup1="";
+                        String dynamicTags="";
+
+                        if(jsonObject.get("checkboxGroup1")!=null){
+                            checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
+                        }
+
+                        if(jsonObject.get("dynamicTags")!=null){
+                            dynamicTags = jsonObject.get("dynamicTags").toString();
+                        }
+
+                        if(StringUtils.isNotEmpty(checkboxGroup1)){
+                            recruitment.setCheckboxGroup1(checkboxGroup1);
+
+                            String[] checkboxGroupArray = checkboxGroup1.split(",");
+                            for (String dicId:checkboxGroupArray) {
+                                DataDictionary dataDictionary = dataDictionaryService.get(dicId);
+                                if(dataDictionary!=null){
+                                    tagList.add(dataDictionary.getName());
+                                }
+                            }
+                        }
+
+                        if(StringUtils.isNotEmpty(dynamicTags)){
+                            recruitment.setDynamicTags(dynamicTags);
+                            String[] dynamicTagArray = dynamicTags.split(",");
+                            for (String name:dynamicTagArray) {
+                                tagList.add(name);
+                            }
+                        }
+
+                        recruitment.setTagList(tagList);
+                    }
+                }
+
+                recruitment.setCompanyName(company.getName());
+                recruitment.setCompanyLogo(company.getLogo());
+                recruitment.setIsCertification(company.getIsCertification());
+                recruitment.setCompanyScaleN(dataDictionaryService.getName(company.getScale()));
+                recruitment.setCompanyIndustryN(dataDictionaryService.getName(company.getIndustry()));
+
+                recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
+                recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
+                recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
+
+                WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+                if(workCategory!=null){
+                    recruitment.setPositionName(workCategory.getName());
+                }
+
+                if(StringUtils.isNotEmpty(recruitment.getPositionSex())){
+                    recruitment.setPositionSexN(dataDictionaryService.findNameByCatalogNameAndValue("性别",recruitment.getPositionSex()));
+                }
+                else{
+                    recruitment.setPositionSexN("男女不限");
+                }
+
+
+                msgResult.setResult(true);
+                msgResult.setData(recruitment);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        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/mobile/controller/RecruitmentApiController.java

@@ -10,6 +10,7 @@ import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.job.entity.*;
 import com.jpsoft.employment.modules.job.service.*;
+import com.jpsoft.employment.modules.sys.entity.DataDictionary;
 import com.jpsoft.employment.modules.sys.entity.User;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import com.jpsoft.employment.modules.sys.service.UserService;
@@ -18,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hslf.record.CString;
 import org.slf4j.Logger;
@@ -220,6 +222,49 @@ public class RecruitmentApiController {
             WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
             recruitment.setPositionName(workCategory.getName());
 
+            if(StringUtils.isNotEmpty(recruitment.getWelfare())) {
+                String welfare = recruitment.getWelfare();
+
+                List<String> tagList = new ArrayList<>();
+
+                JSONObject jsonObject = JSONObject.fromObject(welfare);
+                if(jsonObject!=null&&jsonObject.size()>0){
+
+                    String checkboxGroup1="";
+                    String dynamicTags="";
+
+                    if(jsonObject.get("checkboxGroup1")!=null){
+                        checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
+                    }
+
+                    if(jsonObject.get("dynamicTags")!=null){
+                        dynamicTags = jsonObject.get("dynamicTags").toString();
+                    }
+
+                    if(StringUtils.isNotEmpty(checkboxGroup1)){
+                        recruitment.setCheckboxGroup1(checkboxGroup1);
+
+                        String[] checkboxGroupArray = checkboxGroup1.split(",");
+                        for (String dicId:checkboxGroupArray) {
+                            DataDictionary dataDictionary = dataDictionaryService.get(dicId);
+                            if(dataDictionary!=null){
+                                tagList.add(dataDictionary.getName());
+                            }
+                        }
+                    }
+
+                    if(StringUtils.isNotEmpty(dynamicTags)){
+                        recruitment.setDynamicTags(dynamicTags);
+                        String[] dynamicTagArray = dynamicTags.split(",");
+                        for (String name:dynamicTagArray) {
+                            tagList.add(name);
+                        }
+                    }
+
+                    recruitment.setTagList(tagList);
+                }
+            }
+
             //热度
 //            int heatNum = userBrowseService.findNumberByRId(recruitment.getId());
 //            if(heatNum < 0 ){
@@ -318,7 +363,9 @@ public class RecruitmentApiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", required = true, paramType = "form")
     })
-    public MessageResult<Map> getCompanyDetails(String id,String token) {
+    public MessageResult<Map> getCompanyDetails(
+            String id,
+            String token) {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();