Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-server

common/src/main/java/com/jpsoft/employment/modules/base/dao/CityDAO.java

@@ -11,7 +11,7 @@ public interface CityDAO {
 	int insert(City entity);
 	int update(City entity);
 	int exist(String id);
-	City get(String id);
+	City get(int id);
 	int delete(String id);
 	List<City> list();
 	List<City> findByType(String type);

common/src/main/java/com/jpsoft/employment/modules/base/dao/EnterpriseCertificationApproveDAO.java

@@ -15,5 +15,6 @@ public interface EnterpriseCertificationApproveDAO {
 	EnterpriseCertificationApprove get(String id);
 	int delete(String id);
 	List<EnterpriseCertificationApprove> list();
+	EnterpriseCertificationApprove findByCompanyId(String companyId);
 	List<EnterpriseCertificationApprove> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dto/CompanyDTO.java

@@ -8,6 +8,9 @@ public class CompanyDTO {
     @ApiModelProperty(value = "企业ID")
     private String id;
 
+    @ApiModelProperty(value = "企业认证ID")
+    private String enterpriseCertificationApproveId;
+
     @ApiModelProperty(value = "企业名称")
     private String name;
 
@@ -21,13 +24,13 @@ public class CompanyDTO {
     private String industry;
 
     @ApiModelProperty(value = "省")
-    private String province;
+    private Integer province;
 
     @ApiModelProperty(value = "市")
-    private String city;
+    private Integer city;
 
     @ApiModelProperty(value = "区")
-    private String zone;
+    private Integer zone;
 
     @ApiModelProperty(value = "企业地址")
     private String address;

common/src/main/java/com/jpsoft/employment/modules/base/entity/Company.java

@@ -72,4 +72,17 @@ public class Company {
     private String businessLicenseUrl;
     @ApiModelProperty(value = "logo")
     private String logo;
+
+
+
+
+    //以下字段用于显示，不保存数据库
+    @ApiModelProperty(value = "企业认证ID")
+    private String enterpriseCertificationApproveId;
+    @ApiModelProperty(value = "省")
+    private Integer province;
+    @ApiModelProperty(value = "市")
+    private Integer city;
+    @ApiModelProperty(value = "区")
+    private Integer zone;
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/CityService.java

@@ -5,9 +5,10 @@ import java.util.Map;
 import com.jpsoft.employment.modules.base.entity.City;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
+import io.swagger.models.auth.In;
 
 public interface CityService {
-	City get(String id);
+	City get(int id);
 	boolean exist(String id);
 	int insert(City model);
 	int update(City model);

common/src/main/java/com/jpsoft/employment/modules/base/service/EnterpriseCertificationApproveService.java

@@ -15,5 +15,6 @@ public interface EnterpriseCertificationApproveService {
 	int update(EnterpriseCertificationApprove model);
 	int delete(String id);
 	List<EnterpriseCertificationApprove> list();
+	EnterpriseCertificationApprove findByCompanyId(String companyId);
 	Page<EnterpriseCertificationApprove> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CityServiceImpl.java

@@ -20,7 +20,7 @@ public class CityServiceImpl implements CityService {
 	private CityDAO cityDAO;
 
 	@Override
-	public City get(String id) {
+	public City get(int id) {
 		// TODO Auto-generated method stub
 		return cityDAO.get(id);
 	}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/EnterpriseCertificationApproveServiceImpl.java

@@ -46,12 +46,24 @@ public class EnterpriseCertificationApproveServiceImpl implements EnterpriseCert
 		int count = 0;
 
 		if(affectCount>0){
-			EnterpriseCertificationApprove item = new EnterpriseCertificationApprove();
-			item.setCompanyId(company.getId());
-			item.setCreateBy(company.getUpdateBy());
-			item.setCreateTime(company.getUpdateTime());
+			EnterpriseCertificationApprove item = enterpriseCertificationApproveDAO.findByCompanyId(company.getId());
 
-			count = enterpriseCertificationApproveDAO.insert(item);
+			if(item!=null){
+				item.setUpdateBy(company.getUpdateBy());
+				item.setUpdateTime(company.getUpdateTime());
+
+				count = enterpriseCertificationApproveDAO.update(item);
+			}
+			else{
+				item = new EnterpriseCertificationApprove();
+				item.setCompanyId(company.getId());
+				item.setCreateBy(company.getUpdateBy());
+				item.setCreateTime(company.getUpdateTime());
+				item.setId(UUID.randomUUID().toString());
+				item.setDelFlag(false);
+
+				count = enterpriseCertificationApproveDAO.insert(item);
+			}
 		}
 
 		return count;
@@ -82,6 +94,11 @@ public class EnterpriseCertificationApproveServiceImpl implements EnterpriseCert
 		// TODO Auto-generated method stub
 		return enterpriseCertificationApproveDAO.list();
 	}
+
+	@Override
+	public  EnterpriseCertificationApprove findByCompanyId(String companyId){
+		return enterpriseCertificationApproveDAO.findByCompanyId(companyId);
+	}
 		
 	@Override
 	public Page<EnterpriseCertificationApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/resources/mapper/base/City.xml

@@ -45,9 +45,8 @@
 		</set>
 	where id_=#{id}
 	</update>
-	<select id="get" parameterType="string" resultMap="CityMap">
-		select 
-id_,city_name,type_,pid_		from base_city where id_=#{0}
+	<select id="get" parameterType="int" resultMap="CityMap">
+		select * from base_city where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_city where id_=#{0}

common/src/main/resources/mapper/base/EnterpriseCertificationApprove.xml

@@ -80,6 +80,10 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_pers
 	<select id="list" resultMap="EnterpriseCertificationApproveMap">
 		select * from base_enterprise_certification_approve
 	</select>
+	<select id="findByCompanyId" resultMap="EnterpriseCertificationApproveMap">
+		select * from base_enterprise_certification_approve where del_flag=false and company_id=#{0} limit 1
+	</select>
+
 	<select id="search" parameterType="hashmap" resultMap="EnterpriseCertificationApproveMap">
 		<![CDATA[
 			select * from base_enterprise_certification_approve

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

@@ -34,7 +34,7 @@ public class CityController {
         MessageResult<City> msgResult = new MessageResult<>();
 
         try {
-            City city = cityService.get(id);
+            City city = cityService.get(Integer.parseInt(id));
 
             if (city != null) {
                 msgResult.setResult(true);

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

@@ -49,6 +49,24 @@ public class EnterpriseCertificationApproveController {
 
         Company company = companyService.get(user.getCompanyId());
 
+        EnterpriseCertificationApprove enterpriseCertificationApprove = enterpriseCertificationApproveService.findByCompanyId(company.getId());
+
+        if(enterpriseCertificationApprove!=null){
+            company.setEnterpriseCertificationApproveId(enterpriseCertificationApprove.getId());
+
+            if(StringUtils.isNotEmpty(company.getArea())){
+                JSONObject jsonObject = JSONObject.fromObject(company.getArea());
+
+                int province = Integer.parseInt(jsonObject.get("province").toString()) ;
+                int city = Integer.parseInt(jsonObject.get("city").toString()) ;
+                int zone = Integer.parseInt(jsonObject.get("zone").toString()) ;
+
+                company.setProvince(province);
+                company.setCity(city);
+                company.setZone(zone);
+            }
+        }
+
         msgResult.setData(company);
         msgResult.setResult(true);
 

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

@@ -1,7 +1,10 @@
 package com.jpsoft.employment.modules.job.controller;
 
 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.service.CityService;
 import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -44,6 +47,9 @@ public class RecruitmentController {
     @Autowired
     private WorkCategoryService workCategoryService;
 
+    @Autowired
+    private CityService cityService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<Recruitment> create(){
@@ -88,8 +94,16 @@ public class RecruitmentController {
             recruitment.setReadingTimes(0);
             recruitment.setCollectionTimes(0);
             recruitment.setDeliveryTimes(0);
+            String zone = "";
             if(company!=null){
-                recruitment.setArea(company.getArea());
+                if(StringUtils.isNotEmpty(company.getArea())){
+                    JSONObject jsonObject = JSONObject.fromObject(company.getArea());
+                    if(jsonObject!=null&&jsonObject.size()>0){
+                        zone = jsonObject.get("zone").toString();
+                    }
+                }
+
+                recruitment.setArea(zone);
             }
 
             //是否面议
@@ -111,7 +125,7 @@ public class RecruitmentController {
                 jsonObject.put("dynamicTags",recruitment.getDynamicTags());
             }
 
-            if(jsonObject!=null){
+            if(jsonObject!=null && jsonObject.size()!=0){
                 recruitment.setWelfare(jsonObject.toString());
             }
 
@@ -536,6 +550,17 @@ public class RecruitmentController {
             if(workCategory!=null){
                 recruitment.setPositionName(workCategory.getName());
             }
+
+            String area = "";
+
+            if(StringUtils.isNotEmpty(recruitment.getArea())){
+
+                City zoneItem = cityService.get(Integer.parseInt(recruitment.getArea()));
+
+                area = zoneItem.getCityName();
+            }
+
+            recruitment.setArea(area);
         }
 
 

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitmentApiController.java

@@ -203,7 +203,7 @@ public class RecruitmentApiController {
             String industryN = dataDictionaryService.getName(company.getIndustry());
             recruitment.setCompanyIndustryN(industryN);
 
-            City city = cityService.get(recruitment.getArea());
+            City city = cityService.get(Integer.parseInt(recruitment.getArea()));
             recruitment.setAreaN(city.getCityName());
             //薪资要求
             String wageTypeN = dataDictionaryService.getName(recruitment.getWageType());

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResumeApiController.java

@@ -401,7 +401,7 @@ public class ResumeApiController {
                     String scaleN = dataDictionaryService.getName(ci.getScale());
                     recruitment.setCompanyScaleN(scaleN);
                 }
-                City city = cityService.get(recruitment.getArea());
+                City city = cityService.get(Integer.parseInt(recruitment.getArea()));
                 if(city != null){
                     recruitment.setAreaN(city.getCityName());
                 }