1

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

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+import java.util.List;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,5 +63,8 @@ public class VolunteerTasks {
 	@ApiModelProperty(value = "是否上架")
 	private Boolean isShelves;
 
-	
+
+
+	@ApiModelProperty(value = "报名人员")
+	private List<VolunteerSignRecord> volunteerSignRecordList;
 		}

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

@@ -14,6 +14,7 @@ import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import io.swagger.annotations.Api;
 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;
@@ -46,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"));
@@ -64,8 +65,19 @@ public class VolunteerApi {
     public MessageResult detail(String id) {
         MessageResult msgResult = new MessageResult<>();
 
+        List<Map> list = new ArrayList<>();
+
         VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
 
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("volunteerTasksId",id);
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        List<VolunteerSignRecord> volunteerSignRecordList = volunteerSignRecordService.pageSearch(searchParams,1,1000,false,sortList);
+        volunteerTasks.setVolunteerSignRecordList(volunteerSignRecordList);
+
         msgResult.setResult(true);
         msgResult.setData(volunteerTasks);
 

web/src/main/resources/application-dev.yml

@@ -5,10 +5,12 @@ server:
 
 spring:
   datasource:
-    #开发环境
      url: jdbc:log4jdbc:mysql://192.168.33.20:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
      username: root
      password: jpsoft2016
+#    url: jdbc:log4jdbc:mysql://116.62.150.160:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft
   devtools:
     add-properties: false
     restart: