|
@ -43,6 +43,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.DateUtils; |
|
|
import com.epmet.commons.tools.utils.DateUtils; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
|
|
import com.epmet.commons.tools.utils.SpringContextUtils; |
|
|
import com.epmet.constant.IcPlatformConstant; |
|
|
import com.epmet.constant.IcPlatformConstant; |
|
|
import com.epmet.constant.IcResiUserConstant; |
|
|
import com.epmet.constant.IcResiUserConstant; |
|
|
import com.epmet.constant.UserConstant; |
|
|
import com.epmet.constant.UserConstant; |
|
@ -121,8 +122,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
private RedisTemplate redisTemplate; |
|
|
private RedisTemplate redisTemplate; |
|
|
@Resource |
|
|
@Resource |
|
|
private IcNatService icNatService; |
|
|
private IcNatService icNatService; |
|
|
@Resource |
|
|
//@Resource
|
|
|
private IcVaccineService icVaccineService; |
|
|
//private IcVaccineService icVaccineService;
|
|
|
@Resource |
|
|
@Resource |
|
|
private IcTripReportRecordService icTripReportRecordService; |
|
|
private IcTripReportRecordService icTripReportRecordService; |
|
|
|
|
|
|
|
@ -1352,7 +1353,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
List<NatListDTO> natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|
List<NatListDTO> natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|
result.setNatList(natList); |
|
|
result.setNatList(natList); |
|
|
//疫苗接种
|
|
|
//疫苗接种
|
|
|
List<VaccineListDTO> vaccineList = icVaccineService.getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|
List<VaccineListDTO> vaccineList = SpringContextUtils.getBean(IcVaccineService.class).getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|
result.setVaccineList(vaccineList); |
|
|
result.setVaccineList(vaccineList); |
|
|
//行程信息
|
|
|
//行程信息
|
|
|
List<TripListDTO> tripList = icTripReportRecordService.tripList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|
List<TripListDTO> tripList = icTripReportRecordService.tripList(formDTO.getCustomerId(), icResiUser.getIdCard()); |
|
|