|
|
@@ -13,6 +13,7 @@ import com.leromro.core.domain.VolunteerInfo;
|
|
|
import com.leromro.core.domain.vo.VolunteerReservationTimeVO;
|
|
|
import com.leromro.core.facade.VolunteerWorkDateFacade;
|
|
|
import com.leromro.core.service.IVolunteerInfoService;
|
|
|
+import com.leromro.system.service.impl.SysConfigServiceImpl;
|
|
|
import com.leromro.system.service.impl.SysUserServiceImpl;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
@@ -49,6 +50,8 @@ public class VolunteerWorkDateController extends BaseController
|
|
|
|
|
|
@Autowired
|
|
|
private IVolunteerInfoService volunteerInfoService;
|
|
|
+ @Autowired
|
|
|
+ private SysConfigServiceImpl sysConfigService;
|
|
|
|
|
|
/**
|
|
|
* 修改志愿者排班日期
|
|
|
@@ -84,7 +87,7 @@ public class VolunteerWorkDateController extends BaseController
|
|
|
public R<List<LocalDate>> getVolunteerWorkDate(@RequestParam("volunteerId") Long volunteerId) {
|
|
|
String isExample = volunteerInfoService.list(new LambdaQueryWrapper<VolunteerInfo>().eq(VolunteerInfo::getVolunteerId, volunteerId).select(VolunteerInfo::getIsExample)).get(0).getIsExample();
|
|
|
if (("1").equals(isExample)){
|
|
|
- volunteerId = 109L;
|
|
|
+ volunteerId = Long.valueOf(sysConfigService.selectConfigByKey("exampleWorkTimeVolunteerId"));
|
|
|
}
|
|
|
List<LocalDate> list = volunteerWorkDateService.list(new LambdaQueryWrapper<VolunteerWorkDate>()
|
|
|
.eq(VolunteerWorkDate::getVolunteerId, volunteerId)
|
LiRong