心愿互换状态改为取消的逻辑，需要修改心愿数量

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

@@ -81,6 +81,10 @@ public class ParticipateProjectInfo {
 	@ApiModelProperty(value = "爱心项目标题")
 	private String loveProjectTitle;
 
+	@Transient
+	@ApiModelProperty(value = "爱心项目类型")
+	private String loveProjectTypeN;
+
 	@Transient
 	@ApiModelProperty(value = "状态(1：进行中，2：完成，3：取消)翻译")
 	private String statusN;

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

@@ -180,6 +180,11 @@
 			<if test="searchParams.status != null">
 				and a.status_ = #{searchParams.status}
 			</if>
+			<if test="searchParams.noneStatus != null">
+				<![CDATA[
+					and a.status_ <> #{searchParams.noneStatus}
+				]]>
+			</if>
 			<if test="searchParams.num != null">
 				and a.num_ like #{searchParams.num}
 			</if>

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

@@ -255,6 +255,14 @@ public class ParticipateProjectInfoController {
             LoveProject loveProject = loveProjectService.get(participateProjectInfo.getLoveProjectId());
             if(loveProject!=null){
                 participateProjectInfo.setLoveProjectTitle(loveProject.getTitle());
+
+                if(StringUtils.isNotEmpty(loveProject.getType())){
+                    String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("内容类型",loveProject.getType());
+                    if(StringUtils.isNotEmpty(categoryN)){
+                        participateProjectInfo.setLoveProjectTypeN(categoryN);
+                    }
+                }
+
             }
 
             FeedbackMethod feedbackMethod = feedbackMethodService.get(participateProjectInfo.getFeedbackId());

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

@@ -287,7 +287,7 @@ public class WishInfoUserRecordController {
     @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String wishInfoId, String status, String num, String wishInfoTitle,
-            String category, String phone,
+            String category, String phone,String noneStatus,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
             HttpServletRequest request) {
@@ -311,6 +311,10 @@ public class WishInfoUserRecordController {
             searchParams.put("status", status);
         }
 
+        if (StringUtils.isNotEmpty(noneStatus)) {
+            searchParams.put("noneStatus", noneStatus);
+        }
+
         if (StringUtils.isNotEmpty(num)) {
             searchParams.put("num", "%" + num + "%");
         }