居民信息采集-新增/更新

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

@@ -169,4 +169,21 @@ public class IcResiCollectController {
         return new Result();
     }
 
+
+    /**
+     * @describe: 扫描社区/小区二维码进行居民信息登记
+     * @author wangtong
+     * @date 2022/8/2 16:01
+     * @params [formDTO]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @NoRepeatSubmit
+    @PostMapping("saveCollectInfo")
+    public Result saveCollectInfo(@RequestBody SaveCollectFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, IcResiCollectFormDTO.class);
+        formDTO.setOrigin("internal");//固定为内部
+        return icResiCollectService.saveCollectInfo(formDTO);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.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.IcResiCollectVisitorDTO;
 import com.epmet.excel.IcResiCollectVisitorExcel;
 import com.epmet.service.IcResiCollectVisitorService;

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

@@ -2,6 +2,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
@@ -60,4 +61,14 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      * @return
      */
     void collectCheck(IcResiCollectCheckFormDTO formDTO);
+
+    /**
+    * @describe: 扫描社区/小区二维码进行居民信息登记
+    * @author wangtong
+    * @date 2022/8/2 17:14
+    * @params [formDTO]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result saveCollectInfo(SaveCollectFormDTO formDTO);
 }
+

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

@@ -130,6 +130,40 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return null;
     }
 
+    @Override
+    public Result saveCollectInfo(SaveCollectFormDTO formDTO) {
+        IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
+        if (null == collectInfo) {
+            //插入主表
+            IcResiCollectEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
+            //根据小区id查询网格相关信息
+            IcNeighborHoodDTO neighborHoodDTO = queryIcNeighborHood(formDTO.getVillageId());
+            entity.setGridId(neighborHoodDTO.getGridId());
+            entity.setAgencyId(neighborHoodDTO.getAgencyId());
+            entity.setPids(neighborHoodDTO.getAgencyPids());
+            entity.setCustomerId(neighborHoodDTO.getCustomerId());
+            entity.setCheckState("0");//待审核
+            baseDao.insert(entity);
+            //插入成员表
+            List<IcResiMemberEntity> memberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
+            memberList.forEach(mem -> {
+                if (StringUtils.isNotBlank(mem.getName()) || StringUtils.isNotBlank(mem.getIdNum())) {
+                    //姓名或份身份证号不为空时插入
+                    mem.setIcResiCollectId(entity.getId());
+                    icResiMemberDao.insert(mem);
+                }
+            });
+        } else {
+            //更新主表
+            baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
+            List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
+            //查询之前录入的成员表
+            Map<String, IcResiMemberEntity> memMap = queryOriginMem(collectInfo.getId());
+            saveOrUpdateMem(newMemberList, memMap,collectInfo.getId());
+        }
+        return new Result().ok("提交成功");
+    }
+
     private IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
         if (!res.success() || null == res.getData()) {

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -87,7 +87,8 @@
         <if test="updatedBy != null and updatedBy !=''">
             UPDATED_BY = #{updatedBy},
         </if>
-        UPDATED_TIME = NOW()
+        UPDATED_TIME = NOW(),
+        CHECK_STATE = '0'
         WHERE
             id = #{id}
     </update>