1

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

@@ -17,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(@Param(value="wishInfoId") String wishInfoId, @Param(value="swapped") Boolean swapped);
+	List<StudentAspirations> findByWish(@Param(value="wishInfoId") String wishInfoId);
 	List<StudentAspirations> listByWishInfo(String wishInfoId);
 
 }

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

@@ -46,5 +46,8 @@ public class StudentAspirations {
 	
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+	@ApiModelProperty(value = "互换状态")
+	private String status;
 	
 		}

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

@@ -73,8 +73,6 @@ 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

@@ -15,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, Boolean swapped);
+	List<StudentAspirations> findByWish(String wishInfoId);
 	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, Boolean swapped) {
+	public List<StudentAspirations> findByWish(String wishInfoId) {
 		// TODO Auto-generated method stub
-		return studentAspirationsDAO.findByWish(wishInfoId,swapped);
+		return studentAspirationsDAO.findByWish(wishInfoId);
 	}
 
 	@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(),null);
+			List<StudentAspirations> curStudentAspirationsList = studentAspirationsDAO.findByWish(model.getId());
 
 			for (StudentAspirations studentAspirations:curStudentAspirationsList) {
 				studentAspirations.setDelFlag(true);

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

@@ -12,7 +12,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
+		<result property="status" column="status_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.StudentAspirations">
 	<!--
@@ -83,27 +83,10 @@
 		select * from base_student_aspirations WHERE del_flag = 0 AND wish_info_id = #{0}
 	</select>
 	<select id="findByWish" parameterType="string" resultMap="StudentAspirationsMap">
-		SELECT * FROM base_student_aspirations
-		WHERE del_flag = 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 = #{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 a.*,b.status_ FROM base_student_aspirations a
+		LEFT JOIN base_wish_info_user_record b ON a.id_ = b.student_aspirations_id AND b.status_ != 2
+		WHERE a.del_flag = 0
+		AND a.wish_info_id = #{wishInfoId}
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="StudentAspirationsMap">
 		<![CDATA[

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

@@ -172,8 +172,7 @@ public class WishApi {
         try {
             WishInfo wishInfo = wishInfoService.get(id);
             wishInfo.setRecordAmount(wishInfoUserRecordService.countByWish(id));
-            wishInfo.setAspirationList(studentAspirationsService.findByWish(id,false));
-            wishInfo.setRecordList(studentAspirationsService.findByWish(id,true));
+            wishInfo.setAspirationList(studentAspirationsService.findByWish(id));
 
             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:

web/src/main/resources/application.yml

@@ -63,7 +63,7 @@ spring:
     # Redis数据库索引（默认为0）
     database: 4
     # Redis服务器地址
-    host: 127.0.0.1
+    host: 192.168.33.20
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）