Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java

@@ -2,11 +2,14 @@ package com.epmet.commons.tools.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.fallback.CommonAggFeignClientFallBackFactory;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 
 /**
@@ -24,4 +27,22 @@ public interface CommonAggFeignClient {
      */
     @PostMapping("/data/aggregator/epmetuser/getStaffInfo/{staffId}")
     Result<CustomerStaffInfoCache> getStaffInfo(@PathVariable("staffId") String staffId);
+
+    /**
+     * @Description  查询组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("/data/aggregator/org/agency")
+    Result<AgencyInfoCache> getAgencyInfo(@RequestParam("agencyId")String agencyId);
+
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("/data/aggregator/org/grid")
+    Result<GridInfoCache> getGridInfo(@RequestParam("gridId")String gridId);
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java

@@ -2,7 +2,9 @@ package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.CommonAggFeignClient;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
@@ -20,4 +22,14 @@ public class CommonAggFeignClientFallback implements CommonAggFeignClient {
     public Result<CustomerStaffInfoCache> getStaffInfo(String staffId) {
         return  ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getStaffInfo", staffId);
     }
+
+    @Override
+    public Result<AgencyInfoCache> getAgencyInfo(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getAgencyInfo", agencyId);
+    }
+
+    @Override
+    public Result<GridInfoCache> getGridInfo(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getGridInfo", gridId);
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -0,0 +1,93 @@
+package com.epmet.commons.tools.redis.common;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.CommonAggFeignClient;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.bean.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.util.Map;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:29 下午
+ * @DESC
+ */
+@Slf4j
+@Component
+public class CustomerOrgRedis {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private CommonAggFeignClient commonAggFeignClient;
+
+    private static CustomerOrgRedis customerOrgRedis;
+    private static final String ROLE_MAP_KEY = "roleMap";
+
+    @PostConstruct
+    public void init() {
+        customerOrgRedis = this;
+        customerOrgRedis.redisUtils = this.redisUtils;
+        customerOrgRedis.commonAggFeignClient = this.commonAggFeignClient;
+    }
+
+    /**
+     * @Description  获取网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 3:12 下午
+     */
+    public static GridInfoCache getGridInfo(String gridId){
+        String key = RedisKeys.getGridInfoKey(gridId);
+        Map<String, Object> grid = customerOrgRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(grid)) {
+            return ConvertUtils.mapToEntity(grid, GridInfoCache.class);
+        }
+        Result<GridInfoCache> gridInfoResult = customerOrgRedis.commonAggFeignClient.getGridInfo(gridId);
+        if (!gridInfoResult.success()){
+            throw new RenException("查询网格信息失败...");
+        }
+        if (null == gridInfoResult.getData()){
+            throw new RenException("没有此网格信息...");
+        }
+        Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
+        customerOrgRedis.redisUtils.hMSet(key, map);
+        return gridInfoResult.getData();
+    }
+
+    /**
+     * @Description  获取组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 3:12 下午
+     */
+    public static AgencyInfoCache getAgencyInfo(String agencyId){
+        String key = RedisKeys.getAgencyByIdKey(agencyId);
+        Map<String, Object> agency = customerOrgRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(agency)) {
+            return ConvertUtils.mapToEntity(agency, AgencyInfoCache.class);
+        }
+        Result<AgencyInfoCache> agencyInfoResult = customerOrgRedis.commonAggFeignClient.getAgencyInfo(agencyId);
+        if (!agencyInfoResult.success()){
+            throw new RenException("查询组织信息失败...");
+        }
+        if (null == agencyInfoResult.getData()){
+            throw new RenException("没有此组织信息...");
+        }
+        Map<String, Object> map = BeanUtil.beanToMap(agencyInfoResult.getData(), false, true);
+        customerOrgRedis.redisUtils.hMSet(key, map);
+        return agencyInfoResult.getData();
+    }
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java

