1

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

@@ -31,6 +31,9 @@ public class ParticipateProjectInfo {
 				@ApiModelProperty(value = "爱心项目ID")
 	private String loveProjectId;
 	private LoveProject loveProject;
+
+	@ApiModelProperty(value = "内容")
+	private String content;
 	
 				@ApiModelProperty(value = "状态(1：进行中，2：完成，3：取消)")
 	private String status;

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

@@ -9,6 +9,7 @@
 			<result property="feedbackId" column="feedback_id" />
 			<result property="loveProjectId" column="love_project_id" />
 			<result property="status" column="status_" />
+		<result property="content" column="content_" />
 			<result property="cooperativeCompany" column="cooperative_company" />
 			<result property="contacts" column="contacts" />
 			<result property="contactsCompany" column="contacts_company" />
@@ -27,13 +28,14 @@
 	-->
 	<![CDATA[
 		insert into base_participate_project_info
-	    (id_,reg_user_id,feedback_id,love_project_id,status_,cooperative_company,contacts,contacts_company,create_by,create_time,update_by,update_time,del_flag,completion_time)
+	    (id_,reg_user_id,feedback_id,love_project_id,content_,status_,cooperative_company,contacts,contacts_company,create_by,create_time,update_by,update_time,del_flag,completion_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{regUserId,jdbcType=VARCHAR}
 ,#{feedbackId,jdbcType=VARCHAR}
 ,#{loveProjectId,jdbcType=VARCHAR}
+,#{content,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{cooperativeCompany,jdbcType=VARCHAR}
 ,#{contacts,jdbcType=VARCHAR}
@@ -62,9 +64,12 @@
 				<if test="loveProjectId!=null">
 		love_project_id=#{loveProjectId,jdbcType=VARCHAR},
 		</if>
-				<if test="status!=null">
-		status_=#{status,jdbcType=VARCHAR},
+				<if test="content!=null">
+					content_=#{content,jdbcType=VARCHAR},
 		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
 				<if test="cooperativeCompany!=null">
 		cooperative_company=#{cooperativeCompany,jdbcType=VARCHAR},
 		</if>
@@ -168,6 +173,9 @@
 			<if test="searchParams.status != null">
 				and status_ = #{searchParams.status}
 			</if>
+			<if test="searchParams.status == null">
+				and status_ != '3'
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

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

@@ -74,7 +74,7 @@ public class ChartApi {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        Page<TasksAndProjectsDTO> page = participateProjectInfoService.pageSearchTasksAndProjects(searchParams,1,100,false,sortList);
+        Page<TasksAndProjectsDTO> page = participateProjectInfoService.pageSearchTasksAndProjects(searchParams,1,1000,false,sortList);
         map.put("countGood",page.getResult().size());
 
         List<WishInfoUserRecord> list = wishInfoUserRecordService.findByUser(subject);

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

@@ -69,8 +69,9 @@ public class ParticipateApi {
     @ApiImplicitParams({
             @ApiImplicitParam(name="loveProjectId", value="loveProjectId", required=true, paramType="query"),
             @ApiImplicitParam(name="feedbackId", value="feedbackId", required=true, paramType="query"),
+            @ApiImplicitParam(name="content", value="content", required=false, paramType="query"),
     })
-    public MessageResult save(String loveProjectId, String feedbackId, String cooperativeCompany, String contacts, String contactsCompany, HttpServletRequest request){
+    public MessageResult save(String content, String loveProjectId, String feedbackId, String cooperativeCompany, String contacts, String contactsCompany, HttpServletRequest request){
         MessageResult msgResult = new MessageResult<>();
         String subject = (String)request.getAttribute("subject");
 
@@ -78,6 +79,7 @@ public class ParticipateApi {
             ParticipateProjectInfo participateProjectInfo = participateProjectInfoService.getByIds(subject, feedbackId, loveProjectId);
 
             if (participateProjectInfo != null) {
+                participateProjectInfo.setContent(content);
                 participateProjectInfo.setCooperativeCompany(cooperativeCompany);
                 participateProjectInfo.setContacts(contacts);
                 participateProjectInfo.setContactsCompany(contactsCompany);
@@ -90,6 +92,7 @@ public class ParticipateApi {
                 participateProjectInfo.setRegUserId(subject);
                 participateProjectInfo.setFeedbackId(feedbackId);
                 participateProjectInfo.setLoveProjectId(loveProjectId);
+                participateProjectInfo.setContent(content);
                 participateProjectInfo.setStatus("1");
                 participateProjectInfo.setCooperativeCompany(cooperativeCompany);
                 participateProjectInfo.setContacts(contacts);

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

@@ -47,7 +47,7 @@ public class VolunteerApi {
         MessageResult msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
-//        searchParams.put("isShelves",true);
+        searchParams.put("isShelves",true);
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));