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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java

@@ -16,10 +16,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
-import com.epmet.dao.CustomerGridDao;
+import com.epmet.dao.*;
-import com.epmet.dao.IcNeighborHoodDao;
-import com.epmet.dao.IcNeighborHoodPropertyDao;
-import com.epmet.dao.IcOrganizationCodeInfoDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
@@ -30,10 +27,7 @@ import com.epmet.dto.form.IcUserBelongToChangedFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.dto.result.OrganizationCommunityDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.entity.IcHouseEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.IcNeighborHoodEntity;
-import com.epmet.entity.IcNeighborHoodPropertyEntity;
-import com.epmet.entity.IcOrganizationCodeInfoEntity;
 import com.epmet.enums.OrganizationTypeEnums;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -85,6 +79,8 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
     @Autowired
     private OssFeignClient ossFeignClient;
+    @Autowired
+    private CustomerAgencyDao customerAgencyDao;
 
 
     @Override
@@ -155,7 +151,8 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         }
         //跳转的页面
         StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode());
-        path.append("?neiId=").append(entity.getId()).append("&agencyId=").append(entity.getAgencyId());
+        path.append("?neiId=").append(entity.getId())
+                .append("&agencyId=").append(entity.getAgencyId());
 
         //需要发送的Json
         JSONObject data = new JSONObject();

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

@@ -228,7 +228,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             if(StringUtils.isNotBlank(entity.getIdNum())){
                 if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) {
                     entity.setIcResiCollectId(collectInfo.getId());
-                    entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId());
+                    entity.setCustomerId(collectInfo.getCustomerId());
                     entity.setId(memMap.get(entity.getIdNum()).getId());
                     icResiMemberDao.updateById(entity);
                     continue;

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.IcResiCollectDao">
 
     <select id="selectByAddress" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiCollectEntity">
-        select c.id from ic_resi_collect c
+        select c.id,c.CUSTOMER_ID from ic_resi_collect c
         where  c.address=#{address}
         and c.DEL_FLAG='0'
     </select>