@@ -0,0 +1,142 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:45 下午
+ * @DESC
+ */
+@Data
+public class AgencyInfoCache implements Serializable {
+
+    private static final long serialVersionUID = -1332373159954084159L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 上级组织机构ID
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+
+    /**
+     * 组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 机关级别（社区级：community，
+     乡（镇、街道）级:street,
+     区县级: district,
+     市级: city
+     省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    private String areaCode;
+
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 坐标区域
+     */
+    private String coordinates;
+
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java

@@ -0,0 +1,116 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:24 下午
+ * @DESC
+ */
+@Data
+public class GridInfoCache implements Serializable {
+
+    private static final long serialVersionUID = -6159429894486235267L;
+
+
+    /**
+     * ID 唯一标识
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /** 组织-网格 */
+    private String gridNamePath;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**
+     * 删除标识:0.未删除 1.已删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 管辖区域
+     */
+    private String manageDistrict;
+
+    /**
+     * 当前网格总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 所属组织机构ID（customer_organization.id）
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+    private String pids;
+
+    /**
+     * 所属组织机构名
+     */
+    private String agencyName;
+
+    /**
+     * 所有上级组织名
+     */
+    private String allParentName;
+
+    /**
+     * 坐标区域
+     */
+    private String coordinates;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java

@@ -59,6 +59,11 @@ public class CustomerGridDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 坐标区域
+     */
+    private String coordinates;
+
     /**
      * 所属地区码（所属组织地区码）
      */
@@ -123,4 +128,9 @@ public class CustomerGridDTO implements Serializable {
      * 所有上级组织名
      */
     private String allParentName;
+
+    /**
+     * 组织-网格
+     */
+    private String gridNamePath;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -9,18 +9,19 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
+import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
+import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums;
 import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -178,4 +179,26 @@ public class GovOrgController {
         return new Result<List<OrgTreeResultDTO>>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
     }
 
+    /**
+     * @Description  查询组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("agency")
+    public Result<CustomerAgencyEntity> getAgencyInfo(@RequestParam("agencyId")String agencyId){
+        return new Result<CustomerAgencyEntity>().ok(govOrgService.getAgencyInfo(agencyId));
+    }
+
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("grid")
+    public Result<CustomerGridDTO> getGridInfo(@RequestParam("gridId")String gridId){
+        return new Result<CustomerGridDTO>().ok(govOrgService.getGridInfo(gridId));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java

@@ -76,4 +76,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<StaffAgencyGridListResultDTO.GridResultDTO> getGridListByAgencyId(@Param("agencyId") String agencyId);
 
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 3:39 下午
+     */
+    CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -10,6 +10,8 @@ import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
+import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
+import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 
 import java.util.List;
 
@@ -155,4 +157,20 @@ public interface GovOrgService {
      */
     List<String> getStaffOrgList(String staffId);
 
+    /**
+     * @Description  查询组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    CustomerAgencyEntity getAgencyInfo(String agencyId);
+
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 2:57 下午
+     */
+    CustomerGridDTO getGridInfo(String gridId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -20,6 +20,7 @@ import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
+import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -532,5 +533,27 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerAgencyDao.getOrgList(staffId);
     }
 
+    /**
+     * @Description  查询组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @Override
+    public CustomerAgencyEntity getAgencyInfo(String agencyId) {
+        return customerAgencyDao.selectById(agencyId);
+    }
+
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 2:57 下午
+     */
+    @Override
+    public CustomerGridDTO getGridInfo(String gridId) {
+        return customerGridDao.getGridInfo(gridId);
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -769,32 +769,39 @@
 
     <select id="selectGirdMemberPatrol" resultType="com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO">
         SELECT
-            staff_id staffId,
+            a.staff_id staffId,
-            staff_name staffName,
+            a.staff_name staffName,
-            date_id dateId,
+            a.date_id dateId,
             IFNULL(
                 SUM(
-                    issue_to_project_count + closed_issue_count + project_response_count + project_transfer_count + project_closed_count
+                    a.issue_to_project_count + a.closed_issue_count + a.project_response_count + a.project_transfer_count + a.project_closed_count
-                )
+                ),
-            , 0)eventCount
+                0
-        FROM
+            ) eventCount
-            fact_grid_member_statistics_daily
+        FROM
-        WHERE
+            fact_grid_member_statistics_daily a
-            del_flag = '0'
+        INNER JOIN (
-        AND pids LIKE concat('%', #{agencyId}, '%')
+            SELECT
-        AND date_id = (
+                staff_id,
-            SELECT MAX(date_id)
+                MAX(date_id) date_id
-            FROM fact_grid_member_statistics_daily
+            FROM
-            WHERE
+                fact_grid_member_statistics_daily
-                del_flag = '0'
+            WHERE del_flag = '0'
+            AND pids LIKE concat('%', #{agencyId}, '%')
             <if test="dimType!= null and dimType == 'month' ">
                 AND month_id = #{dimId}
             </if>
             <if test="dimType!= null and dimType == 'year' ">
                 AND year_id = #{dimId}
             </if>
-        )
+            GROUP BY STAFF_ID
-        GROUP BY staff_id
+        ) b ON a.STAFF_ID = b.STAFF_ID AND a.date_id = b.date_id
+
+        WHERE
+            a.del_flag = '0'
+        AND a.pids LIKE concat('%', #{agencyId}, '%')
+        GROUP BY a.staff_id
+        ORDER BY a.date_id DESC
     </select>
 
     <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -124,7 +124,7 @@
     <select id="gridMemberPatrol" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">
         SELECT
             staff_id staffId,
-            IFNULL(SUM(patrol_total), 0) reportProjectCount,
+            IFNULL(SUM(report_project_count), 0) reportProjectCount,
             IFNULL(SUM(total_time), 0) timeNum
         FROM
             stats_staff_patrol_record_daily

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -163,4 +163,16 @@
         AND cg.pid = #{agencyId}
     </select>
 
+    <!-- 查询网格信息 -->
+    <select id="getGridInfo" resultType="com.epmet.dataaggre.dto.govorg.CustomerGridDTO">
+        SELECT
+            ca.ORGANIZATION_NAME AS agencyName,
+            CONCAT(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME) AS gridNamePath,
+            cg.*
+        FROM customer_grid cg
+        LEFT JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.DEL_FLAG = '0')
+        WHERE cg.DEL_FLAG = '0'
+          AND cg.ID = #{gridId}
+    </select>
+
 </mapper>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.project.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 3:23 下午
+ * @DESC
+ */
+@Data
+public class CategoryProjectListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5448734274886241594L;
+
+    public interface CategoryProjectListForm{}
+
+    @NotNull(message = "pageSize不能为空",groups = CategoryProjectListForm.class)
+    private Integer pageSize;
+
+    @NotNull(message = "pageNo不能为空",groups = CategoryProjectListForm.class)
+    private Integer pageNo;
+
+    /**
+     * 项目状态：closed：已结案，all：全部
+     */
+    @NotNull(message = "status不能为空",groups = CategoryProjectListForm.class)
+    private String status;
+
+    @NotNull(message = "categoryCode不能为空",groups = CategoryProjectListForm.class)
+    private String categoryCode;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 组织类型：agency：组织，grid：网格
+     */
+    private String orgType;
+
+    /**
+     * 是否分页，默认true，false的时候 给导出用
+     */
+    private Boolean isPage = true;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.project.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 3:18 下午
+ * @DESC
+ */
+@Data
+public class ProjectCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5047143743629810527L;
+
+    public interface ProjectCategoryForm{}
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 组织类型 组织：agency，网格：grid
+     */
+    private String orgType;
+
+    @NotBlank(message = "结束时间不能为空",groups = ProjectCategoryForm.class)
+    private String endTime;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java

@@ -0,0 +1,61 @@
+package com.epmet.project.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 3:31 下午
+ * @DESC
+ */
+@Data
+public class CategoryProjectListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8820354423099062062L;
+
+    /**
+     * 分类
+     */
+    private String category;
+
+    /**
+     * 项目状态:待处理 pending，结案closed
+     */
+    private String projectStatus;
+
+    /**
+     * 项目标题
+     */
+    private String projectTitle;
+
+    /**
+     * 网格
+     */
+    private String gridName;
+
+    /**
+     * 项目创建时间
+     */
+    private String createTime;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    @JsonIgnore
+    private String orgId;
+
+    @JsonIgnore
+    private String orgType;
+
+    public CategoryProjectListResultDTO() {
+        this.category = "";
+        this.projectStatus = "";
+        this.projectTitle = "";
+        this.gridName = "";
+        this.createTime = "";
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/PageCategoryProjectListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.project.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 1:51 下午
+ * @DESC
+ */
+@Data
+public class PageCategoryProjectListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8822993169364931502L;
+
+    private Integer total;
+
+    private List<CategoryProjectListResultDTO> list;
+
+    public PageCategoryProjectListResultDTO() {
+        this.total = NumConstant.ZERO;
+        this.list = new ArrayList<>();
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java

@@ -0,0 +1,64 @@
+package com.epmet.project.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 3:13 下午
+ * @DESC
+ */
+@Data
+public class ProjectCategoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2662970383306349424L;
+
+    /**
+     * 分类CODE
+     */
+    private String categoryCode;
+
+    /**
+     * 分类名字
+     */
+    private String categoryName;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectTotal;
+
+    /**
+     * 结案项目数
+     */
+    private Integer closedProjectTotal;
+
+    /**
+     * 总数占比
+     */
+    private String totalRatio;
+
+    /**
+     * 结案率
+     */
+    private String closedRatio;
+
+    private List<ProjectCategoryResultDTO> children;
+    @JsonIgnore
+    private int index;
+
+    public ProjectCategoryResultDTO() {
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.projectTotal = NumConstant.ZERO;
+        this.closedProjectTotal = NumConstant.ZERO;
+        this.totalRatio = "";
+        this.closedRatio = "";
+        this.children = new ArrayList<>();
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategorySonResultDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.project.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 3:13 下午
+ * @DESC
+ */
+@Data
+public class ProjectCategorySonResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2662970383306349424L;
+
+    /**
+     * 分类CODE
+     */
+    private String categoryCode;
+
+    /**
+     * 分类名字
+     */
+    private String categoryName;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectTotal;
+
+    /**
+     * 结案项目数
+     */
+    private Integer closedProjectTotal;
+
+    /**
+     * 总数占比
+     */
+    private String totalRatio;
+
+    /**
+     * 结案率
+     */
+    private String closedRatio;
+
+    public ProjectCategorySonResultDTO() {
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.projectTotal = NumConstant.ZERO;
+        this.closedProjectTotal = NumConstant.ZERO;
+        this.totalRatio = "";
+        this.closedRatio = "";
+    }
+}

epmet-module/data-report/data-report-server/pom.xml

@@ -116,6 +116,16 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <resources>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -1,5 +1,13 @@
 package com.epmet.datareport.controller.screen;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectOrgDailyService;
@@ -12,13 +20,24 @@ import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
+import com.epmet.project.dto.form.CategoryProjectListFormDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
+import com.epmet.project.dto.form.ProjectCategoryFormDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
+import com.epmet.project.dto.result.PageCategoryProjectListResultDTO;
+import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目
@@ -155,4 +174,69 @@ public class ScreenProjectController {
         return new Result<List<CategoryTopAppealResultDTO>>().ok(screenProjectService.categoryTopAppeal(formDTO));
     }
 
+
+    /**
+     * @Description 【项目分类】查询项目分类
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:38 下午
+     */
+    @PostMapping("selectprojectcategory")
+    public Result<List<ProjectCategoryResultDTO>> selectProjectCategory(@RequestBody ProjectCategoryFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.ProjectCategoryForm.class);
+        return new Result<List<ProjectCategoryResultDTO>>().ok(screenProjectService.selectProjectCategory(formDTO,tokenDto));
+    }
+    /**
+     * @Description 【项目分类】查询项目分类
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:38 下午
+     */
+    @PostMapping("selectprojectcategory/export")
+    public void selectProjectCategoryExport(@RequestBody ProjectCategoryFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception {
+        tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
+        tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.ProjectCategoryForm.class);
+        List<ProjectCategoryResultDTO> data = screenProjectService.selectProjectCategory(formDTO, tokenDto);
+        String templatePath = "excel/project_category_temp.xlsx";
+
+        StringBuilder dateBuilder = new StringBuilder();
+        if (StringUtils.isNotBlank(formDTO.getStartTime())){
+            dateBuilder.append(formDTO.getStartTime()).append(StrConstant.HYPHEN);
+        }
+        if (StringUtils.isNotBlank(formDTO.getEndTime())){
+            dateBuilder.append(formDTO.getEndTime());
+        }
+        List<ProjectCategoryResultDTO> resultDTOList = new ArrayList<>();
+        data.forEach(e->{
+            resultDTOList.add(e);
+            e.setIndex(1);
+            resultDTOList.addAll(ConvertUtils.sourceToTarget(e.getChildren(),ProjectCategoryResultDTO.class));
+        });
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        Map<String,Object> mapData = new HashMap<>();
+        mapData.put("list",resultDTOList);
+        mapData.put("orgName",staffInfo.getAgencyName());
+        mapData.put("exportDate",dateBuilder.toString());
+        Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData);
+        response.setHeader("content-Type", "application/vnd.ms-excel");
+        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目分类统计.xls", "UTF-8"));
+        workbook.write(response.getOutputStream());
+    }
+
+    /**
+     * @Description  【项目分类】查询分类下的项目
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:39 下午
+     */
+    @PostMapping("selectcategoryprojectlist")
+    public Result<PageCategoryProjectListResultDTO> selectCategoryProjectList(@RequestBody CategoryProjectListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, CategoryProjectListFormDTO.CategoryProjectListForm.class);
+        return new Result<PageCategoryProjectListResultDTO>().ok(screenProjectService.selectCategoryProjectList(formDTO,tokenDto));
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java

@@ -19,7 +19,9 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.screen.CategoryAnalysisResultDTO;
 import com.epmet.project.CustomerProjectCategoryDTO;
+import com.epmet.project.dto.form.ProjectCategoryFormDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
+import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -52,4 +54,33 @@ public interface ScreenProjectCategoryOrgDailyDao {
 	 * @date 2021/8/18 1:40 下午
 	 */
 	List<CategoryTopAppealResultDTO> categoryTopAppeal(@Param("agencyId") String agencyId,@Param("customerId")String customerId,@Param("topCount")Integer topCount);
+
+	/**
+	 * @Description  组织查询分类
+	 * @param customerId
+	 * @param time
+	 * @param orgId
+	 * @author zxc
+	 * @date 2021/11/5 8:54 上午
+	 */
+	List<ProjectCategoryResultDTO> selectProjectCategoryByAgency(@Param("customerId")String customerId,@Param("time")String time,@Param("orgId")String orgId);
+
+	/**
+	 * @Description  网格查询分类
+	 * @param customerId
+	 * @param time
+	 * @param orgId
+	 * @author zxc
+	 * @date 2021/11/5 8:55 上午
+	 */
+	List<ProjectCategoryResultDTO> selectProjectCategoryByGrid(@Param("customerId")String customerId,@Param("time")String time,@Param("orgId")String orgId);
+
+	/**
+	 * @Description  查询客户下所有分类
+	 * @param customerId
+	 * @author zxc
+	 * @date 2021/11/4 5:45 下午
+	 */
+	List<ProjectCategoryResultDTO> selectCategoryByCustomerId(@Param("customerId")String customerId);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java

@@ -3,6 +3,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 import com.epmet.dto.result.screen.ColorProjectTotalResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
+import com.epmet.project.dto.result.CategoryProjectListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,4 +46,15 @@ public interface ScreenProjectDataDao {
      * @date 2021/6/1 3:48 下午
      */
     List<ColorProjectTotalResultDTO> selectColorProjectByAreaCode(@Param("areaCode") String areaCode,@Param("monthCount")Integer monthCount);
+
+    /**
+     * @Description  查询分类下的项目列表
+     * @param customerId
+     * @param orgId
+     * @author zxc
+     * @date 2021/11/5 1:40 下午
+     */
+    List<CategoryProjectListResultDTO> selectCategoryProjectList(@Param("customerId") String customerId,@Param("orgId") String orgId,
+                                                                 @Param("categoryCode")String categoryCode,@Param("status")String status);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java

@@ -19,6 +19,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
 import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
+import com.epmet.project.dto.form.ProjectCategoryFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,4 +46,9 @@ public interface ScreenProjectOrgDailyDao {
      * @description 下级组织的效率（解决率）列表
      **/
     List<EfficiencyAnalysisResultDTO> queryEfficiencyAnalysis(@Param("customerId")String customerId,@Param("areaCode") String areaCode);
+
+    Integer selectProjectTotalByAgency(@Param("customerId")String customerId,@Param("time")String time,@Param("orgId")String orgId);
+
+    Integer selectProjectTotalByGrid(@Param("customerId")String customerId,@Param("time")String time,@Param("orgId")String orgId);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java

@@ -1,5 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.screen.CategoryAnalysisFormDTO;
 import com.epmet.dto.form.screen.ColorProjectTotalFormDTO;
@@ -10,8 +11,13 @@ import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
+import com.epmet.project.dto.form.CategoryProjectListFormDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
+import com.epmet.project.dto.form.ProjectCategoryFormDTO;
+import com.epmet.project.dto.result.CategoryProjectListResultDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
+import com.epmet.project.dto.result.PageCategoryProjectListResultDTO;
+import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 
 import java.util.List;
 
@@ -62,4 +68,24 @@ public interface ScreenProjectService {
      */
     List<CategoryTopAppealResultDTO> categoryTopAppeal(CategoryTopAppealFormDTO formDTO);
 
+
+    /**
+     * @Description 【项目分类】查询项目分类
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:38 下午
+     */
+    List<ProjectCategoryResultDTO> selectProjectCategory(ProjectCategoryFormDTO formDTO, TokenDto tokenDto);
+
+    /**
+     * @Description  【项目分类】查询分类下的项目
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:39 下午
+     */
+    PageCategoryProjectListResultDTO selectCategoryProjectList(CategoryProjectListFormDTO formDTO, TokenDto tokenDto);
+
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -3,14 +3,18 @@ package com.epmet.datareport.service.evaluationindex.screen.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
+import com.epmet.datareport.constant.FactConstant;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.*;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.CustomerAgencyUserRoleFormDTO;
@@ -26,15 +30,21 @@ import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.project.CustomerProjectCategoryDTO;
+import com.epmet.project.dto.form.CategoryProjectListFormDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
-import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
+import com.epmet.project.dto.form.ProjectCategoryFormDTO;
+import com.epmet.project.dto.result.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -63,6 +73,9 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     @Autowired
     private EpmetUserOpenFeignClient userOpenFeignClient;
 
+    @Autowired
+    private ScreenProjectOrgDailyDao screenProjectOrgDailyDao;
+
     /**
      * @Description  3、项目详情
      * @param projectDetailFormDTO
@@ -228,4 +241,153 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         }
         return result;
     }
+
+
+    /**
+     * @Description 【项目分类】查询项目分类
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:38 下午
+     */
+    @Override
+    public List<ProjectCategoryResultDTO> selectProjectCategory(ProjectCategoryFormDTO formDTO, TokenDto tokenDto) {
+        if (StringUtils.isBlank(formDTO.getOrgId())){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new RenException("未查询到此工作人员的所属组织信息...");
+            }
+            formDTO.setOrgId(staffInfo.getAgencyId());
+            formDTO.setOrgType(FactConstant.AGENCY);
+        }
+        String customerId = tokenDto.getCustomerId();
+        String endTime = formDTO.getEndTime();
+        String startTime = formDTO.getStartTime();
+        String orgId = formDTO.getOrgId();
+        // 查询客户下的所有分类
+        List<ProjectCategoryResultDTO> result = screenProjectCategoryOrgDailyDao.selectCategoryByCustomerId(tokenDto.getCustomerId());
+        List<ProjectCategoryResultDTO> endCategoryList = new ArrayList<>();
+        if (formDTO.getOrgType().equals(FactConstant.GRID)){
+            Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByGrid(customerId, endTime, orgId);
+            endTotal = null == endTotal ? NumConstant.ZERO : endTotal;
+            endCategoryList = screenProjectCategoryOrgDailyDao.selectProjectCategoryByGrid(customerId,endTime,orgId);
+            Integer total = endTotal;
+            if (StringUtils.isNotBlank(startTime)){
+                Integer startTotal = screenProjectOrgDailyDao.selectProjectTotalByGrid(customerId, startTime, orgId);
+                startTotal = null == startTotal ? NumConstant.ZERO : startTotal;
+                total = endTotal - startTotal;
+                List<ProjectCategoryResultDTO> startCategoryList = screenProjectCategoryOrgDailyDao.selectProjectCategoryByGrid(customerId,startTime,orgId);
+                endCategoryList.forEach(e -> startCategoryList.stream().filter(s -> e.getCategoryCode().equals(s.getCategoryCode())).forEach(s -> e.setProjectTotal(subtract(e.getProjectTotal(),s.getProjectTotal()))));
+                endCategoryList.forEach(e -> startCategoryList.stream().filter(s -> e.getCategoryCode().equals(s.getCategoryCode())).forEach(s -> e.setClosedProjectTotal(subtract(e.getClosedProjectTotal(),s.getClosedProjectTotal()))));
+            }
+            Integer finalTotal = total;
+            endCategoryList.forEach(e -> {
+                e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
+                e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+            });
+        }else {
+            Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, endTime, orgId);
+            endTotal = null == endTotal ? NumConstant.ZERO : endTotal;
+            endCategoryList = screenProjectCategoryOrgDailyDao.selectProjectCategoryByAgency(customerId,endTime,orgId);
+            Integer total = endTotal;
+            if (StringUtils.isNotBlank(startTime)){
+                Integer startTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, startTime, orgId);
+                startTotal = null == startTotal ? NumConstant.ZERO : startTotal;
+                total = endTotal - startTotal;
+                List<ProjectCategoryResultDTO> startCategoryList = screenProjectCategoryOrgDailyDao.selectProjectCategoryByAgency(customerId,startTime,orgId);
+                endCategoryList.forEach(e -> startCategoryList.stream().filter(s -> e.getCategoryCode().equals(s.getCategoryCode())).forEach(s -> e.setProjectTotal(subtract(e.getProjectTotal(),s.getProjectTotal()))));
+                endCategoryList.forEach(e -> startCategoryList.stream().filter(s -> e.getCategoryCode().equals(s.getCategoryCode())).forEach(s -> e.setClosedProjectTotal(subtract(e.getClosedProjectTotal(),s.getClosedProjectTotal()))));
+            }
+            Integer finalTotal = total;
+            endCategoryList.forEach(e -> {
+                e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
+                e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+            });
+        }
+        List<ProjectCategoryResultDTO> finalEndCategoryList = endCategoryList;
+        result.forEach(r -> {
+            finalEndCategoryList.stream().filter(e -> r.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
+                r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
+            });
+            r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
+                son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio());
+            }));
+        });
+        // 排序
+        List<ProjectCategoryResultDTO> collect = result.stream().sorted(Comparator.comparing(ProjectCategoryResultDTO::getProjectTotal).reversed()).collect(Collectors.toList());
+        collect.forEach(c -> {
+            c.setChildren(c.getChildren().stream().sorted(Comparator.comparing(ProjectCategoryResultDTO::getProjectTotal).reversed()).collect(Collectors.toList()));
+        });
+        return collect;
+    }
+
+    /**
+     * @Description  俩数相减，小于0就赋值为0
+     * @param end
+     * @param start
+     * @author zxc
+     * @date 2021/11/5 9:18 上午
+     */
+    public Integer subtract(Integer end,Integer start){
+        return end - start < NumConstant.ZERO ? NumConstant.ZERO : end - start;
+    }
+
+    /**
+     * @Description  返回占比,保留小数点2位
+     * @param molecule 分子
+     * @param denominator 分母
+     * @author zxc
+     * @date 2021/11/5 9:26 上午
+     */
+    public String ratio(Integer molecule, Integer denominator){
+        if (denominator == NumConstant.ZERO){
+            return "0.00%";
+        }
+        BigDecimal bigDecimalMolecule = new BigDecimal(molecule);
+        BigDecimal bigDecimalDenominator = new BigDecimal(denominator);
+        BigDecimal divide = bigDecimalMolecule.divide(bigDecimalDenominator, NumConstant.TWO, BigDecimal.ROUND_HALF_UP);
+        return divide.multiply(NumConstant.ONE_HUNDRED_DECIMAL)+"%";
+    }
+
+    /**
+     * @Description  【项目分类】查询分类下的项目
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:39 下午
+     */
+    @Override
+    public PageCategoryProjectListResultDTO selectCategoryProjectList(CategoryProjectListFormDTO formDTO, TokenDto tokenDto) {
+        if (StringUtils.isBlank(formDTO.getOrgId())){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new RenException("未查询到此工作人员的所属组织信息...");
+            }
+            formDTO.setOrgId(staffInfo.getAgencyId());
+            formDTO.setOrgType(FactConstant.AGENCY);
+        }
+        PageCategoryProjectListResultDTO result = new PageCategoryProjectListResultDTO();
+        List<CategoryProjectListResultDTO> list;
+        if (formDTO.getIsPage()){
+            PageInfo<CategoryProjectListResultDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus()));
+            list = objectPageInfo.getList();
+            result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
+        }else {
+            list = screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus());
+        }
+        if (!CollectionUtils.isEmpty(list)){
+            list.forEach(l -> {
+                if (l.getOrgType().equals(FactConstant.AGENCY)){
+                    AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(l.getOrgId());
+                    l.setGridName(agencyInfo.getOrganizationName());
+                }else {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId());
+                    l.setGridName(gridInfo.getGridNamePath());
+                }
+            });
+        }
+        result.setList(list);
+        return result;
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -63,4 +63,53 @@
           AND DATE_ID = (select date_id from screen_project_category_org_daily where del_flag = '0' and ORG_ID = #{agencyId} and CUSTOMER_ID= #{customerId} order by date_id desc, created_time desc limit 1)
         ORDER BY PROJECT_TOTAL DESC LIMIT #{topCount}
     </select>
+
+    <!-- 组织查询分类 -->
+    <select id="selectProjectCategoryByAgency" resultType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
+        SELECT
+        co.CATEGORY_CODE,
+        co.PROJECT_TOTAL,
+        co.CLOSED_PROJECT_TOTAL
+        FROM screen_project_category_org_daily co
+        WHERE co.DEL_FLAG = '0'
+        AND co.ORG_ID = #{orgId}
+        AND co.CUSTOMER_ID = #{customerId}
+        AND co.DATE_ID = #{time}
+    </select>
+
+    <!-- 网格查询分类 -->
+    <select id="selectProjectCategoryByGrid" resultType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
+        SELECT
+            co.CATEGORY_CODE,
+            co.PROJECT_TOTAL,
+            co.CLOSED_PROJECT_TOTAL
+        FROM screen_project_category_grid_daily co
+        WHERE co.DEL_FLAG = '0'
+          AND co.GRID_ID = #{orgId}
+          AND co.CUSTOMER_ID = #{customerId}
+          AND co.DATE_ID = #{time}
+    </select>
+
+    <!-- 查询客户下所有分类 -->
+    <resultMap id="selectCategoryByCustomerIdMap" type="com.epmet.project.dto.result.ProjectCategoryResultDTO">
+        <result column="c" property="categoryCode"/>
+        <result column="n" property="categoryName"/>
+        <collection property="children" ofType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
+            <result column="c2" property="categoryCode"/>
+            <result column="n2" property="categoryName"/>
+        </collection>
+    </resultMap>
+    <select id="selectCategoryByCustomerId" resultMap="selectCategoryByCustomerIdMap">
+        SELECT
+            p1.CATEGORY_CODE AS c,
+            p2.CATEGORY_CODE AS c2,
+            p1.CATEGORY_NAME AS n,
+            p2.CATEGORY_NAME AS n2
+        FROM customer_project_category_dict p1,customer_project_category_dict p2
+        WHERE p1.DEL_FLAG = '0'
+          AND p2.DEL_FLAG = '0'
+          AND p1.CUSTOMER_ID = #{customerId}
+          AND p2.CUSTOMER_ID = #{customerId}
+          AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -158,4 +158,25 @@
         AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
         )
     </select>
