接口修改

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

@@ -226,19 +226,19 @@
 				jr.requirements_ AS requirements,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
-				sdda.name_ AS scaleName,
-				sddb.name_ AS wageTypeN,
+				bc.scale_ AS scaleName,
+				bc.industry_ AS industry,
 				bci.city_name AS cityName,
-				sddc.name_ AS industry,
-				sddd.name_ AS workYear,
-				jwc.name_ AS positionName
+				sdda.name_ AS education,
+				sddb.name_ AS wageTypeN,
+				sddc.name_ AS workYear,
+			  	jwc.name_ AS positionName
 			FROM
 				job_recruitment AS jr
 			LEFT JOIN base_company AS bc ON jr.company_id = bc.id_
-			LEFT JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
+			LEFT JOIN sys_data_dictionary AS sdda ON jr.education_ = sdda.id_
 			LEFT JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
-			LEFT JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
-			LEFT JOIN sys_data_dictionary AS sddd ON jr.work_year = sddd.id_
+			LEFT JOIN sys_data_dictionary AS sddc ON jr.work_year = sddc.id_
 			LEFT JOIN base_city AS bci ON jr.area_ = bci.id_
 			LEFT JOIN job_work_category jwc ON jr.position_ = jwc.id_
 		]]>

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

@@ -129,6 +129,14 @@ public class RecruitmentApiController {
 
         Page<Map> page = recruitmentService.foundPageList(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (Map map:page) {
+            String scaleName = dataDictionaryService.findNameByCatalogNameAndValue("企业规模",map.get("scaleName").toString());
+            map.put("scaleName",scaleName);
+
+            String industry = dataDictionaryService.findNameByCatalogNameAndValue("所属行业",map.get("industry").toString());
+            map.put("industry",industry);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
@@ -336,6 +344,14 @@ public class RecruitmentApiController {
 
         Page<Map> page = recruitmentService.foundPageList(searchParams,1,20,true,sortList);
 
+        for (Map map:page) {
+            String scaleName = dataDictionaryService.findNameByCatalogNameAndValue("企业规模",map.get("scaleName").toString());
+            map.put("scaleName",scaleName);
+
+            String industry = dataDictionaryService.findNameByCatalogNameAndValue("所属行业",map.get("industry").toString());
+            map.put("industry",industry);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));