企业信息管理-查看职位未完成

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

@@ -24,8 +24,10 @@ public class Company {
     private String type;
         @ApiModelProperty(value = "企业规模")
     private String scale;
+    private String scaleName;
         @ApiModelProperty(value = "所属行业")
     private String industry;
+    private String industryName;
         @ApiModelProperty(value = "企业地址")
     private String address;
         @ApiModelProperty(value = "企业介绍")

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

@@ -37,8 +37,7 @@
 	-->
 	<![CDATA[
 		insert into base_company
-	    (id_,name_,type_,scale_,industry_,address_,introduction_,contact_person,tel_,longtitude_,latitude_,email_,sort_no,create_by,create_time,update_by,update_time,del_flag,is_certification,credit_code,legal_person,legal_tel,business_license
-_url,logo_)
+	    (id_,name_,type_,scale_,industry_,address_,introduction_,contact_person,tel_,longtitude_,latitude_,email_,sort_no,create_by,create_time,update_by,update_time,del_flag,is_certification,credit_code,legal_person,legal_tel,business_license_url,logo_)
 		values
 		(
 #{id,jdbcType=VARCHAR}

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

@@ -6,6 +6,8 @@ import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.sys.entity.DataDictionary;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -24,6 +26,8 @@ import java.util.*;
 public class CompanyController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
     @Autowired
     private CompanyService companyService;
 
@@ -200,7 +204,7 @@ public class CompanyController {
             String name,
             String scale,
             String industry,
-            String isCertification,
+            Boolean isCertification,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -228,11 +232,15 @@ public class CompanyController {
             searchParams.put("industry",industry);
         }
 
-        if (StringUtils.isNotEmpty(isCertification)) {
+        if (isCertification != null) {
             searchParams.put("isCertification",isCertification);
         }
 
         Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(Company company : page.getResult()){
+            company.setScaleName(dataDictionaryService.findNameByCatalogNameAndValue("企业规模", company.getScale()));
+            company.setIndustryName(dataDictionaryService.findNameByCatalogNameAndValue("所属行业", company.getIndustry()));
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));