+
+    <!-- 查询分类下的项目列表 -->
+    <select id="selectCategoryProjectList" resultType="com.epmet.project.dto.result.CategoryProjectListResultDTO">
+        SELECT
+            ALL_CATEGORY_NAME AS category,
+            CASE WHEN PROJECT_STATUS_CODE = 'closed_case' THEN 'closed' ELSE PROJECT_STATUS_CODE END  AS projectStatus,
+            IFNULL(PROJECT_TITLE,'') AS projectTitle,
+            DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
+            ORG_ID,
+            ORG_TYPE,
+            PROJECT_ID
+        FROM screen_project_data
+        WHERE DEL_FLAG = '0'
+          <if test=' status == "closed" '>
+              AND PROJECT_STATUS_CODE IN ('closed_case','closed')
+          </if>
+          AND CONCAT(ALL_PARENT_IDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
+          AND CATEGORY_CODE LIKE CONCAT('%',#{categoryCode},'%')
+          AND CUSTOMER_ID = #{customerId}
+        ORDER BY PROJECT_CREATE_TIME DESC
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml

@@ -54,4 +54,30 @@
             )and m.CUSTOMER_ID=#{customerId}
             order by resolvedRatio+0 desc
     </select>
+
+    <!-- 查询项目总数组织 -->
+    <select id="selectProjectTotalByAgency" resultType="java.lang.Integer">
+        SELECT
+            PROJECT_TOTAL
+        FROM
+            screen_project_org_daily
+        WHERE
+            del_flag = '0'
+          AND ORG_ID = #{orgId}
+          AND DATE_ID = #{time}
+          AND CUSTOMER_ID = #{customerId}
+    </select>
+
+    <!-- 查询项目总数网格 -->
+    <select id="selectProjectTotalByGrid" resultType="java.lang.Integer">
+        SELECT
+            PROJECT_TOTAL
+        FROM
+            screen_project_grid_daily
+        WHERE
+            del_flag = '0'
+          AND grid_id = #{orgId}
+          AND DATE_ID = #{time}
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ClosedProjectTotalResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.project.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 9:12 上午
+ * @DESC
+ */
+@Data
+public class ClosedProjectTotalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3683494871244065806L;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 分类code
+     */
+    private String categoryCode;
+
+    /**
+     * 结案的项目数
+     */
+    private Integer closedProjectTotal = 0;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java

@@ -120,4 +120,6 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable {
      */
 	private Boolean status = false;
 
+	private Integer closedProjectTotal = 0;
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java

@@ -42,6 +42,11 @@ public class CategoryProjectResultDTO implements Serializable {
      */
     private Integer projectTotal;
 
+    /**
+     * 结案数
+     */
+    private Integer closedProjectTotal;
+
     /**
      * 分类级别
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java

@@ -42,7 +42,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @description 计算当前客户下，各个网格内，各项目分类下项目数量
      * @Date 2021/3/23 9:58
      **/
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount,@Param("projectType")String projectType);
 
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
@@ -50,7 +50,8 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,@Param("subCount") Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,
+                                                                           @Param("subCount") Integer subCount,@Param("projectType")String projectType);
 
     int deleteByProjectIds(@Param("list") List<String> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.project.result.ClosedProjectTotalResultDTO;
 import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 import com.sun.org.apache.xpath.internal.operations.Bool;
@@ -106,4 +107,15 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	 * @date 2021/8/16 10:36 上午
 	 */
 	List<CategoryProjectResultDTO> selectSelfAgencyCategory(@Param("dateId") String dateId,@Param("orgIds")List<String> orgIds);
+
+	/**
+	 * @Description  查询父客户 存在 分类的结案项目数
+	 * @param customerIds
+	 * @param dateId
+	 * @author zxc
+	 * @date 2021/11/4 9:26 上午
+	 */
+	List<ClosedProjectTotalResultDTO> selectClosedProjectTotal(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+															   @Param("status")Boolean status);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java

@@ -74,4 +74,9 @@ public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity {
 	 * 分类等级1、2....
 	 */
 	private Integer level;
+
+	/**
+	 * 分类下所有结案的项目
+	 */
+	private Integer closedProjectTotal;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java

@@ -82,6 +82,11 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity {
      */
 	private Integer projectTotal;
 
+	/**
+	 * 分类下所有结案项目数
+	 */
+	private Integer closedProjectTotal;
+
 	/**
 	 * 分类等级1、2....
 	 */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java

@@ -54,5 +54,5 @@ public interface FactOriginProjectCategoryDailyService extends BaseService<FactO
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount,String projectType);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java

@@ -138,7 +138,11 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      **/
     @Override
     public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId) {
-        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId));
+        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId),"all");
+        List<ScreenProjectCategoryGridDailyDTO> closedList = baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId),"closed");
+        if (!CollectionUtils.isEmpty(closedList)){
+            list.forEach(l -> closedList.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+        }
         return list;
     }
 
