From 080952a764f3cb483695b3934d4f2ea308aae891 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 15 Oct 2021 16:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TripReportController.java      |  7 +++---
 .../epidemic/service/TripReportService.java   |  3 ++-
 .../service/impl/TripReportServiceImpl.java   | 23 ++++++++++++++++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
index 0b7b931..dc43efd 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
 import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
 import com.elink.esua.epdc.dto.TripReportDTO;
+import com.elink.esua.epdc.dto.TripReportDetailDTO;
 import com.elink.esua.epdc.modules.epidemic.excel.TripReportExcel;
 import com.elink.esua.epdc.modules.epidemic.service.TripReportService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,9 +59,9 @@ public class TripReportController {
     }
 
     @GetMapping("{id}")
-    public Result<TripReportDTO> get(@PathVariable("id") String id){
-        TripReportDTO data = tripReportService.get(id);
-        return new Result<TripReportDTO>().ok(data);
+    public Result<TripReportDetailDTO> get(@PathVariable("id") String id){
+        TripReportDetailDTO data = tripReportService.get(id);
+        return new Result<TripReportDetailDTO>().ok(data);
     }
 
     @PostMapping
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
index a1af4fa..51aa479 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
 import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
 import com.elink.esua.epdc.dto.TripReportDTO;
+import com.elink.esua.epdc.dto.TripReportDetailDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 
 import java.util.List;
@@ -64,7 +65,7 @@ public interface TripReportService extends BaseService<TripReportEntity> {
      * @author generator
      * @date 2021-10-13
      */
-    TripReportDTO get(String id);
+    TripReportDetailDTO get(String id);
 
     /**
      * 默认保存
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
index c637bf9..4f290c3 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
@@ -22,8 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.modules.epidemic.dao.TripReportDao;
@@ -86,9 +89,9 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
     }
 
     @Override
-    public TripReportDTO get(String id) {
-        TripReportEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, TripReportDTO.class);
+    public TripReportDetailDTO get(String id) {
+        TripReportDetailDTO result = baseDao.selectDetailById(id);
+        return result;
     }
 
     @Override
@@ -101,6 +104,7 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(TripReportDTO dto) {
+        fixAndCheckIdentityNo(dto.getIdCard());
         TripReportEntity entity = ConvertUtils.sourceToTarget(dto, TripReportEntity.class);
         updateById(entity);
     }
@@ -114,12 +118,25 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
 
     @Override
     public Result saveTripInfo(SaveTripInfoFormDTO formDto) {
+        fixAndCheckIdentityNo(formDto.getIdCard());
         log.info("formDto:"+formDto);
         TripReportEntity entity = ConvertUtils.sourceToTarget(formDto, TripReportEntity.class);
         insert(entity);
         return new Result().ok("操作成功！");
     }
 
+    private String fixAndCheckIdentityNo(String identityNo) {
+        identityNo = ModuleUtils.replaceIllegalCharacter(identityNo);
+        if (StringUtils.isBlank(identityNo)) {
+            throw new RenException("身份证号不能为空");
+        }
+        String verification = IdentityNoUtils.IdentityNoVerification(identityNo);
+        if (StringUtils.isNotBlank(verification)) {
+            throw new RenException(verification);
+        }
+        return identityNo;
+    }
+
     @Override
     public Result getTripInfoList(GetTripInfoFormDTO formDto) {
         log.info("formDto:"+formDto);