代码同步

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

@@ -64,7 +64,7 @@ public class JobEnterpriseRelation {
 
 
 	@ApiModelProperty(value = "是否已读")
-	private Boolean isRead;
+	private Boolean isRead = false;
 
 	@Transient
 	@ApiModelProperty(value = "岗位信息")

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

@@ -49,7 +49,7 @@ public class RecruitPersonRelation {
 	private Boolean delFlag;
 
 	@ApiModelProperty(value = "是否已读")
-	private Boolean isRead;
+	private Boolean isRead = false;
 
 
 	@Transient

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

@@ -189,6 +189,9 @@
 				and a.hope_salary <= #{searchParams.salaryEnd}
 				]]>
 			</if>
+			<if test="searchParams.industry != null">
+				and a.Intended_industries = #{searchParams.industry}
+			</if>
 			<if test="searchParams.ids != null">
 				<foreach item="id" collection="searchParams.ids"  open="and id_ in (" separator="," close=")">
 					#{id}

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

@@ -202,6 +202,9 @@
 				and a.salary_ <= #{searchParams.salaryEnd}
 				]]>
 			</if>
+			<if test="searchParams.status != null">
+				and a.status_ = #{searchParams.status}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

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

@@ -208,6 +208,7 @@ public class JobApiController {
     })
     public MessageResult<Map> jobDetail(
             @RequestParam(value="id",defaultValue="") String id,
+            @RequestParam(value="isRead",defaultValue="0") String isRead,
             HttpServletRequest request){
 
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -238,6 +239,7 @@ public class JobApiController {
                 }
                 BrowseNumber++;
                 jobInformationInfo.setBrowseNumber(BrowseNumber);
+
                 jobInformationInfoService.update(jobInformationInfo);
 
                 personInfo = personInfoService.get(jobInformationInfo.getPersonId());

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

@@ -109,11 +109,11 @@ public class RecruitApiController {
             @ApiImplicitParam(name = "status", value = "查询是找工作0找零工1,不传默认找工作0)", required = false, paramType = "form"),
             @ApiImplicitParam(name = "statusType", value = "找工作(日结1,周结2,月结3 不传默认最新)/找零工(最新1,最热2,不传默认最新)", required = false, paramType = "form"),
             @ApiImplicitParam(name = "content", value = "搜索内容", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "industry", value = "行业(找工作)字典表", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "industry", value = "行业(找工作)(找零工)字典表", required = false, paramType = "form"),
             @ApiImplicitParam(name = "settlementMethod", value = "结算方式(找工作)字典表", required = false, paramType = "form"),
             @ApiImplicitParam(name = "salaryForm", value = "薪资形式(找工作)字典表", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "salaryStart", value = "薪资待遇起(找零工)", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "salaryEnd", value = "薪资待遇止(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryStart", value = "薪资待遇起找工作)(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryEnd", value = "薪资待遇止找工作)(找零工)", required = false, paramType = "form"),
             @ApiImplicitParam(name = "workExp", value = "工作经验(字典表 1无,2半年,3一年,4两年,5三年,6五年,7十年及以上)(找零工)", required = false, paramType = "form"),
     })
     public MessageResult<Map> findRecruitSearch(
@@ -136,6 +136,16 @@ public class RecruitApiController {
 
             List<Sort> sortList = new ArrayList<>();
 
+            if (StringUtils.isNotEmpty(industry)) {
+                searchParams.put("industry",industry);
+            }
+            if (StringUtils.isNotEmpty(salaryStart)) {
+                searchParams.put("salaryStart",salaryStart);
+            }
+            if (StringUtils.isNotEmpty(salaryEnd)) {
+                searchParams.put("salaryEnd",salaryEnd);
+            }
+
             if("0".equals(status)){
                 sortList.add(new Sort("a.update_time","desc"));
                 if (StringUtils.isNotEmpty(content)) {
@@ -146,9 +156,6 @@ public class RecruitApiController {
                     searchParams.put("settlementMethod",statusType);
                 }
 
-                if (StringUtils.isNotEmpty(industry)) {
-                    searchParams.put("industry",industry);
-                }
                 if (StringUtils.isNotEmpty(settlementMethod)) {
                     searchParams.put("settlementMethod",settlementMethod);
                 }
@@ -169,17 +176,15 @@ public class RecruitApiController {
                     searchParams.put("content","%" + content.trim() + "%");
                 }
 
-                if (StringUtils.isNotEmpty(salaryStart)) {
-                    searchParams.put("salaryStart",salaryStart);
-                }
-                if (StringUtils.isNotEmpty(salaryEnd)) {
-                    searchParams.put("salaryEnd",salaryEnd);
-                }
-
                 if (StringUtils.isNotEmpty(workExp)) {
                     searchParams.put("workExp",workExp);
                 }
 
+                if (StringUtils.isNotEmpty(settlementMethod)) {
+                    searchParams.put("method",settlementMethod);
+                }
+
+
                 if ("2".equals(statusType)) {
                     sortList.add(new Sort("a.browse_number","asc"));
                     sortList.add(new Sort("a.update_time","desc"));