@@ -157,10 +161,10 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      * @date 2021/4/13 下午4:36
      */
     @Override
-    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount) {
+    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount,String projectType) {
         if (!CollectionUtils.isEmpty(orgIds)){
             return new ArrayList<>();
         }
-        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount);
+        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount,projectType);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.constant.ScreenConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
+import com.epmet.dto.project.result.ClosedProjectTotalResultDTO;
 import com.epmet.dto.screen.ScreenCustomerGridDTO;
 import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
@@ -264,6 +265,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         categoryProjectGrid.forEach(grid -> {
                             if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
                                 agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                agency.setClosedProjectTotal(agency.getClosedProjectTotal() + grid.getClosedProjectTotal());
                                 grid.setStatus(true);
                             }
                         });
@@ -280,7 +282,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         // 组织项目分类 项目数
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)){
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR,"all");
+            List<ScreenProjectCategoryGridDailyDTO> closedScreenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR,"closed");
+            if (!CollectionUtils.isEmpty(closedScreenProjectCategory)){
+                screenProjectCategory.forEach(l -> closedScreenProjectCategory.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+            }
             if (!CollectionUtils.isEmpty(result)){
                 if (!CollectionUtils.isEmpty(screenProjectCategory)){
                     result.forEach(r -> {
@@ -288,6 +294,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())){
                                 pc.setStatus(true);
                                 r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
+                                r.setClosedProjectTotal(r.getClosedProjectTotal() + pc.getClosedProjectTotal());
                             }
                         });
                     });
