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/SaveCollectFormDTO.java

@@ -14,6 +14,11 @@ import java.util.List;
 @Data
 public class SaveCollectFormDTO implements Serializable {
 
+    /**
+     * id
+     */
+    private String id;
+
     /**
      * 客户Id customer.id
      */

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

@@ -153,8 +153,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result saveCollectInfo(SaveCollectFormDTO formDTO) {
-        IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
+        if (StringUtils.isBlank(formDTO.getId())) {
-        if (null == collectInfo) {
             //插入主表
             IcResiCollectEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
             //根据小区id查询网格相关信息
@@ -176,6 +175,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 }
             });
         } else {
+            IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
             //更新主表
             baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);