From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java
index 28e4ab6..8a7c535 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java
@@ -1,34 +1,33 @@
 package com.panzhihua.service_community.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.dao.GridBuildRelationDAO;
 import com.panzhihua.service_community.model.dos.GridBuildRelationDO;
 import com.panzhihua.service_community.service.GridBuildRelationService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
- * program 攀枝花智慧社区项目
- * description 特殊人群管理API
+ * program 攀枝花智慧社区项目 description 特殊人群管理API
  *
- * @author manailin
- * Date 2021-01-22 15:30
+ * @author manailin Date 2021-01-22 15:30
  **/
 @Service
-public class GridBuildRelationServiceImpl extends ServiceImpl<GridBuildRelationDAO, GridBuildRelationDO> implements GridBuildRelationService {
+public class GridBuildRelationServiceImpl extends ServiceImpl<GridBuildRelationDAO, GridBuildRelationDO>
+    implements GridBuildRelationService {
 
     /**
-     * description 批量保存重点人群人员信息
-     * 处理逻辑:同一个人的信息可以被多个社区重复录入
-     * 一个人的信息如果被同一个社区重复导入。以最新的导入数据为准。将之前的数据进行更新操作。
+     * description 批量保存重点人群人员信息 处理逻辑:同一个人的信息可以被多个社区重复录入 一个人的信息如果被同一个社区重复导入。以最新的导入数据为准。将之前的数据进行更新操作。
      *
-     * @param keyList 重点人群信息
-     * @return R  保存结果
+     * @param keyList
+     *            重点人群信息
+     * @return R 保存结果
      * @author manailin
      * @date 2021/6/10 17:00
      */
@@ -38,7 +37,7 @@
         keyList.forEach(keyPersonInfoDTO -> {
             GridBuildRelationDO dbKeyPerson = checkExistFromDb(keyPersonInfoDTO);
             if (dbKeyPerson != null) {
-                //已经存在数据,进行数据更新操作
+                // 已经存在数据,进行数据更新操作
                 GridBuildRelationDO keyPersonInfoDO = new GridBuildRelationDO();
                 BeanUtils.copyProperties(keyPersonInfoDTO, keyPersonInfoDO);
                 keyPersonInfoDO.setId(dbKeyPerson.getId());
@@ -54,13 +53,9 @@
 
     private GridBuildRelationDO checkExistFromDb(GridBuildRelationDO gridBuildRelationDO) {
         return baseMapper.selectOne(
-                new QueryWrapper<GridBuildRelationDO>()
-                        .eq("grid_community_id", gridBuildRelationDO.getGridCommunityId())
-                        .eq("grid_id", gridBuildRelationDO.getGridId())
-                        .eq("village_id", gridBuildRelationDO.getVillageId())
-                        .eq("build_id", gridBuildRelationDO.getBuildId())
-        );
+            new QueryWrapper<GridBuildRelationDO>().eq("grid_community_id", gridBuildRelationDO.getGridCommunityId())
+                .eq("grid_id", gridBuildRelationDO.getGridId()).eq("village_id", gridBuildRelationDO.getVillageId())
+                .eq("build_id", gridBuildRelationDO.getBuildId()));
     }
-
 
 }

--
Gitblit v1.7.1