@@ -390,6 +397,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             // 组织ID 和 分类标签code一样时，项目数累加
                             if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
                                 agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                agency.setClosedProjectTotal(agency.getClosedProjectTotal() + grid.getClosedProjectTotal());
                                 grid.setStatus(true);
                             }
                         });
@@ -417,13 +425,23 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 // 父客户存在的分类
                 List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId);
                 log.info("父客户存在的分类{}"+ JSON.toJSONString(categoryProjectExists));
+                // 父客户存在的分类 已结案的项目数
+                List<ClosedProjectTotalResultDTO> closedProjectTotalExist = baseDao.selectClosedProjectTotal(customerIds, dateId, true);
                 // 父客户不存在的分类
                 List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfoNotExists(customerIds, dateId, level, customerId);
                 log.info("父客户不存在的分类{}"+ JSON.toJSONString(categoryProjectNotExists));
+                // 父客户 不存在 的分类 已结案的项目数
+                List<ClosedProjectTotalResultDTO> closedProjectTotalNotExist = baseDao.selectClosedProjectTotal(customerIds, dateId, false);
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){
+                    if (!CollectionUtils.isEmpty(closedProjectTotalExist)){
+                        categoryProjectExists.forEach(l -> closedProjectTotalExist.stream().filter(c -> l.getOrgId().equals(c.getOrgId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+                    }
                     sonCustomerList.addAll(categoryProjectExists);
                 }
                 if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
+                    if (!CollectionUtils.isEmpty(closedProjectTotalNotExist)){
+                        categoryProjectNotExists.forEach(l -> closedProjectTotalNotExist.stream().filter(c -> l.getOrgId().equals(c.getOrgId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+                    }
                     sonCustomerList.addAll(categoryProjectNotExists);
                 }
                 if (!CollectionUtils.isEmpty(sonCustomerList)){
@@ -443,6 +461,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         categoryProjectExists.forEach(c -> {
                             if (f.getCategoryCode().equals(c.getCategoryCode())){
                                 f.setProjectTotal(f.getProjectTotal() + c.getProjectTotal());
+                                f.setClosedProjectTotal(f.getClosedProjectTotal() + c.getClosedProjectTotal());
                                 c.setStatus(true);
                             }
                         });
@@ -481,6 +500,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             e.setCategoryCode(code);
                             e.setOrgId(entity.getAgencyId());
                             e.setProjectTotal(CollectionUtils.isEmpty(list2) ? NumConstant.ZERO : list2.stream().collect(Collectors.summingInt(CategoryProjectResultDTO::getProjectTotal)));
+                            e.setClosedProjectTotal(CollectionUtils.isEmpty(list2) ? NumConstant.ZERO : list2.stream().collect(Collectors.summingInt(CategoryProjectResultDTO::getClosedProjectTotal)));
                             e.setPid(entity.getPid());
                             e.setPids(StringUtils.isEmpty(entity.getPids()) ? NumConstant.ZERO_STR : entity.getPids());
                             // 因为根据categoryCode分组，所以level都一样，取第一条的
@@ -496,7 +516,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
             // 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO,"all");
+            List<ScreenProjectCategoryGridDailyDTO> closedScreenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO,"closed");
+            if (!CollectionUtils.isEmpty(closedScreenProjectCategory)){
+                screenProjectCategory.forEach(l -> closedScreenProjectCategory.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+            }
             log.info("直接立项的统计:"+screenProjectCategory);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {
@@ -505,6 +529,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())) {
                                 pc.setStatus(true);
                                 r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
+                                r.setClosedProjectTotal(r.getClosedProjectTotal() + pc.getClosedProjectTotal());
                             }
                         });
                     });

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.25__add_closedProjectTotal.sql

@@ -0,0 +1,2 @@
+alter table screen_project_category_grid_daily add COLUMN CLOSED_PROJECT_TOTAL int(11) NOT NULL DEFAULT 0 comment '该分类下所有结案的项目数' AFTER PROJECT_TOTAL;
+alter table screen_project_category_org_daily add COLUMN CLOSED_PROJECT_TOTAL int(11) NOT NULL DEFAULT 0 comment '该分类下所有结案的项目数' AFTER PROJECT_TOTAL;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml

@@ -36,13 +36,21 @@
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,
-                count(1)as projectTotal
+                <if test='projectType == "closed" '>
+                    count(1) AS closedProjectTotal
+                </if>
+                <if test='projectType == "all" '>
+                    count(1)as projectTotal
+                </if>
             FROM
                 fact_origin_project_category_daily c
                 LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0' AND p.GRID_ID != '')
             WHERE
                 c.DEL_FLAG = '0'
                 AND c.CUSTOMER_ID = #{customerId}
+                <if test='projectType == "closed" '>
+                    AND p.PROJECT_STATUS = 'closed'
+                </if>
                 AND c.`LEVEL` = '2'
                 AND p.GRID_ID != ''
             GROUP BY
@@ -60,13 +68,21 @@
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,
-                count(distinct c.project_id)as projectTotal
+                <if test='projectType == "closed" '>
+                    count(distinct c.project_id) AS closedProjectTotal
+                </if>
+                <if test='projectType == "all" '>
+                    count(distinct c.project_id)as projectTotal
+                </if>
             FROM
                 fact_origin_project_category_daily c
                 LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0' AND p.GRID_ID != '')
             WHERE
                 c.DEL_FLAG = '0'
                 AND p.GRID_ID != ''
+                <if test='projectType == "closed" '>
+                    AND p.PROJECT_STATUS = 'closed'
+                </if>
                 AND c.CUSTOMER_ID = #{customerId}
             GROUP BY
                 c.CUSTOMER_ID,
@@ -87,7 +103,12 @@
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
             P.PIDS,
-            COUNT(DISTINCT p.ID) AS projectTotal
+            <if test='projectType == "all" '>
+                COUNT(DISTINCT p.ID) AS projectTotal
+            </if>
+            <if test='projectType == "closed" '>
+                COUNT(DISTINCT p.ID) AS closedProjectTotal
+            </if>
         FROM fact_origin_project_main_daily p
         LEFT JOIN fact_origin_project_category_daily c ON ( c.PROJECT_Id = p.id AND p.del_flag='0' AND p.GRID_ID = '')
         WHERE c.DEL_FLAG = '0'
@@ -99,6 +120,9 @@
             )
           AND c.`LEVEL` = '2'
           AND p.GRID_ID = ''
