diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 492ca0b..f79cc57 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 492ca0bd1716eca3439b0604c60ebda5910f62f2 +Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 31d32c8..640458a 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 +Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java index 739d6f5..6b0dd59 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java @@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.PersonInfoPhoneDTO; import com.elink.esua.epdc.dto.PersonTestingDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao; @@ -183,4 +184,16 @@ public class PersonTestingV2Controller { public Result importExcel(HttpServletRequest request, @RequestParam("file") MultipartFile file) { return personTestingService.importExcel(file); } + /*** + * 获取姓名 + * @param idCard + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2022/4/26 9:43 + */ + @GetMapping("getNameByIDcard/{idCard}") + public Result getNameByIDcard(@PathVariable("idCard") String idCard) { + PersonInfoPhoneDTO data = personTestingService.getNameByIDcard(idCard); + return new Result().ok(data); + } } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java index 497a823..adca5a5 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PersonInfoPhoneDTO; import com.elink.esua.epdc.dto.PersonTestingDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; @@ -78,4 +79,13 @@ public interface PersonTestingDao extends BaseDao { * @Date 13:51 2021-11-09 **/ String getIdByIdCardAndTestingTime(@Param("idcard") String idcard, @Param("testingTime") Date testingTime); + + /*** + * 手机端新增用 + * @param idCard + * @return com.elink.esua.epdc.dto.PersonTestingDTO + * @author qushutong + * @date 2022/4/26 9:57 + */ + PersonInfoPhoneDTO selectInfoByIdCard(String idCard); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java index f08912f..e5d32a5 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.epidemic.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.PersonInfoPhoneDTO; import com.elink.esua.epdc.dto.PersonTestingDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; @@ -145,4 +146,6 @@ public interface PersonTestingService extends BaseService { * @Date 17:25 2021-11-02 **/ Result importExcel(MultipartFile file); + + PersonInfoPhoneDTO getNameByIDcard(String idCard); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java index 9b0a07a..be0a586 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java @@ -34,6 +34,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; +import com.elink.esua.epdc.dto.PersonInfoPhoneDTO; import com.elink.esua.epdc.dto.PersonTestingDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.UploadFormDTO; @@ -498,6 +499,18 @@ public class PersonTestingServiceImpl extends BaseServiceImpl + + +