后台功能

1.人员管理
2.心愿管理
3.心愿互换记录
4.项目互助管理
5.回馈方式管理

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

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.FeedbackMethod;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface FeedbackMethodDAO {
+	int insert(FeedbackMethod entity);
+	int update(FeedbackMethod entity);
+	int exist(String id);
+	FeedbackMethod get(String id);
+	int delete(String id);
+	List<FeedbackMethod> list();
+	List<FeedbackMethod> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/dto/WishInfoUserRecordDTO.java

@@ -0,0 +1,11 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import com.jpsoft.employment.modules.base.entity.WishInfo;
+import com.jpsoft.employment.modules.base.entity.WishInfoUserRecord;
+import lombok.Data;
+
+@Data
+public class WishInfoUserRecordDTO {
+    private WishInfoUserRecord wishInfoUserRecord;
+    private WishInfo wishInfo;
+}

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

@@ -0,0 +1,56 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_feedback_method的实体类
+ */
+@Data
+@ApiModel(value = "base_feedback_method的实体类")
+public class FeedbackMethod {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "名称")
+	private String name;
+	
+				@ApiModelProperty(value = "类型（0：不可点击，1：可点击查看）")
+	private String type;
+	
+				@ApiModelProperty(value = "详细说明")
+	private String detail;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+
+			@Transient
+			@ApiModelProperty(value = "类型（0：不可点击，1：可点击查看）")
+			private String typeN;
+	
+		}

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

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -55,5 +57,13 @@ public class LoveProject {
 	
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+	@Transient
+	@ApiModelProperty(value = "回馈方式")
+	private String feedbackMethod;
+
+	@Transient
+	@ApiModelProperty(value = "回馈方式")
+	private String[] feedbackMethodArray;
 	
 		}

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