+          <if test='projectType == "closed" '>
+              AND p.PROJECT_STATUS = 'closed'
+          </if>
         GROUP BY c.CUSTOMER_ID, c.CATEGORY_CODE, c.`LEVEL`, p.AGENCY_ID, p.PID, P.PIDS
         UNION ALL
         SELECT
@@ -109,7 +133,12 @@
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
             P.PIDS,
-            COUNT(distinct p.ID) AS projectTotal
+            <if test='projectType == "all" '>
+                COUNT(DISTINCT p.ID) AS projectTotal
+            </if>
+            <if test='projectType == "closed" '>
+                COUNT(DISTINCT p.ID) AS closedProjectTotal
+            </if>
         FROM fact_origin_project_main_daily p
         LEFT JOIN fact_origin_project_category_daily c ON ( c.PROJECT_Id = p.id AND p.del_flag='0' AND p.GRID_ID = '')
         WHERE c.DEL_FLAG = '0'
@@ -120,6 +149,9 @@
               </foreach>
           )
          AND p.GRID_ID = ''
+         <if test='projectType == "closed" '>
+            AND p.PROJECT_STATUS = 'closed'
+         </if>
         GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, #{subCount}), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml

@@ -20,6 +20,7 @@
             sg.CUSTOMER_ID AS categoryOriginCustomerId,
             sg.CATEGORY_CODE,
             SUM(sg.PROJECT_TOTAL) AS projectTotal,
