Browse Source

核算检测记录手机端

feature/codemove
曲树通 3 years ago
parent
commit
f94899cf35
  1. 2
      epdc-cloud-client-yushan
  2. 2
      epdc-cloud-commons-yushan
  3. 13
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java
  4. 10
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
  5. 3
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
  6. 13
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
  7. 14
      epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml

2
epdc-cloud-client-yushan

@ -1 +1 @@
Subproject commit 492ca0bd1716eca3439b0604c60ebda5910f62f2 Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63

2
epdc-cloud-commons-yushan

@ -1 +1 @@
Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e

13
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.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; 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.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.PersonTestingDTO;
import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO;
import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao; 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) { public Result importExcel(HttpServletRequest request, @RequestParam("file") MultipartFile file) {
return personTestingService.importExcel(file); return personTestingService.importExcel(file);
} }
/***
* 获取姓名
* @param idCard
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.PersonTestingDTO>
* @author qushutong
* @date 2022/4/26 9:43
*/
@GetMapping("getNameByIDcard/{idCard}")
public Result<PersonInfoPhoneDTO> getNameByIDcard(@PathVariable("idCard") String idCard) {
PersonInfoPhoneDTO data = personTestingService.getNameByIDcard(idCard);
return new Result<PersonInfoPhoneDTO>().ok(data);
}
} }

10
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; package com.elink.esua.epdc.modules.epidemic.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; 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.PersonTestingDTO;
import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO;
import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
@ -78,4 +79,13 @@ public interface PersonTestingDao extends BaseDao<PersonTestingEntity> {
* @Date 13:51 2021-11-09 * @Date 13:51 2021-11-09
**/ **/
String getIdByIdCardAndTestingTime(@Param("idcard") String idcard, @Param("testingTime") Date testingTime); 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);
} }

3
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.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result; 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.PersonTestingDTO;
import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO;
import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
@ -145,4 +146,6 @@ public interface PersonTestingService extends BaseService<PersonTestingEntity> {
* @Date 17:25 2021-11-02 * @Date 17:25 2021-11-02
**/ **/
Result importExcel(MultipartFile file); Result importExcel(MultipartFile file);
PersonInfoPhoneDTO getNameByIDcard(String idCard);
} }

13
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.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.*; 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.PersonTestingDTO;
import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO;
import com.elink.esua.epdc.dto.UploadFormDTO; import com.elink.esua.epdc.dto.UploadFormDTO;
@ -498,6 +499,18 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
return new Result(); return new Result();
} }
@Override
public PersonInfoPhoneDTO getNameByIDcard(String idCard) {
if (StringUtils.isNotBlank(idCard)) {
String result = IdentityNoUtils.IdentityNoVerification(idCard);
if (result != null) {
throw new RenException(result);
}
}
return baseDao.selectInfoByIdCard(idCard);
}
/** /**
* 组装异常信息 * 组装异常信息
* *

14
epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml

@ -167,4 +167,18 @@
AND person.IDCARD = #{idcard} AND person.IDCARD = #{idcard}
AND person.TESTING_TIME = #{testingTime} AND person.TESTING_TIME = #{testingTime}
</select> </select>
<select id="selectInfoByIdCard" resultType="com.elink.esua.epdc.dto.PersonInfoPhoneDTO">
SELECT
MOBILE ,USER_NAME
FROM
epidemic_user_info
WHERE
DEL_FLAG = '0'
and ID_CARD=#{idcard}
ORDER BY
CREATED_TIME DESC
LIMIT 1
</select>
</mapper> </mapper>

Loading…
Cancel
Save