心愿互换 增加字段 调整详情输出

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

@@ -15,6 +15,6 @@ public interface WishInfoUserRecordDAO {
 	int delete(String id);
 	List<WishInfoUserRecord> list();
 	List<WishInfoUserRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<WishInfoUserRecord> findByWish(String wishInfoId);
+	int countByWish(String wishInfoId);
 	String getLastSerialNumber(String date);
 }

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

@@ -63,8 +63,8 @@ public class WishInfo {
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
+	@ApiModelProperty(value = "已换数量")
+	private Integer recordAmount;
 	@ApiModelProperty(value = "心愿列表")
 	private List<StudentAspirations> aspirationList;
-	@ApiModelProperty(value = "已换列表")
-	private List<WishInfoUserRecord> recordList;
 }

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

@@ -16,69 +16,77 @@ import lombok.Data;
 @Data
 @ApiModel(value = "base_wish_info_user_record的实体类")
 public class WishInfoUserRecord {
-		@ApiModelProperty(value = "ID")
+	@ApiModelProperty(value = "ID")
 	private String id;
-	
-				@ApiModelProperty(value = "人员ID")
+
+	@ApiModelProperty(value = "人员ID")
 	private String regUserId;
-	
-				@ApiModelProperty(value = "心愿信息ID")
+
+	@ApiModelProperty(value = "心愿信息ID")
 	private String wishInfoId;
-	
-				@ApiModelProperty(value = "是否现场互换心愿")
+
+	@ApiModelProperty(value = "学员心愿ID")
+	private String studentAspirationsId;
+
+	@ApiModelProperty(value = "是否现场互换心愿")
 	private Boolean isSpot;
-	
-				@ApiModelProperty(value = "互换状态(0：互换中，1：已完成)")
+
+	@ApiModelProperty(value = "互换状态(0：互换中，1：已完成)")
 	private String status;
-	
-				@ApiModelProperty(value = "流水号")
+
+	@ApiModelProperty(value = "流水号")
 	private String num;
-	
-				@ApiModelProperty(value = "是否删除")
+
+	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
-	
-				@ApiModelProperty(value = "创建人")
+
+	@ApiModelProperty(value = "创建人")
 	private String createBy;
-	
-					@ApiModelProperty(value = "创建时间")
+
+	@ApiModelProperty(value = "创建时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date createTime;
-	
-			@ApiModelProperty(value = "更新人")
+
+	@ApiModelProperty(value = "更新人")
 	private String updateBy;
-	
-					@ApiModelProperty(value = "更新时间")
+
+	@ApiModelProperty(value = "更新时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date updateTime;
-	
-			@ApiModelProperty(value = "寄件人")
+
+	@ApiModelProperty(value = "寄件人")
 	private String sender;
-	
-				@ApiModelProperty(value = "寄件人地址")
+
+	@ApiModelProperty(value = "寄件人地址")
 	private String senderAddress;
-	
-				@ApiModelProperty(value = "寄件人电话")
+
+	@ApiModelProperty(value = "寄件人电话")
 	private String senderPhone;
-	
-				@ApiModelProperty(value = "收件人")
+
+	@ApiModelProperty(value = "收件人")
 	private String recipients;
-	
-				@ApiModelProperty(value = "收件人地址")
+
+	@ApiModelProperty(value = "收件人地址")
 	private String recipientsAddress;
-	
-				@ApiModelProperty(value = "收件人电话")
+
+	@ApiModelProperty(value = "收件人电话")
 	private String recipientsPhone;
-	
-					@ApiModelProperty(value = "完成时间")
+
+	@ApiModelProperty(value = "完成时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date completionTime;
-	
-				@ApiModelProperty(value = "发货时间")
+
+	@ApiModelProperty(value = "发货时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date deliveryTime;
-	
+
+
+	@ApiModelProperty(value = "用户头像")
+	private String regUserHeadImg;
+	@ApiModelProperty(value = "交换礼物")
+	private String aspirationsName;
 	}

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

@@ -14,6 +14,6 @@ public interface WishInfoUserRecordService {
 	int delete(String id);
 	List<WishInfoUserRecord> list();
 	Page<WishInfoUserRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<WishInfoUserRecord> findByWish(String wishInfoId);
+	int countByWish(String wishInfoId);
 	String getLastSerialNumber(String date);
 }

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

@@ -69,8 +69,8 @@ public class WishInfoUserRecordServiceImpl implements WishInfoUserRecordService
 	}
 
 	@Override
-	public List<WishInfoUserRecord> findByWish(String wishInfoId) {
-		return wishInfoUserRecordDAO.findByWish(wishInfoId);
+	public int countByWish(String wishInfoId) {
+		return wishInfoUserRecordDAO.countByWish(wishInfoId);
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@
 		<id property="id" column="id_" />
 			<result property="regUserId" column="reg_user_id" />
 			<result property="wishInfoId" column="wish_info_id" />
+		<result property="studentAspirationsId" column="student_aspirations_id" />
 			<result property="isSpot" column="is_spot" />
 			<result property="status" column="status_" />
 			<result property="num" column="num_" />
@@ -32,12 +33,13 @@
 	-->
 	<![CDATA[
 		insert into base_wish_info_user_record
-	    (id_,reg_user_id,wish_info_id,is_spot,status_,num_,del_flag,create_by,create_time,update_by,update_time,sender_,sender_address,sender_phone,recipients_,recipients_address,recipients_phone,completion_time,delivery_time)
+	    (id_,reg_user_id,wish_info_id,student_aspirations_id,is_spot,status_,num_,del_flag,create_by,create_time,update_by,update_time,sender_,sender_address,sender_phone,recipients_,recipients_address,recipients_phone,completion_time,delivery_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{regUserId,jdbcType=VARCHAR}
 ,#{wishInfoId,jdbcType=VARCHAR}
+,#{studentAspirationsId,jdbcType=VARCHAR}
 ,#{isSpot,jdbcType= NUMERIC }
 ,#{status,jdbcType=VARCHAR}
 ,#{num,jdbcType=VARCHAR}
@@ -69,6 +71,9 @@
 				<if test="wishInfoId!=null">
 		wish_info_id=#{wishInfoId,jdbcType=VARCHAR},
 		</if>
+			<if test="studentAspirationsId!=null">
+				student_aspirations_id=#{studentAspirationsId,jdbcType=VARCHAR},
+			</if>
 				<if test="isSpot!=null">
 		is_spot=#{isSpot,jdbcType= NUMERIC },
 		</if>
@@ -132,8 +137,8 @@
 		ORDER BY num_ DESC
 		LIMIT 1
 	</select>
-	<select id="findByWish" parameterType="string" resultMap="WishInfoUserRecordMap">
-		SELECT * FROM base_wish_info_user_record
+	<select id="countByWish" parameterType="string" resultType="int">
+		SELECT COUNT(*) FROM base_wish_info_user_record
 		WHERE del_flag = 0
 		AND wish_info_id = #{0}
 	</select>
@@ -145,6 +150,7 @@
 			select * from base_wish_info_user_record
 		]]>
 		<where>
+			del_flag = 0
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java

@@ -76,6 +76,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/base/api/wish/list")
 				.excludePathPatterns("/base/api/wish/edit")
 				.excludePathPatterns("/base/api/wish/wishTypeList")
+				.excludePathPatterns("/base/api/wish/recentlyList")
 		;
 
 

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

@@ -1,13 +1,8 @@
 package com.jpsoft.employment.modules.base.api;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.AddressInfo;
-import com.jpsoft.employment.modules.base.entity.WishInfo;
-import com.jpsoft.employment.modules.base.entity.WishInfoUserRecord;
-import com.jpsoft.employment.modules.base.service.AddressInfoService;
-import com.jpsoft.employment.modules.base.service.StudentAspirationsService;
-import com.jpsoft.employment.modules.base.service.WishInfoService;
-import com.jpsoft.employment.modules.base.service.WishInfoUserRecordService;
+import com.jpsoft.employment.modules.base.entity.*;
+import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
@@ -44,6 +39,8 @@ public class WishApi {
     private StudentAspirationsService studentAspirationsService;
     @Autowired
     private DataDictionaryService dataDictionaryService;
+    @Autowired
+    private RegUserService regUserService;
 
     @ApiOperation(value="心愿单列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
@@ -72,6 +69,30 @@ public class WishApi {
         return msgResult;
     }
 
+    @ApiOperation(value="最近互换心愿列表")
+    @RequestMapping(value = "recentlyList",method = RequestMethod.POST)
+    public MessageResult recentlyList(){
+        MessageResult msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        Page<WishInfoUserRecord> page = wishInfoUserRecordService.pageSearch(searchParams,1,5,false,sortList);
+        for(WishInfoUserRecord wishInfoUserRecord : page.getResult()){
+            RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
+            wishInfoUserRecord.setRegUserHeadImg(regUser.getHeadImg());
+            StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
+            wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
+
     @ApiOperation(value="心愿单详情")
     @RequestMapping(value = "edit",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -82,8 +103,8 @@ public class WishApi {
 
         try {
             WishInfo wishInfo = wishInfoService.get(id);
+            wishInfo.setRecordAmount(wishInfoUserRecordService.countByWish(id));
             wishInfo.setAspirationList(studentAspirationsService.findByWish(id));
-            wishInfo.setRecordList(wishInfoUserRecordService.findByWish(id));
 
             if (wishInfo != null) {
                 msgResult.setResult(true);