+            SUM(sg.CLOSED_PROJECT_TOTAL) AS closedProjectTotal,
             sg.level,
             sg.DATE_ID,
             sca.`LEVEL` AS orgType

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -32,6 +32,7 @@
             sa.CATEGORY_ORIGIN_CUSTOMER_ID,
             sa.CATEGORY_CODE,
             SUM(sa.PROJECT_TOTAL) AS projectTotal,
+            SUM(sa.CLOSED_PROJECT_TOTAL) AS closedProjectTotal,
             sa.level,
             sa.DATE_ID,
             sca.`LEVEL` AS orgType
@@ -182,4 +183,36 @@
         GROUP BY categoryCode,od.ORG_ID
     </select>
 
+    <!-- 查询分类的结案项目数 -->
+    <select id="selectClosedProjectTotal" resultType="com.epmet.dto.project.result.ClosedProjectTotalResultDTO">
+        <foreach collection="customerIds" item="customerId" separator=" UNION ALL ">
+            SELECT
+            (SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0') AS orgId,
+            <if test="status == true">
+                cd.EPMET_CATEGORY_CODE AS categoryCode,
+            </if>
+            <if test="status == false">
+                pd.CATEGORY_CODE AS categoryCode,
+            </if>
+            count(pd.project_id) AS closedProjectTotal
+            FROM screen_project_data pd
+            LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = pd.CATEGORY_CODE AND cd.CUSTOMER_ID = #{customerId})
+            LEFT JOIN screen_customer_grid scg ON scg.GRID_ID = pd.ORG_ID
+            WHERE 1=1
+            AND pd.DEL_FLAG = '0'
+            AND pd.CUSTOMER_ID = #{customerId}
+            <if test="status == true">
+                AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+            </if>
+            <if test="status == false">
+                AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
+            </if>
+            AND cd.EPMET_CATEGORY_CODE != ''
+            AND pd.PROJECT_STATUS_CODE = 'closed'
+            AND pd.ALL_PARENT_IDS LIKE CONCAT('%',(SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0'),'%')
+            AND DATE_FORMAT(pd.project_create_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
+            GROUP BY categoryCode
+        </foreach>
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java

@@ -41,9 +41,12 @@ public class AgencyResultDTO implements Serializable {
      * 机关组织名称
      */
     private String agencyName = "";
+
+    private String pid;
+    private String level;
     /**
      * 所有上级组织机构ID(以英文:隔开)
      */
     @JsonIgnore
     private String pids = "";
-}
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java

@@ -24,6 +24,8 @@ public class AgencyTreeResultDTO implements Serializable {
     private String agencyName;
 
     private String pid;
+
+    private String level;
     /**
      * 下级机关组织
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -325,7 +325,7 @@ public class CustomerAgencyController {
     }
 
     /**
-     * @Description 获取客户下组织树
+     * @Description 获取客户下组织树不含网格和部门
      * @Param tokenDTO
      * @Return {@link Result<  AgencyTreeResultDTO >}
      * @Author zhaoqifeng
@@ -339,6 +339,18 @@ public class CustomerAgencyController {
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }
 
+    /**
+     * @Description 获取当前登陆人的 所属组织及下级组织/网格（含直属网格）树
+     * @Param tokenDTO
+     * @Return {@link Result<  AgencyTreeResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 15:20
+     */
+    @PostMapping("agencygridtree")
+    public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
+    }
+
     /**
      * @description 通过staffId查询跟组织列表
      *

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

@@ -273,4 +273,4 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2021/10/25 2:30 下午
      */
     List<MapSonOrgResultDTO> selectSonOrg(@Param("pid")String pid,@Param("type")String type);
-}
+}

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

@@ -19,7 +19,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
@@ -256,5 +255,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      */
     AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO);
 
+    /**
+     * desc:获取用户所属组织的组织及网格树
+     * @param staffId
+     * @return
+     */
+    AgencyTreeResultDTO getOrgTreeData(String staffId);
+
     List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId);
-}
+}

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

@@ -16,7 +16,6 @@
  */
 
 package com.epmet.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -1107,6 +1106,63 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return agency;
     }
 
