Merge remote-tracking branch 'remotes/origin/dev' into dev_house_resi_export

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @date 2022/4/28 09:10
      */
     void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
+
+    void updateOneNeighborHood(ImportGeneralDTO info);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -227,13 +227,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getAgencyId()) : buildingInfos;
             Object cacheBuilding = icHouseRedis.getTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId(), dto.getNeighborHoodId() + "_" + dto.getBuildingName());
             dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString());
-            if (StringUtils.isNotBlank(dto.getBuildingId())){
+            /*if (StringUtils.isNotBlank(dto.getBuildingId())){
                 // 说明数据库已存在此楼栋，不需添加
                 nums.add(num);
                 disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
             }else {
                 needDisposeList.add(dto);
-            }
+            }*/
+            needDisposeList.add(dto);
         }else {
             needDisposeList.add(dto);
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -88,12 +88,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         info = data;
         num = num + NumConstant.ONE;
         info.setNum(num);
-        if (StringUtils.isBlank(data.getNeighborHoodName()) ||
-                StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
-            nums.add(num);
-            disposeErrorMsg(info,NEIGHBORHOOD_TYPE_ERROR);
-            return;
-        }
         if(StringUtils.isBlank(data.getAgencyName())){
             nums.add(num);
             disposeErrorMsg(info, "所属组织的值未填写");
@@ -109,7 +103,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             disposeErrorMsg(info,"小区名称的值未填写");
             return;
         }
-        if(StringUtils.isBlank(data.getNeighborHoodName())){
+        if(StringUtils.isBlank(data.getAddress())){
             nums.add(num);
             disposeErrorMsg(info,"详细地址的值未填写");
             return;

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

@@ -567,6 +567,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcNeighborHoodEntity entity = baseDao.selectOne(wrapper);
         if (null != entity) {
             info.setNeighborHoodExistStatus(true);
+            baseDao.updateOneNeighborHood(info);
             return entity.getId();
         }
         entity = new IcNeighborHoodEntity();

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -51,6 +51,7 @@
             BUILDING_LEADER_NAME = #{buildingLeaderName},
             BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
             SORT = #{sort},
+            TYPE = #{type},
             UPDATED_TIME = NOW()
         WHERE ID = #{buildingId}
     </update>
@@ -91,7 +92,7 @@
         c.ORGANIZATION_NAME as agencyName,
         d.ID as  gridId,
         d.GRID_NAME as gridName,
-        a.SORT as sort,
+        IFNULL(a.SORT,0) as sort,
         a.LONGITUDE as longitude,
         a.LATITUDE as latitude,
         a.TYPE as buildingTypeKey,

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -112,7 +112,7 @@
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
         gr.GRID_NAME,
-        a.sort
+        IFNULL(a.sort,0) as sort
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -67,6 +67,13 @@
         </foreach>
         )
     </update>
+    <update id="updateOneNeighborHood">
+        update ic_neighbor_hood
+        set ADDRESS = #{address},
+            REMARK = #{remark},
+            UPDATED_TIME = NOW()
+        where id = #{neighborHoodId}
+    </update>
 
     <!-- 删除物业关系 -->
     <delete id="delProperty">

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党员风采列表接口参数
+ *
+ * @author work@yujt.net.cn
+ * @date 2022/5/9/0009 14:22
+ */
+@Data
+public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7548077165302515633L;
+
+    @NotBlank(message = "所属组织不能为空")
+    private String agencyId;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -40,6 +40,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -172,6 +173,7 @@ public class IcPartymemberStyleController {
 
     /**
      * 数据分析-党员风采列表查询
+     *
      * @param tokenDto
      * @return
      */
@@ -183,8 +185,27 @@ public class IcPartymemberStyleController {
         return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showList(formDTO));
     }
 
+    /**
+     * 党员风采列表
+     *
+     * @param tokenDto 登录用户
+     * @param formDto  查询条件
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>>
+     * @author work@yujt.net.cn
+     * @date 2022/5/9/0009 14:23
+     */
+    @PostMapping("showlistbyagency")
+    public Result<PageData<IcPartymemberStyleDTO>> showListByAgency(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListResiFormDTO formDto) {
+        formDto.setCustomerId(tokenDto.getCustomerId());
+        // 此接口不包含userId相关业务处理
+        formDto.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDto, StyleShowListFormDTO.AddUserInternalGroup.class);
+        return new Result().ok(icPartymemberStyleService.showListByAgency(formDto));
+    }
+
     /**
      * 下载党员风采导入模板
+     *
      * @param response
      * @throws IOException
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java

@@ -25,6 +25,7 @@ import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -93,6 +94,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
 
     /**
      * 查询列表
+     *
      * @Param formDTO
      * @Return {@link PageData<IcPartymemberStyleDTO>}
      * @Author zhaoqifeng
@@ -102,6 +104,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
 
     /**
      * 导入数据
+     *
      * @Param tokenDto
      * @Param response
      * @Param file
@@ -113,8 +116,19 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
 
     /**
      * 数据分析-党员风采列表查询
+     *
      * @param formDTO
      * @return
      */
     PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO);
+
+    /**
+     * 党员风采列表查询
+     *
+     * @param formDto
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>
+     * @author work@yujt.net.cn
+     * @date 2022/5/9/0009 14:22
+     */
+    PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
@@ -420,6 +419,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         }
         return url;
     }
+
     /**
      * @Author sun
      * @Description 党员风采导入修改导入任务状态
@@ -451,11 +451,21 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
      */
     @Override
     public PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+        String customerId = formDTO.getCustomerId();
+        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId());
         if (null == staff || StringUtils.isBlank(staff.getAgencyId())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常");
         }
-        PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId()));
+        return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId);
+    }
+
+    @Override
+    public PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto) {
+        return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId());
+    }
+
+    private PageData<IcPartymemberStyleDTO> showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) {
+        PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId));
         if (CollectionUtils.isNotEmpty(pageInfo.getList())) {
             //赋值网格名称
             for (IcPartymemberStyleDTO dto : pageInfo.getList()) {
@@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         }
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
-
 }