From 1899f79c5b2ac27dc2e5c71b1ba723637ae3db79 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 1 Jun 2022 17:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcResiUserConfirmController.java          | 15 ++++++++-
 .../epmet/controller/MyHomeController.java    |  2 +-
 .../service/IcResiUserConfirmService.java     | 10 ++++++
 .../impl/IcResiUserConfirmServiceImpl.java    | 33 +++++++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserConfirmController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserConfirmController.java
index 0c2ca8bb4c..fc1e27a907 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserConfirmController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserConfirmController.java
@@ -7,8 +7,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.excel.IcResiUserConfirmExcel;
 import com.epmet.service.IcResiUserConfirmService;
@@ -78,5 +78,18 @@ public class IcResiUserConfirmController {
     }
 
 
+    /**
+     * 审核
+     *
+     * @Param tokenDto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/6/1 17:26
+     */
+    @PostMapping("confirm")
+    public Result confirm(@RequestBody IcResiUserConfirmDTO dto) {
+        icResiUserConfirmService.confirm(dto);
+        return new Result();
+    }
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
index 87ef1f64d8..9aff52b474 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
@@ -113,7 +113,7 @@ public class MyHomeController {
      * @Date 2022/6/1 10:26
      */
     @PostMapping("registerAndBind")
-    public Result registerAndBind(@LoginUser TokenDto tokenDto, RegisterAndBindFormDTO formDTO) {
+    public Result registerAndBind(@LoginUser TokenDto tokenDto, @RequestBody RegisterAndBindFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         myHomeService.registerAndBind(formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java
index e49f0e2ac2..692b12e514 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java
@@ -114,4 +114,14 @@ public interface IcResiUserConfirmService extends BaseService<IcResiUserConfirmE
     * @return com.epmet.commons.tools.utils.Result
     */
     Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto);
+
+    /**
+     * 审核
+     *
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/1 17:27
+     */
+    void confirm(IcResiUserConfirmDTO dto);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
index 1623f17943..11da6a1409 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -139,4 +140,36 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         return new Result().ok(result);
     }
 
+    /**
+     * 审核
+     *
+     * @param dto
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/1 17:27
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirm(IcResiUserConfirmDTO dto) {
+        baseDao.updateById(ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class));
+        if (NumConstant.ONE_STR.equals(dto.getConfirmResult())) {
+            //审核通过，修改居民信息
+            IcResiUserConfirmEntity confirmEntity = baseDao.selectById(dto.getId());
+            if ("edit".equals(confirmEntity.getSubmitType())) {
+                IcResiUserEntity entity = ConvertUtils.sourceToTarget(confirmEntity, IcResiUserEntity.class);
+                entity.setName(confirmEntity.getSurname() + confirmEntity.getName());
+                entity.setId(confirmEntity.getIcResiUserId());
+                icResiUserDao.updateById(entity);
+            } else if ("delete".equals(confirmEntity.getSubmitType())){
+                IcResiUserEntity entity = new IcResiUserEntity();
+                entity.setId(confirmEntity.getIcResiUserId());
+                entity.setStatus(confirmEntity.getDeleteReason());
+                icResiUserDao.updateById(entity);
+            }
+        } else {
+            //TODO 发送消息
+        }
+    }
+
 }