+    @Override
+    public AgencyTreeResultDTO getOrgTreeData(String staffId) {
+        AgencyTreeResultDTO result = new AgencyTreeResultDTO();
+        //1.查询工作人员所属组织信息
+        AgencyResultDTO rootAgency = baseDao.selectAgencyByStaffId(staffId);
+        if (null == rootAgency) {
+            logger.error(String.format("查询工作人员所属组织信息失败，staffId->%s", staffId));
+            throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION);
+        }
+        result.setPid(rootAgency.getPid());
+        result.setAgencyName(rootAgency.getAgencyName());
+        result.setAgencyId(rootAgency.getAgencyId());
+        result.setLevel(rootAgency.getLevel());
+        ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
+        convert2AgencyTreeResult(result,res.getSubAgencyList(),res.getGridList());
+        return result;
+    }
+    /**
+     * 递归查询子节点
+     * @param root  根节点
+     * @param all   所有节点
+     * @return 根节点信息
+     */
+    private void convert2AgencyTreeResult(AgencyTreeResultDTO root, List<ExtStaffPermissionResultDTO> agencyList, List<ExtGridResultDTO> gridList) {
+        try {
+            for (ExtStaffPermissionResultDTO agency : agencyList) {
+                AgencyTreeResultDTO resultDTO = new AgencyTreeResultDTO();
+                resultDTO.setAgencyId(agency.getAgencyId());
+                resultDTO.setAgencyName(agency.getAgencyName());
+                resultDTO.setPid(root.getAgencyId());
+                resultDTO.setLevel(agency.getLevel());
+
+                if (root.getSubAgencyList() == null) {
+                    root.setSubAgencyList(new ArrayList<>());
+                }
+                root.getSubAgencyList().add(resultDTO);
+                if (CollectionUtils.isNotEmpty(agency.getSubAgencyList()) || CollectionUtils.isNotEmpty(agency.getGridList())) {
+                    convert2AgencyTreeResult(resultDTO, agency.getSubAgencyList(), agency.getGridList());
+                }
+            }
+            for (ExtGridResultDTO o : gridList) {
+                AgencyTreeResultDTO grid = new AgencyTreeResultDTO();
+                grid.setAgencyId(o.getGridId());
+                grid.setAgencyName(o.getGridName());
+                grid.setPid(root.getAgencyId());
+                grid.setLevel("grid");
+                grid.setSubAgencyList(null);
+                if (root.getSubAgencyList() == null) {
+                    root.setSubAgencyList(new ArrayList<>());
+                }
+                root.getSubAgencyList().add(grid);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * @Description 组织树最后一级没有数据的话设null
      * @Param agencyList

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

@@ -342,7 +342,9 @@
         SELECT
             ca.id AS "agencyId",
             ca.organization_name AS "agencyName",
-	        ca.pids AS "pids"
+	        ca.pids AS "pids",
+	        ca.PID AS  pid,
+	        ca.LEVEL
         FROM
             customer_agency ca
         INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id
@@ -545,6 +547,7 @@
         <result column="agencyId" property="agencyId"/>
         <result column="agencyName" property="agencyName"/>
         <result column="pid" property="pid"/>
+        <result column="level" property="level"/>
     </resultMap>
     <resultMap id="NodeTreeResult" type="com.epmet.dto.result.AgencyTreeResultDTO"
                extends="BaseResultMap">
@@ -557,7 +560,8 @@
         select
             ID AS agencyId,
             ORGANIZATION_NAME AS agencyName,
-            PID
+            PID,
+            LEVEL
         from customer_agency
         where
         DEL_FLAG = 0
@@ -568,7 +572,8 @@
         select
             ID AS agencyId,
             ORGANIZATION_NAME AS agencyName,
-            PID
+            PID,
+            LEVEL
         from
             customer_agency
         where
@@ -633,4 +638,4 @@
             order by created_time desc
     </select>
 
-</mapper>
+</mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java

@@ -44,7 +44,7 @@ public class BaseGridInfoController {
 
     /**
      * @Author sun
-     * @Description 组织基础信息中介库同步
+     * @Description 组织基础信息中间库同步
      **/
     @PostMapping("agencybaseinfo")
     public Result getAgencyBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) {
@@ -55,7 +55,7 @@ public class BaseGridInfoController {
 
     /**
      * @Author sun
-     * @Description 网格基础信息中介库同步
+     * @Description 网格基础信息中间库同步
      **/
     @PostMapping("gridbaseinfo")
     public Result getGridBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java

@@ -144,7 +144,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
             ExList.add(entity);
         });
         if (null != formDTO.getType() && "all".equals(formDTO.getType())) {
-            exDeptDao.updateBatchGrid(ExList);
+            exDeptDao.updateBatch(ExList);
+            //exDeptDao.updateBatchGrid(ExList);
         } else {
             exDeptDao.insertBatch(ExList);
         }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml

@@ -21,7 +21,8 @@
             <trim prefix="dept_id_qx =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.deptIdQx'>
-                        when grid_code = #{item.gridCode} then #{item.deptIdQx}
+                       <!--  when grid_code = #{item.gridCode} then #{item.deptIdQx} -->
+                        when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx}
                     </if>
                 </foreach>
             </trim>
@@ -29,7 +30,8 @@
             <trim prefix="dept_name_qx =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.deptNameQx'>
-                        when grid_code = #{item.gridCode} then #{item.deptNameQx}
+                        when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx}
+                       <!--  when grid_code = #{item.gridCode} then #{item.deptNameQx} -->
                     </if>
                 </foreach>
             </trim>
@@ -38,7 +40,8 @@
         WHERE
         1=1
         <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
-            grid_code = #{item.gridCode}
+            <!-- grid_code = #{item.gridCode} -->
+            dept_name_qx = #{item.deptNameQx}
         </foreach>
     </update>
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java

@@ -78,4 +78,10 @@ public class PersonDataResultDTO implements Serializable {
      */
     @JsonIgnore
     private String isVolunteer;
+
+    @JsonIgnore
+    private String customerId;
+
+    @JsonIgnore
+    private String gridId;
 }

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

@@ -31,7 +31,9 @@ import com.epmet.commons.tools.enums.HouseTypeEnum;
 import com.epmet.commons.tools.enums.RelationshipEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -496,12 +498,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         // 志愿者处理
         if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)){
-            List<String> volunteers = baseDao.selectVolunteerByUserId(formDTO.getUserId());
+            List<String> volunteerList = baseDao.selectVolunteerByUserId(formDTO.getUserId());
-            volunteers.forEach(v -> {
+            if (!CollectionUtils.isEmpty(volunteerList)){
-
+                List<String> volunteers = new ArrayList<>();
-            });
+                List<String> finalVolunteers = volunteers;
+                volunteerList.forEach(v -> {
+                    List<String> collect = Arrays.stream(v.split(",")).collect(Collectors.toList());
+                    finalVolunteers.addAll(collect);
+                });
+                volunteers = volunteers.stream().distinct().collect(Collectors.toList());
+                // 去customize 查询志愿者类别
+                Result<List<String>> volunteerResult = operCustomizeOpenFeignClient.volunteerLabelByValues(volunteers, personData.getCustomerId());
+                if (!volunteerResult.success()){
+                    throw new RenException("查询志愿者类别失败...");
+                }
+                personData.setVolunteerCategory(volunteerResult.getData());
+            }
         }
-        // TODO
+        // 网格名
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(personData.getGridId());
+        if (null != gridInfo){
+            personData.setGridName(gridInfo.getGridNamePath());
+        }
+        /**
+         * 人员类别
+         * 先查询customize配置的
+         * 再根据配置去查询字段
+         */
         return personData;
     }
 

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

@@ -153,6 +153,10 @@
     <resultMap id="selectPersonData" type="com.epmet.dto.result.PersonDataResultDTO">
         <result column="GZDW" property="workUnit"/>
         <result column="ID_CARD" property="idCard"/>
+        <result column="name" property="name"/>
+        <result column="isVolunteer" property="isVolunteer"/>
+        <result column="CUSTOMER_ID" property="customerId"/>
+        <result column="GRID_ID" property="gridId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
             <result column="YSR" property="monthlyIncome"/>
             <result column="TXJE" property="retirementAmount"/>
@@ -160,11 +164,14 @@
     </resultMap>
     <select id="personData" resultMap="selectPersonData">
         SELECT
-            GZDW AS workUnit,
+            GZDW,
             name,
             YSR,
             TXJE,
-            ID_CARD
+            ID_CARD,
+            IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
+            CUSTOMER_ID,
+            GRID_ID
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND ID = #{userId}