From c39f31ba65276ddbc1af3e13ed379924e70ce805 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 3 Aug 2022 10:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/IcResiCollectCheckFormDTO.java   | 38 +++++++++++++++++++
 .../controller/IcResiCollectController.java   | 21 ++++++++--
 .../epmet/service/IcResiCollectService.java   | 14 ++++---
 .../impl/IcResiCollectServiceImpl.java        | 19 ++++++++++
 4 files changed, 83 insertions(+), 9 deletions(-)
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java
new file mode 100644
index 0000000000..8f77374f0d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java
@@ -0,0 +1,38 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 居民信息采集-审核入参
+ *
+ * @author wgf
+ * @since v1.0.0 2022-08-02
+ */
+@Data
+public class IcResiCollectCheckFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @NotBlank(message = "Id不能为空")
+	private String id;
+
+    /**
+     * 审核状态：0待审核 1未通过 2已通过
+     */
+    @NotBlank(message = "审核状态不能为空")
+    private String checkState;
+
+    /**
+     * 审核原因
+     */
+    private String checkReason;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
index 543493a395..5e56aaf17c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
@@ -10,10 +10,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.CollectListFormDTO;
-import com.epmet.dto.form.IcResiCollectFormDTO;
-import com.epmet.dto.form.LatestSubmitCollectFormDTO;
-import com.epmet.dto.form.ResiCollectFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectListExcelResultDTO;
 import com.epmet.dto.result.CollectListMemberExcelResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
@@ -156,4 +153,20 @@ public class IcResiCollectController {
         ValidatorUtils.validateEntity(formDTO,LatestSubmitCollectFormDTO.AddUserInternalGroup.class);
         return new Result<LatestCollectResDTO>().ok(icResiCollectService.latestSubmit(formDTO));
     }
+
+    /**
+     * 信息采集-审核
+     * @param formDTO
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("collectCheck")
+    public Result collectCheck(@RequestBody IcResiCollectCheckFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+//        formDTO.setUserId(tokenDto.getUserId());
+//        formDTO.setCustomerId(tokenDto.getCustomerId());
+        icResiCollectService.collectCheck(formDTO);
+
+        return new Result();
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
index 17b6031472..075796a982 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
@@ -2,10 +2,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.form.CollectListFormDTO;
-import com.epmet.dto.form.IcResiCollectFormDTO;
-import com.epmet.dto.form.LatestSubmitCollectFormDTO;
-import com.epmet.dto.form.ResiCollectFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.entity.IcResiCollectEntity;
@@ -56,4 +53,11 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      * @return
      */
     CollectListResultDTO detail(CollectListFormDTO formDTO);
-}
\ No newline at end of file
+
+    /**
+     * 信息登记审核
+     * @param formDTO
+     * @return
+     */
+    void collectCheck(IcResiCollectCheckFormDTO formDTO);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 5caeb3a008..a81412f891 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -254,4 +254,23 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         resDTO.setUnitName(StringUtils.isBlank(entity.getUnitName()) ? StrConstant.EPMETY_STR : entity.getUnitName());
         resDTO.setHomeName(StringUtils.isBlank(entity.getHomeName()) ? StrConstant.EPMETY_STR : entity.getHomeName());
     }
+
+    @Override
+    public void collectCheck(IcResiCollectCheckFormDTO formDTO) {
+
+        if("1".equals(formDTO.getCheckState())){
+            // 未通过
+            IcResiCollectEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
+            baseDao.updateById(entity);
+
+        }else{
+            // 通过
+
+
+
+        }
+
+
+
+    }
 }