BUG修改

common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverContentDAO.java

@@ -17,4 +17,5 @@ public interface ResumeDeliverContentDAO {
 	List<ResumeDeliverContent> list();
 	List<ResumeDeliverContent> search(Map<String, Object> searchParams, List<Sort> sortList);
 	ResumeDeliverContent findTopByUserId(String userId);
+	ResumeDeliverContent findTopByDeliverId(String deliverId);
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverContentService.java

@@ -16,4 +16,5 @@ public interface ResumeDeliverContentService {
 	List<ResumeDeliverContent> list();
 	Page<ResumeDeliverContent> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	ResumeDeliverContent findTopByUserId(String userId);
+	ResumeDeliverContent findTopByDeliverId(String deliverId);
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverContentServiceImpl.java

@@ -73,4 +73,9 @@ public class ResumeDeliverContentServiceImpl implements ResumeDeliverContentServ
 	public ResumeDeliverContent findTopByUserId(String userId){
 		return resumeDeliverContentDAO.findTopByUserId(userId);
 	}
+
+	@Override
+	public ResumeDeliverContent findTopByDeliverId(String deliverId){
+		return resumeDeliverContentDAO.findTopByDeliverId(deliverId);
+	}
 }

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

@@ -213,7 +213,9 @@
 		LEFT JOIN base_message_read b ON a.id_ = b.message_id
 		WHERE
 		a.del_flag = 0
-		AND a.classify_ = '1'
+		<if test="classify != null">
+			AND a.classify_ = #{classify}
+		</if>
 		AND ( recipient_id = #{userId} OR recipient_id IS NULL )
 		AND a.status_ = '1'
 		AND a.type_ = '1'

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

@@ -151,4 +151,18 @@
 			create_time DESC
 		LIMIT 1
 	</select>
+
+	<select id="findTopByDeliverId" resultMap="ResumeDeliverContentMap">
+		SELECT
+		*
+		FROM
+		job_resume_deliver_content
+		WHERE
+		job_user_id = #{userId}
+		and del_flag = 0
+		ORDER BY
+		create_time DESC
+		LIMIT 1
+	</select>
+
 </mapper>

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

@@ -352,10 +352,14 @@ public class MessageNoticeApiController {
             if(isAgree){
                 if(StringUtils.isNotEmpty(messageNotice.getDeliverId())){
                     ResumeDeliver resumeDeliver = resumeDeliverService.get(messageNotice.getDeliverId());
-                    String chatStatus = resumeDeliver.getChatStatus();
-                    int chatStatusNum = Integer.parseInt(chatStatus) + 1;
+                    ResumeDeliverContent resumeDeliverContent = resumeDeliverContentService.findTopByDeliverId(messageNotice.getDeliverId());
+                    String chatStatus = resumeDeliverContent.getChatStatus();
+                    String nextChatStatus = chatStatus;
+                    if("4".equals(chatStatus)) {
+                        nextChatStatus = "5";
+                    }
 
-                    resumeDeliver.setChatStatus(String.valueOf(chatStatusNum));
+                    resumeDeliver.setChatStatus(nextChatStatus);
                     resumeDeliver.setUpdateBy(subject);
                     resumeDeliver.setUpdateTime(new Date());
                     resumeDeliverService.update(resumeDeliver);