@@ -4,6 +4,9 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+import java.util.List;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,4 +66,18 @@ public class WishInfo {
 
 	@ApiModelProperty(value = "数量")
 	private Integer recordAmount;
+
+
+	@Transient
+	@ApiModelProperty(value = "类别翻译")
+	private String categoryN;
+
+	@Transient
+	@ApiModelProperty(value = "显示状态(0：下架，1：上架)")
+	private String statusN;
+
+
+	@Transient
+	@ApiModelProperty(value = "学生心愿列表")
+	private List<StudentAspirations> studentAspirationsList;
 	}

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

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -80,5 +82,23 @@ public class WishInfoUserRecord {
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date deliveryTime;
+
+	@Transient
+	@ApiModelProperty(value = "人员ID")
+	private String regUserName;
+
+
+	@Transient
+	@ApiModelProperty(value = "互换状态(0：互换中，1：已完成)")
+	private String statusN;
+
+
+	@Transient
+	@ApiModelProperty(value = "学生姓名")
+	private String studentName;
+
+	@Transient
+	@ApiModelProperty(value = "学生类型")
+	private String studentType;
 	
 	}

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

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.FeedbackMethod;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface FeedbackMethodService {
+	FeedbackMethod get(String id);
+	boolean exist(String id);
+	int insert(FeedbackMethod model);
+	int update(FeedbackMethod model);
+	int delete(String id);
+	List<FeedbackMethod> list();
+	Page<FeedbackMethod> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

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

@@ -10,6 +10,7 @@ public interface WishInfoService {
 	WishInfo get(String id);
 	boolean exist(String id);
 	int insert(WishInfo model);
+	int insertAndAspirations(WishInfo model);
 	int update(WishInfo model);
 	int delete(String id);
 	List<WishInfo> list();

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

@@ -0,0 +1,70 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.FeedbackMethodDAO;
+import com.jpsoft.employment.modules.base.entity.FeedbackMethod;
+import com.jpsoft.employment.modules.base.service.FeedbackMethodService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="feedbackMethodService")
+public class FeedbackMethodServiceImpl implements FeedbackMethodService {
+	@Resource(name="feedbackMethodDAO")
+	private FeedbackMethodDAO feedbackMethodDAO;
+
+	@Override
+	public FeedbackMethod get(String id) {
+		// TODO Auto-generated method stub
+		return feedbackMethodDAO.get(id);
+	}
+
+	@Override
+	public int insert(FeedbackMethod model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return feedbackMethodDAO.insert(model);
+	}
+
+	@Override
+	public int update(FeedbackMethod model) {
+		// TODO Auto-generated method stub
+		return feedbackMethodDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return feedbackMethodDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = feedbackMethodDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<FeedbackMethod> list() {
+		// TODO Auto-generated method stub
+		return feedbackMethodDAO.list();
+	}
+		
+	@Override
+	public Page<FeedbackMethod> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<FeedbackMethod> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            feedbackMethodDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.base.entity.StudentAspirations;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.jpsoft.employment.modules.base.dao.WishInfoDAO;
@@ -33,6 +35,24 @@ public class WishInfoServiceImpl implements WishInfoService {
 		return wishInfoDAO.insert(model);
 	}
 
+
+	@Override
+	public int insertAndAspirations(WishInfo model){
+		int count = wishInfoDAO.insert(model);
+		if(count>0){
+			for (StudentAspirations studentAspirations:model.getStudentAspirationsList()) {
+				studentAspirations.setId(UUID.randomUUID().toString());
+				studentAspirations.setDelFlag(false);
+				studentAspirations.setCreateTime(model.getCreateTime());
+				studentAspirations.setCreateBy(model.getCreateBy());
+				studentAspirations.setWishInfoId(model.getId());
+
+			}
+		}
+
+		return count;
+	}
+
 	@Override
 	public int update(WishInfo model) {
 		// TODO Auto-generated method stub

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.FeedbackMethodDAO">
+	<resultMap id="FeedbackMethodMap" type="com.jpsoft.employment.modules.base.entity.FeedbackMethod">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="type" column="type_" />
+			<result property="detail" column="detail_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.FeedbackMethod">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_feedback_method
+	    (id_,name_,type_,detail_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{detail,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_feedback_method where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.FeedbackMethod">
+		update base_feedback_method
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="detail!=null">
+		detail_=#{detail,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="FeedbackMethodMap">
+		select * from base_feedback_method where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_feedback_method where id_=#{0}
+	</select>
+	<select id="list" resultMap="FeedbackMethodMap">
+		select * from base_feedback_method where del_flag=false order by create_time desc
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="FeedbackMethodMap">
+		<![CDATA[
+			select * from base_feedback_method
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

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

@@ -16,6 +16,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="feedbackMethod" column="feedback_method" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LoveProject">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_love_project
-	    (id_,title_,content_,image_,contact_phone,contacts_,type_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,title_,content_,image_,contact_phone,contacts_,type_,create_by,create_time,update_by,update_time,del_flag,feedback_method)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{feedbackMethod,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -82,6 +84,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="feedbackMethod!=null">
+				feedback_method=#{feedbackMethod,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -99,8 +104,9 @@
 			select * from base_love_project
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag=false
+			<if test="searchParams.title != null">
+				and title_ like #{searchParams.title}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -94,8 +94,9 @@
 			select * from base_reg_user
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag = false
+			<if test="searchParams.realName != null">
+				and real_name like #{searchParams.realName}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/addressInfo")
+@RequestMapping("/base/addressInfo")
 public class AddressInfoController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

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

@@ -0,0 +1,255 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.base.entity.FeedbackMethod;
+import com.jpsoft.employment.modules.base.service.FeedbackMethodService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/feedbackMethod")
+public class FeedbackMethodController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private FeedbackMethodService feedbackMethodService;
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<FeedbackMethod> create(){
+        MessageResult<FeedbackMethod> msgResult = new MessageResult<>();
+
+        FeedbackMethod feedbackMethod = new FeedbackMethod();
+
+        msgResult.setData(feedbackMethod);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<FeedbackMethod> add(@RequestBody FeedbackMethod feedbackMethod,@RequestAttribute String subject){
+        MessageResult<FeedbackMethod> msgResult = new MessageResult<>();
+
+        try {
+            feedbackMethod.setId(UUID.randomUUID().toString());
+			feedbackMethod.setDelFlag(false);
+            feedbackMethod.setCreateBy(subject);
+            feedbackMethod.setCreateTime(new Date());
+
+            int affectCount = feedbackMethodService.insert(feedbackMethod);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(feedbackMethod);
+            } 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="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<FeedbackMethod> edit(@PathVariable("id") String id){
+        MessageResult<FeedbackMethod> msgResult = new MessageResult<>();
+
+        try {
+            FeedbackMethod feedbackMethod = feedbackMethodService.get(id);
+
+            if (feedbackMethod != null) {
+                msgResult.setResult(true);
+                msgResult.setData(feedbackMethod);
+            } 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("update")
+    public MessageResult<FeedbackMethod> update(@RequestBody FeedbackMethod feedbackMethod,@RequestAttribute String subject){
+        MessageResult<FeedbackMethod> msgResult = new MessageResult<>();
+
+        try {
+		    feedbackMethod.setUpdateBy(subject);
+            feedbackMethod.setUpdateTime(new Date());
+		
+            int affectCount = feedbackMethodService.update(feedbackMethod);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(feedbackMethod);
+            } 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("delete/{id}")
+    public MessageResult<FeedbackMethod> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<FeedbackMethod> msgResult = new MessageResult<>();
+
+        try {
+			
+			FeedbackMethod feedbackMethod = feedbackMethodService.get(id);
+            feedbackMethod.setDelFlag(true);
+            feedbackMethod.setUpdateBy(subject);
+            feedbackMethod.setUpdateTime(new Date());
+			
+			int affectCount = feedbackMethodService.update(feedbackMethod);
+
+            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")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                FeedbackMethod feedbackMethod = feedbackMethodService.get(id);
+                feedbackMethod.setDelFlag(true);
+                feedbackMethod.setUpdateBy(subject);
+                feedbackMethod.setUpdateTime(new Date());
+
+                affectCount += feedbackMethodService.update(feedbackMethod);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } 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="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String name,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name",name + "%");
+        }
+
+
+        Page<FeedbackMethod> page = feedbackMethodService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        for (FeedbackMethod feedbackMethod:page) {
+            String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("回馈方式类型",feedbackMethod.getType());
+            if(StringUtils.isNotEmpty(categoryN)){
+                feedbackMethod.setTypeN(categoryN);
+            }
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value="全部列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<FeedbackMethod>> list(HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<FeedbackMethod>> msgResult = new MessageResult<>();
+
+        List<FeedbackMethod> list = feedbackMethodService.list();
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
+}

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

@@ -18,17 +18,17 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/loveProject")
+@RequestMapping("/base/loveProject")
 public class LoveProjectController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private LoveProjectService loveProjectService;
-	
-	
-	@ApiOperation(value="创建空记录")
+
+
+    @ApiOperation(value = "创建空记录")
     @GetMapping("create")
-    public MessageResult<LoveProject> create(){
+    public MessageResult<LoveProject> create() {
         MessageResult<LoveProject> msgResult = new MessageResult<>();
 
         LoveProject loveProject = new LoveProject();
@@ -39,16 +39,27 @@ public class LoveProjectController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
+    @ApiOperation(value = "添加信息")
     @PostMapping("add")
-    public MessageResult<LoveProject> add(@RequestBody LoveProject loveProject,@RequestAttribute String subject){
+    public MessageResult<LoveProject> add(@RequestBody LoveProject loveProject, @RequestAttribute String subject) {
         MessageResult<LoveProject> msgResult = new MessageResult<>();
 
         try {
             loveProject.setId(UUID.randomUUID().toString());
-			loveProject.setDelFlag(false);
+            loveProject.setDelFlag(false);
             loveProject.setCreateBy(subject);
             loveProject.setCreateTime(new Date());
+            loveProject.setType("1");
+
+            String methodIds = "";
+            for (String methodId : loveProject.getFeedbackMethodArray()) {
+                methodIds += methodId + ",";
+            }
+
+            if (StringUtils.isNotEmpty(methodIds)) {
+                methodIds = methodIds.substring(0, methodIds.lastIndexOf(","));
+                loveProject.setFeedbackMethod(methodIds);
+            }
 
             int affectCount = loveProjectService.insert(loveProject);
 
@@ -59,9 +70,8 @@ public class LoveProjectController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -70,24 +80,29 @@ public class LoveProjectController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value = "获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<LoveProject> edit(@PathVariable("id") String id){
+    public MessageResult<LoveProject> edit(@PathVariable("id") String id) {
         MessageResult<LoveProject> msgResult = new MessageResult<>();
 
         try {
             LoveProject loveProject = loveProjectService.get(id);
 
             if (loveProject != null) {
+
+                String methodIds = loveProject.getFeedbackMethod();
+                if(StringUtils.isNotEmpty(methodIds)){
+                    loveProject.setFeedbackMethodArray(methodIds.split(","));
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(loveProject);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -96,15 +111,25 @@ public class LoveProjectController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value = "更新用户")
     @PostMapping("update")
-    public MessageResult<LoveProject> update(@RequestBody LoveProject loveProject,@RequestAttribute String subject){
+    public MessageResult<LoveProject> update(@RequestBody LoveProject loveProject, @RequestAttribute String subject) {
         MessageResult<LoveProject> msgResult = new MessageResult<>();
 
         try {
-		    loveProject.setUpdateBy(subject);
+            loveProject.setUpdateBy(subject);
             loveProject.setUpdateTime(new Date());
-		
+
+            String methodIds = "";
+            for (String methodId : loveProject.getFeedbackMethodArray()) {
+                methodIds += methodId + ",";
+            }
+
+            if (StringUtils.isNotEmpty(methodIds)) {
+                methodIds = methodIds.substring(0, methodIds.lastIndexOf(","));
+                loveProject.setFeedbackMethod(methodIds);
+            }
+
             int affectCount = loveProjectService.update(loveProject);
 
             if (affectCount > 0) {
@@ -114,9 +139,8 @@ public class LoveProjectController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库更新失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -125,19 +149,19 @@ public class LoveProjectController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+    @ApiOperation(value = "删除用户")
     @PostMapping("delete/{id}")
-    public MessageResult<LoveProject> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<LoveProject> delete(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<LoveProject> msgResult = new MessageResult<>();
 
         try {
-			
-			LoveProject loveProject = loveProjectService.get(id);
+
+            LoveProject loveProject = loveProjectService.get(id);
             loveProject.setDelFlag(true);
             loveProject.setUpdateBy(subject);
             loveProject.setUpdateTime(new Date());
-			
-			int affectCount = loveProjectService.update(loveProject);
+
+            int affectCount = loveProjectService.update(loveProject);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -145,9 +169,8 @@ public class LoveProjectController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -157,9 +180,9 @@ public class LoveProjectController {
     }
 
 
-    @ApiOperation(value="批量删除")
+    @ApiOperation(value = "批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -181,9 +204,8 @@ public class LoveProjectController {
                 msgResult.setResult(false);
                 msgResult.setMessage("删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -192,31 +214,31 @@ public class LoveProjectController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            String title,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        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(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title", title + "%");
         }
 
 
-        Page<LoveProject> page = loveProjectService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<LoveProject> page = loveProjectService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
 
         msgResult.setResult(true);

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

@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/regUser")
+@RequestMapping("/base/regUser")
 public class RegUserController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -195,7 +195,7 @@ public class RegUserController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String realName,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -211,8 +211,8 @@ public class RegUserController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(realName)) {
+            searchParams.put("realName",realName + "%");
         }
 
 

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

@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/studentAspirations")
+@RequestMapping("/base/studentAspirations")
 public class StudentAspirationsController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

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

@@ -1,11 +1,13 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.StudentAspirations;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.base.entity.WishInfo;
 import com.jpsoft.employment.modules.base.service.WishInfoService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -18,12 +20,15 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/wishInfo")
+@RequestMapping("/base/wishInfo")
 public class WishInfoController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private WishInfoService wishInfoService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
 	
 	
 	@ApiOperation(value="创建空记录")
@@ -33,6 +38,10 @@ public class WishInfoController {
 
         WishInfo wishInfo = new WishInfo();
 
+        List<StudentAspirations> studentAspirationsList = new ArrayList<>();
+
+        wishInfo.setStudentAspirationsList(studentAspirationsList);
+
         msgResult.setData(wishInfo);
         msgResult.setResult(true);
 
@@ -49,8 +58,9 @@ public class WishInfoController {
 			wishInfo.setDelFlag(false);
             wishInfo.setCreateBy(subject);
             wishInfo.setCreateTime(new Date());
+            wishInfo.setStatus("1");
 
-            int affectCount = wishInfoService.insert(wishInfo);
+            int affectCount = wishInfoService.insertAndAspirations(wishInfo);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -195,7 +205,7 @@ public class WishInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String title,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -211,13 +221,29 @@ public class WishInfoController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title",title + "%");
         }
 
 
         Page<WishInfo> page = wishInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (WishInfo wishInfo:page) {
+            String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型",wishInfo.getCategory());
+            if(StringUtils.isNotEmpty(categoryN)){
+                wishInfo.setCategoryN(categoryN);
+            }
+
+            if(StringUtils.isNotEmpty(wishInfo.getStatus())){
+                if(wishInfo.getStatus().equals("0")){
+                    wishInfo.setStatusN("下架");
+                }
+                else if(wishInfo.getStatus().equals("1")){
+                    wishInfo.setStatusN("上架");
+                }
+            }
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -1,6 +1,11 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.dto.WishInfoUserRecordDTO;
+import com.jpsoft.employment.modules.base.entity.RegUser;
+import com.jpsoft.employment.modules.base.entity.WishInfo;
+import com.jpsoft.employment.modules.base.service.RegUserService;
+import com.jpsoft.employment.modules.base.service.WishInfoService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -18,12 +23,18 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/wishInfoUserRecord")
+@RequestMapping("/base/wishInfoUserRecord")
 public class WishInfoUserRecordController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private WishInfoUserRecordService wishInfoUserRecordService;
+
+    @Autowired
+    private WishInfoService wishInfoService;
+
+    @Autowired
+    private RegUserService regUserService;
 	
 	
 	@ApiOperation(value="创建空记录")
@@ -72,15 +83,37 @@ public class WishInfoUserRecordController {
 
     @ApiOperation(value="获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<WishInfoUserRecord> edit(@PathVariable("id") String id){
-        MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
+    public MessageResult<WishInfoUserRecordDTO> edit(@PathVariable("id") String id){
+        MessageResult<WishInfoUserRecordDTO> msgResult = new MessageResult<>();
 
         try {
+            WishInfoUserRecordDTO dto = new WishInfoUserRecordDTO();
+
             WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
 
             if (wishInfoUserRecord != null) {
+                if(StringUtils.isNotEmpty(wishInfoUserRecord.getStatus())){
+                    if(wishInfoUserRecord.getStatus().equals("0")){
+                        wishInfoUserRecord.setStatusN("互换中");
+                    }
+                    else if(wishInfoUserRecord.getStatus().equals("1")){
+                        wishInfoUserRecord.setStatusN("已完成");
+                    }
+                }
+
+                WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
+
+
+                RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
+
+                if(regUser!=null){
+                    wishInfoUserRecord.setRegUserName(regUser.getRealName());
+                }
+
+                dto.setWishInfoUserRecord(wishInfoUserRecord);
+                dto.setWishInfo(wishInfo);
                 msgResult.setResult(true);
-                msgResult.setData(wishInfoUserRecord);
+                msgResult.setData(dto);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
@@ -218,6 +251,19 @@ public class WishInfoUserRecordController {
 
         Page<WishInfoUserRecord> page = wishInfoUserRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (WishInfoUserRecord wishInfoUserRecord:page) {
+            RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
+            if(regUser!=null){
+                wishInfoUserRecord.setRegUserName(regUser.getRealName());
+            }
+
+            WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
+            if(wishInfo!=null){
+                wishInfoUserRecord.setStudentName(wishInfo.getStudentName());
+                wishInfoUserRecord.setStudentType(wishInfo.getStudentType());
+            }
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));