Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java

@@ -57,5 +57,15 @@ public class CollectDetailResultDTO implements Serializable {
      */
     private Integer totalResi;
 
+    /**
+     * 审核状态：0待审核 1未通过 2已通过
+     */
+    private String checkState;
+
+    /**
+     * 审核原因
+     */
+    private String checkReason;
+
     private List<IcResiCollectMemDetailDTO> memberList;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
+import com.epmet.dto.form.CollectDetailFormDTO;
 import com.epmet.excel.IcResiCollectVisitorExcel;
 import com.epmet.service.IcResiCollectVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,5 +94,18 @@ public class IcResiCollectVisitorController {
         return icResiCollectVisitorService.saveInfo(dto);
     }
 
+    /**
+    * @describe: 访客信息详情
+    * @author wangtong
+    * @date 2022/8/3 15:41
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    @PostMapping("getVisitorDetail")
+    public Result getVisitorDetail(@RequestBody CollectDetailFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return icResiCollectVisitorService.getVisitorDetail(dto);
+    }
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
+import com.epmet.dto.form.CollectDetailFormDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 
 import java.util.List;
@@ -86,4 +87,13 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
     * @return com.epmet.commons.tools.utils.Result
     */
     Result saveInfo(SaveCollectVisitorFormDTO dto);
+
+    /**
+    * @describe: 访客信息详情
+    * @author wangtong
+    * @date 2022/8/3 15:43
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result getVisitorDetail(CollectDetailFormDTO dto);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.dao.IcResiCollectVisitorDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
+import com.epmet.dto.form.CollectDetailFormDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import com.epmet.redis.IcResiCollectVisitorRedis;
 import com.epmet.service.IcResiCollectVisitorService;
@@ -105,4 +106,10 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return new Result().ok("提交成功");
     }
 
+    @Override
+    public Result getVisitorDetail(CollectDetailFormDTO dto) {
+        IcResiCollectVisitorEntity entity = baseDao.selectById(dto.getId());
+        return new Result().ok(entity);
+    }
+
 }