1

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

@@ -26,4 +26,7 @@ public class TasksAndProjectsDTO {
 
     @ApiModelProperty(value = "状态")
     private String status;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
 }

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

@@ -153,16 +153,17 @@
 		<result property="tag" column="tag_" />
 		<result property="createTime" column="create_time" />
 		<result property="status" column="status_" />
+		<result property="content" column="content_" />
 	</resultMap>
 	<select id="searchTasksAndProjects" parameterType="hashmap" resultMap="TasksAndProjectsMap">
 		SELECT * FROM
 		(
-		SELECT b.title_, b.second_title, b.image_,c.name_ AS tag_, a.create_time, a.status_, a.reg_user_id FROM base_participate_project_info a
+		SELECT b.title_, b.second_title, b.image_,c.name_ AS tag_, a.create_time, a.status_, a.reg_user_id, a.content_ FROM base_participate_project_info a
 		LEFT JOIN base_love_project b ON a.love_project_id = b.id_
 		LEFT JOIN base_feedback_method c ON a.feedback_id = c.id_
 		WHERE a.del_flag = 0 AND b.del_flag = 0
 		UNION ALL
-		SELECT b.volunteer_requirements AS title_, b.introduce_ AS second_title, NULL AS image_, NULL AS tag_, a.create_time, a.status_, a.create_by AS reg_user_id FROM base_volunteer_sign_record a
+		SELECT b.volunteer_requirements AS title_, b.introduce_ AS second_title, NULL AS image_, NULL AS tag_, a.create_time, a.status_, a.create_by AS reg_user_id, NULL AS content_ FROM base_volunteer_sign_record a
 		LEFT JOIN base_volunteer_tasks b ON a.volunteer_tasks_id = b.id_
 		WHERE a.del_flag = 0 AND b.del_flag = 0
 		) t