4. 心愿管理页面，“标题”改为“作品名”，“数量”改为“上架总量”；

5.	心愿管理，增加列“已互换数量”；“显示状态”改为“是否上架”取值【是、否】
6.	心愿管理，增加列“互换记录”，为链接列打开该作品的历史互换记录
7.	心愿管理，查询条件增加按“类别”查询
8.	心愿管理，有互换记录的，禁止删除；可删除的，删除前要弹框确认删除

11 心愿互换记录，查询条件“标题”改为“作品”，增加查询条件：爱心人士手机号、流水号、作品类别
12心愿互换记录，列表增加列：作品类别、作品名、爱心人士手机号、认领时间
13心愿互换记录，系统中没有看到“学生类型”的输入地方，暂时不要这列；
14心愿互换记录，删除功能，删除前弹窗提示确认，后台假删除；
15心愿互换记录，增加状态设置功能（校方在线下确认后，可以关闭、设置为完成状态）

16心愿互换记录，布局调整（布局要整齐），按内容纵向分栏显示：
顶部表格：作品、心愿相关信息
中间表格：爱心人士、认领相关信息
底部：校方基础信息、互换状态（有明显如：作品已寄出、心愿已收到、互换完成）

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

@@ -98,6 +98,10 @@ public class WishInfoUserRecord {
 	@ApiModelProperty(value = "人员ID")
 	private String regUserName;
 
+	@Transient
+	@ApiModelProperty(value = "人员电话")
+	private String regUserPhone;
+
 
 	@Transient
 	@ApiModelProperty(value = "互换状态(0：互换中，1：已完成)")
@@ -112,4 +116,14 @@ public class WishInfoUserRecord {
 	@ApiModelProperty(value = "学生类型")
 	private String studentType;
 
+
+	@Transient
+	@ApiModelProperty(value = "作品类型")
+	private String categoryN;
+
+
+	@Transient
+	@ApiModelProperty(value = "作品名")
+	private String wishInfoTitle;
+
 	}

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

@@ -104,6 +104,9 @@
 			<if test="searchParams.realName != null">
 				and real_name like #{searchParams.realName}
 			</if>
+			<if test="searchParams.phone != null">
+				and phone_ like #{searchParams.phone}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -119,6 +119,9 @@
 				<if test="completionTime!=null">
 		completion_time=#{completionTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="completionTime==null">
+				completion_time = null,
+			</if>
 				<if test="deliveryTime!=null">
 		delivery_time=#{deliveryTime,jdbcType= TIMESTAMP },
 		</if>
@@ -160,18 +163,32 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="WishInfoUserRecordMap">
 		<![CDATA[
-			select * from base_wish_info_user_record
+			select a.* from base_wish_info_user_record a
+			left join base_wish_info b on a.wish_info_id = b.id_
+			left join base_reg_user c on a.reg_user_id = c.id_
 		]]>
 		<where>
-			del_flag = 0
+			a.del_flag = 0
 			<if test="searchParams.wishInfoId != null">
-				and wish_info_id = #{searchParams.wishInfoId}
+				and a.wish_info_id = #{searchParams.wishInfoId}
 			</if>
 			<if test="searchParams.createBy != null">
-				and create_by = #{searchParams.createBy}
+				and a.create_by = #{searchParams.createBy}
 			</if>
 			<if test="searchParams.status != null">
-				and status_ = #{searchParams.status}
+				and a.status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.num != null">
+				and a.num_ like #{searchParams.num}
+			</if>
+			<if test="searchParams.phone != null">
+				and c.phone_ like #{searchParams.phone}
+			</if>
+			<if test="searchParams.category != null">
+				and b.category_ = #{searchParams.category}
+			</if>
+			<if test="searchParams.wishInfoTitle != null">
+				and b.title_ = #{searchParams.wishInfoTitle}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/LoveProjectController.java

@@ -53,7 +53,6 @@ public class LoveProjectController {
             loveProject.setDelFlag(false);
             loveProject.setCreateBy(subject);
             loveProject.setCreateTime(new Date());
-            loveProject.setType("1");
 
             String methodIds = "";
             for (String methodId : loveProject.getFeedbackMethodArray()) {

web/src/main/java/com/jpsoft/employment/modules/base/controller/RegUserController.java

@@ -200,7 +200,7 @@ public class RegUserController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String realName,
+            String phone,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -214,10 +214,10 @@ public class RegUserController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(realName)) {
-            searchParams.put("realName",realName + "%");
+        if (StringUtils.isNotEmpty(phone)) {
+            searchParams.put("phone",phone + "%");
         }
 
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoController.java

@@ -180,6 +180,32 @@ public class WishInfoController {
     }
 
 
+    @ApiOperation(value="删除验证")
+    @PostMapping("deleteValidate/{id}")
+    public MessageResult<WishInfo> deleteValidate(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<WishInfo> msgResult = new MessageResult<>();
+
+        try {
+
+            int count = wishInfoUserRecordService.countByWish(id);
+
+            if (count > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
     @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
     public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoUserRecordController.java

@@ -13,6 +13,7 @@ import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.base.entity.WishInfoUserRecord;
 import com.jpsoft.employment.modules.base.service.WishInfoUserRecordService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -40,6 +41,9 @@ public class WishInfoUserRecordController {
 
     @Autowired
     private StudentAspirationsService studentAspirationsService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
 	
 	
 	@ApiOperation(value="创建空记录")
@@ -115,6 +119,13 @@ public class WishInfoUserRecordController {
                     wishInfoUserRecord.setRegUserName(regUser.getRealName());
                 }
 
+                if(StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())){
+                    StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
+                    if(studentAspirations!=null){
+                        wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
+                    }
+                }
+
                 dto.setWishInfoUserRecord(wishInfoUserRecord);
                 dto.setWishInfo(wishInfo);
                 msgResult.setResult(true);
@@ -194,6 +205,44 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
+    @ApiOperation(value="更改状态")
+    @PostMapping("changeStatus")
+    public MessageResult<WishInfoUserRecord> changeStatus(String id,String status,@RequestAttribute String subject){
+        MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
+
+        try {
+            Date now = new Date();
+            WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
+            wishInfoUserRecord.setStatus(status);
+            if(status.equals("1")){
+                wishInfoUserRecord.setCompletionTime(now);
+            }
+            else{
+                wishInfoUserRecord.setCompletionTime(null);
+            }
+            wishInfoUserRecord.setUpdateBy(subject);
+            wishInfoUserRecord.setUpdateTime(new Date());
+
+            int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
 
     @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
@@ -233,7 +282,8 @@ public class WishInfoUserRecordController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String wishInfoId,String status,
+            String wishInfoId,String status,String num,String wishInfoTitle,
+            String category,String phone,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -247,7 +297,7 @@ public class WishInfoUserRecordController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
         if (StringUtils.isNotEmpty(wishInfoId)) {
             searchParams.put("wishInfoId",wishInfoId);
@@ -257,6 +307,22 @@ public class WishInfoUserRecordController {
             searchParams.put("status",status);
         }
 
+        if (StringUtils.isNotEmpty(num)) {
+            searchParams.put("num",num+"%");
+        }
+
+        if (StringUtils.isNotEmpty(wishInfoTitle)) {
+            searchParams.put("wishInfoTitle",wishInfoTitle);
+        }
+
+        if (StringUtils.isNotEmpty(category)) {
+            searchParams.put("category",category);
+        }
+
+        if (StringUtils.isNotEmpty(phone)) {
+            searchParams.put("phone",phone);
+        }
+
 
         Page<WishInfoUserRecord> page = wishInfoUserRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
@@ -264,12 +330,20 @@ public class WishInfoUserRecordController {
             RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
             if(regUser!=null){
                 wishInfoUserRecord.setRegUserName(regUser.getRealName());
+                wishInfoUserRecord.setRegUserPhone(regUser.getPhone());
             }
 
             WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
             if(wishInfo!=null){
                 wishInfoUserRecord.setStudentName(wishInfo.getStudentName());
                 wishInfoUserRecord.setStudentType(wishInfo.getStudentType());
+                wishInfoUserRecord.setWishInfoTitle(wishInfo.getTitle());
+
+                String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型",wishInfo.getCategory());
+                if(StringUtils.isNotEmpty(categoryN)){
+                    wishInfoUserRecord.setCategoryN(categoryN);
+                }
+
             }
 
             if(StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())){