可视化-党员风采分页展示

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

@@ -55,6 +55,11 @@ public class IcPartymemberStyleDTO implements Serializable {
      */
 	private String gridId;
 
+    /**
+     * 网格的所有上级
+     */
+    private String gridPids;
+
     private String gridName;
 
     /**

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

@@ -0,0 +1,23 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class StyleShowListFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+}

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

@@ -31,6 +31,7 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
 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 lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,4 +120,16 @@ public class IcPartymemberStyleController {
         return icPartymemberStyleService.importData(tokenDto, response, file);
     }
 
+    /**
+     * 数据分析-党员风采列表查询
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("showlist")
+    public Result<PageData<IcPartymemberStyleDTO>> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showList(formDTO));
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartymemberStyleDao.java

@@ -19,9 +19,12 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
+import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 党员风采
  *
@@ -32,4 +35,6 @@ import org.apache.ibatis.annotations.Param;
 public interface IcPartymemberStyleDao extends BaseDao<IcPartymemberStyleEntity> {
 
     int clearCategry(@Param("categoryId") String categoryId, @Param("userId")String userId);
+
+    List<IcPartymemberStyleDTO> selectShowList(@Param("agencyId")String agencyId, @Param("customerId")String customerId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartymemberStyleEntity.java

@@ -50,6 +50,11 @@ public class IcPartymemberStyleEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	/**
+	 * 网格的所有上级
+	 */
+	private String gridPids;
+
     /**
      * 党员姓名
      */

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

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.Result;
 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -109,4 +110,10 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
      */
     Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException;
 
+    /**
+     * 数据分析-党员风采列表查询
+     * @param formDTO
+     * @return
+     */
+    PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO);
 }

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

@@ -49,6 +49,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleImageService;
 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.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -141,8 +142,11 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     public void save(TokenDto tokenDto, IcPartymemberStyleDTO dto) {
         IcPartymemberStyleEntity entity = ConvertUtils.sourceToTarget(dto, IcPartymemberStyleEntity.class);
         entity.setCustomerId(tokenDto.getCustomerId());
-        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        // CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-        entity.setAgencyId(staff.getAgencyId());
+        GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(dto.getGridId());
+        entity.setAgencyId(gridInfoCache.getPid());
+        entity.setGridPids(gridInfoCache.getPids());
+
         if (StringUtils.isBlank(entity.getId())) {
             insert(entity);
         } else {
@@ -284,6 +288,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             entity.setCustomerId(tokenDto.getCustomerId());
             entity.setAgencyId(staffInfoCache.getAgencyId());
             entity.setGridId(gridMap.get(item.getGridName()));
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
+            if (null != gridInfo) {
+                entity.setGridPids(gridInfo.getPids());
+            }
             entity.setName(item.getName());
             entity.setMainDeed(item.getMainDeed());
             IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName());
@@ -306,4 +314,30 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         return new Result().ok(str);
     }
 
+    /**
+     * 数据分析-党员风采列表查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), 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()));
+        if (CollectionUtils.isNotEmpty(pageInfo.getList())) {
+            //赋值网格名称
+            for (IcPartymemberStyleDTO dto : pageInfo.getList()) {
+                dto.setImageList(icPartymemberStyleImageService.getByStyleId(dto.getId()));
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                if (null != gridInfo) {
+                    dto.setGridName(gridInfo.getGridName());
+                }
+            }
+        }
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.3__style_gridpids.sql

@@ -0,0 +1 @@
+alter table ic_partymember_style add COLUMN GRID_PIDS VARCHAR(255) comment '网格的所有上级' after GRID_ID;

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartymemberStyleDao.xml

@@ -25,4 +25,22 @@
         and CATEGORY_ID=#{categoryId}
     </update>
 
+    <select id="selectShowList" parameterType="map" resultType="com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO">
+        SELECT
+        s.id,
+        s.GRID_ID,
+        s.`NAME`,
+        s.MAIN_DEED,
+        s.CATEGORY_ID,
+        IFNULL( d.CATEGORY_NAME, '' ) AS CATEGORY_NAME
+    FROM
+        ic_partymember_style s
+        LEFT JOIN ic_partymember_style_category_dict d ON ( s.CATEGORY_ID = d.id )
+    WHERE
+        s.DEL_FLAG = '0'
+        AND s.CUSTOMER_ID = #{customerId}
+        AND s.grid_pids LIKE concat( '%', #{agencyId}, '%' )
+    ORDER BY
+        s.CREATED_TIME ASC
+    </select>
 </mapper>