1

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

@@ -53,6 +53,13 @@ public class VolunteerApi {
         sortList.add(new Sort("create_time","desc"));
 
         Page<VolunteerTasks> page = volunteerTasksService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(VolunteerTasks volunteerTasks : page.getResult()) {
+            Map<String,Object> searchParams1 = new HashMap<>();
+            searchParams1.put("volunteerTasksId",volunteerTasks.getId());
+
+            List<VolunteerSignRecord> volunteerSignRecordList = volunteerSignRecordService.pageSearch(searchParams1,1,1000,false,sortList);
+            volunteerTasks.setVolunteerSignRecordList(volunteerSignRecordList);
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -5,12 +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
+#     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: