1

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

@@ -1,6 +1,8 @@
 package com.jpsoft.employment.modules.base.dao;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.employment.modules.base.entity.StudentAspirations;
 import java.util.Map;
@@ -15,7 +17,7 @@ public interface StudentAspirationsDAO {
 	int delete(String id);
 	List<StudentAspirations> list();
 	List<StudentAspirations> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<StudentAspirations> findByWish(String wishInfoId);
+	List<StudentAspirations> findByWish(@Param(value="wishInfoId") String wishInfoId, @Param(value="swapped") Boolean swapped);
 	List<StudentAspirations> listByWishInfo(String wishInfoId);
 
 }

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

@@ -73,6 +73,8 @@ public class WishInfo {
 	private Integer recordAmount;
 	@ApiModelProperty(value = "心愿列表")
 	private List<StudentAspirations> aspirationList;
+	@ApiModelProperty(value = "已换心愿列表")
+	private List<StudentAspirations> recordList;
 
 
 

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import com.jpsoft.employment.modules.base.entity.StudentAspirations;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
+import org.apache.ibatis.annotations.Param;
 
 public interface StudentAspirationsService {
 	StudentAspirations get(String id);
@@ -14,6 +15,6 @@ public interface StudentAspirationsService {
 	int delete(String id);
 	List<StudentAspirations> list();
 	Page<StudentAspirations> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<StudentAspirations> findByWish(String wishInfoId);
+	List<StudentAspirations> findByWish(String wishInfoId, Boolean swapped);
 	List<StudentAspirations> listByWishInfo(String wishInfoId);
 }

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

@@ -69,9 +69,9 @@ public class StudentAspirationsServiceImpl implements StudentAspirationsService
 	}
 
 	@Override
-	public List<StudentAspirations> findByWish(String wishInfoId) {
+	public List<StudentAspirations> findByWish(String wishInfoId, Boolean swapped) {
 		// TODO Auto-generated method stub
-		return studentAspirationsDAO.findByWish(wishInfoId);
+		return studentAspirationsDAO.findByWish(wishInfoId,swapped);
 	}
 
 	@Override

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

@@ -70,7 +70,7 @@ public class WishInfoServiceImpl implements WishInfoService {
 	public int updateAndAspirations(WishInfo model){
 		int count = wishInfoDAO.update(model);
 		if(count>0){
-			List<StudentAspirations> curStudentAspirationsList = studentAspirationsDAO.findByWish(model.getId());
+			List<StudentAspirations> curStudentAspirationsList = studentAspirationsDAO.findByWish(model.getId(),null);
 
 			for (StudentAspirations studentAspirations:curStudentAspirationsList) {
 				studentAspirations.setDelFlag(true);

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

@@ -85,14 +85,25 @@
 	<select id="findByWish" parameterType="string" resultMap="StudentAspirationsMap">
 		SELECT * FROM base_student_aspirations
 		WHERE del_flag = 0
-		AND wish_info_id = #{0}
+		AND wish_info_id = #{wishInfoId}
+		<if test="swapped == false">
 		AND id_ NOT IN (
 			SELECT student_aspirations_id FROM base_wish_info_user_record
 			WHERE del_flag = 0
 			AND status_ != '2'
-			AND wish_info_id = #{0}
+			AND wish_info_id = #{wishInfoId}
 			GROUP BY student_aspirations_id
 		)
+		</if>
+		<if test="swapped == true">
+			AND id_ IN (
+			SELECT student_aspirations_id FROM base_wish_info_user_record
+			WHERE del_flag = 0
+			AND status_ != '2'
+			AND wish_info_id = #{wishInfoId}
+			GROUP BY student_aspirations_id
+			)
+		</if>
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="StudentAspirationsMap">
 		<![CDATA[

web/src/main/java/com/jpsoft/employment/modules/base/api/WishApi.java

@@ -172,7 +172,8 @@ public class WishApi {
         try {
             WishInfo wishInfo = wishInfoService.get(id);
             wishInfo.setRecordAmount(wishInfoUserRecordService.countByWish(id));
-            wishInfo.setAspirationList(studentAspirationsService.findByWish(id));
+            wishInfo.setAspirationList(studentAspirationsService.findByWish(id,false));
+            wishInfo.setRecordList(studentAspirationsService.findByWish(id,true));
 
             if (wishInfo != null) {
                 msgResult.setResult(true);

web/src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ server:
 
 spring:
   datasource:
-#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft2016
-    url: jdbc:log4jdbc:mysql://116.62.150.160:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: jpsoft
+     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft2016
+#    url: jdbc:log4jdbc:mysql://116.62.150.160:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft
   devtools:
     add-properties: false
     restart: