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

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 工作端小程序-数据上面的  当前组织调用此接口
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 15:26
+ */
+@Data
+public class AgencyDetailMulticFormDTO implements Serializable {
+    private static final long serialVersionUID = 6603177626712295270L;
+    /**
+     * 内部错误分组
+     * */
+    public interface AddUserInternalGroup{}
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空" , groups = {AddUserInternalGroup.class})
+    private String agencyId;
+
+
+    /**
+     * 当前登录用户所属的客户id
+     */
+    private String customerId;
+
+}

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

@@ -0,0 +1,57 @@
+package com.epmet.dto.form.project;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 群众不满列表查询入参DTO，从指标库取值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 10:55
+ */
+@Data
+public class MassesDiscontentFormV2DTO implements Serializable {
+    public interface MassesDiscontentFormV2 {
+    }
+
+    /**
+     * 时间区间,三个月：threeMonth；半年：sixMonth；一年：twelveMonth
+     * 一个月按照30天，三个月90天，半年180天，一年365天
+     */
+    @NotBlank(message = "timeSection不能为空,取值：三个月:threeMonth;半年:sixMonth;一年:twelveMonth", groups = MassesDiscontentFormV2.class)
+    private String timeSection;
+
+    /**
+     * asc:分数由低到高
+     * desc:分数由高到低
+     */
+    @NotBlank(message = "sortType不能为空,取值:asc:分数由低到高;desc:分数由高到低", groups = MassesDiscontentFormV2.class)
+    private String sortType;
+
+    /**
+     * 组织ID
+     */
+    @NotBlank(message = "agencyId不能为空", groups = MassesDiscontentFormV2.class)
+    private String agencyId;
+
+    @NotNull(message = "pageNo不能为空", groups = MassesDiscontentFormV2.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空", groups = MassesDiscontentFormV2.class)
+    private Integer pageSize;
+
+    /**
+     * 当前agency对应的区域编码，由前端传入，前端从/data/report/screen/agency/agencydetail这取值
+     */
+    private String areaCode;
+
+
+
+
+    //以下属性无需前端传入
+    private String startDate;
+    private String endDate;
+}

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

@@ -0,0 +1,97 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 15:31
+ */
+@Data
+public class AgencyDetailMulticResultDTO implements Serializable {
+    /**
+     * 机关组织Id
+     */
+    private String agencyId = "";
+
+    /**
+     * 组织名称
+     */
+    private String agencyName = "";
+
+    /**
+     * 机关级别（社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level = "";
+
+    /**
+     * 地区编码
+     */
+    private String areaCode = "";
+
+    /**
+     * 【省份】名称
+     */
+    private String province = "";
+
+    /**
+     * 【城市】名称
+     */
+    private String city = "";
+
+    /**
+     * 【区县】名称
+     */
+    private String district = "";
+
+    /**
+     * 本机关的所有上级机关
+     */
+    private List<ParentListResultDTO> parentList;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参
+     */
+    private String areaCodeSwitch;
+
+    /**
+     * 组织区划的名称
+     */
+    private String areaName;
+
+    /**
+     * 当前组织对应客户根组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String rootlevel;
+
+
+    //以下参数是06.24新增
+    private String parentAreaCode;
+    /**
+     * 是否有字客户
+     */
+    private Boolean haveSubCustomer;
+
+    /**
+     * 子客户列表
+     */
+    private List<String> subCustomerIds;
+}

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

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-获取组织机构信息接口-本机关的所有上级机关信息
+ *
+ * @author sun
+ */
+@Data
+public class ParentListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String id = "";
+    /**
+     * 机关组织名称
+     */
+    private String name = "";
+
+
+}

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

@@ -46,4 +46,14 @@ public class ScreenCustomerAgencyDTO implements Serializable {
      * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
      */
     private String parentAreaCode;
+
+    /**
+     * 父级id ,顶级，此列为0
+     */
+    private String pid;
+
+    /**
+     * 所有上级ID，用逗号（英文）分开
+     */
+    private String pids;
 }

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

@@ -0,0 +1,69 @@
+package com.epmet.dto.result.project;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 群众不满列表查询返参DTO，从指标库取值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 11:02
+ */
+@Data
+public class MassesDiscontentResultV2DTO implements Serializable {
+    private static final long serialVersionUID = 403953150174574960L;
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 话题所在网格
+     */
+    private String gridName;
+
+    /**
+     * 话题图片
+     */
+    private List<String> photos;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 项目分类标签
+     */
+    private String projectCategory;
+
+    /**
+     * 项目评价分数
+     * 直接取整数位展示
+     */
+    private BigDecimal score;
+
+    @JsonIgnore
+    private String customerId;
+    @JsonIgnore
+    private String parentAgencyId;
+    @JsonIgnore
+    private String areaCode;
+
+    public MassesDiscontentResultV2DTO() {
+        this.gridName = "";
+        this.photos = new ArrayList<>();
+        this.topicContent = "";
+        this.projectCategory = "";
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java

@@ -22,4 +22,11 @@ public interface ProjectConstant {
 
     String PROCESS_FAILURE = "查询项目进展失败......";
 
+    /**
+     * 三个月，六个月，12个月
+     */
+    String THREE_MONTH = "threeMonth";
+    String SIX_MONTH = "sixMonth";
+    String TWELVE_MONTH = "twelveMonth";
+    String YESTERDAY = "yesterday";
 }

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

@@ -41,10 +41,14 @@ public class DifficultyRankFormDTO implements Serializable {
      */
     private String orgType;
 
+    /**
+     * 当前agency对应的区域编码，由前端传入，前端从/data/report/screen/agency/agencydetail这取值
+     */
+    private String areaCode;
+
     //以下属性无需前端赋值
     /**
      * 当前登录用户所属客户id
      */
     private String customerId;
-    private String agencyAreaCode;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java

@@ -11,6 +11,8 @@ import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantity
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
+import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
@@ -169,4 +171,18 @@ public class ProjectController {
     public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@RequestHeader("CustomerId") String customerId) {
         return new Result<List<ProjectCategoryDictResultDTO>>().ok(projectService.getCategoryDict(customerId));
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MassesDiscontentResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 群众不满列表，改为从指标库的screen_project_data取值
+     * sql里面写死<75分的展示
+     * @Date 2021/6/24 11:13
+     **/
+    @PostMapping("massesdiscontent-multic")
+    public Result<List<MassesDiscontentResultV2DTO>> queryMassesDiscontentMultic(@RequestBody MassesDiscontentFormV2DTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, MassesDiscontentFormV2DTO.MassesDiscontentFormV2.class);
+        return new Result<List<MassesDiscontentResultV2DTO>>().ok(projectService.queryMassesDiscontentMultic(formDTO));
+    }
 }

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

@@ -1,10 +1,14 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AgencyDetailMulticFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
+import com.epmet.dto.result.AgencyDetailMulticResultDTO;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
@@ -110,4 +114,19 @@ public class AgencyController {
         }
         return new Result<>();
     }
+
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param
+     * @author yinzuomei
+     * @description 工作端小程序-数据上面的  当前组织调用此接口
+     * @Date 2021/6/24 15:29
+     **/
+    @PostMapping("agencydetail-multic")
+    public Result<AgencyDetailMulticResultDTO> queryAgencyDetailMultiC(@LoginUser TokenDto tokenDto, @RequestBody AgencyDetailMulticFormDTO formDTO){
+        // formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, AgencyDetailMulticFormDTO.AddUserInternalGroup.class);
+        return new Result<AgencyDetailMulticResultDTO>().ok(agencyService.queryAgencyDetailMultiC(formDTO));
+    }
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.ScreenCustomerGridDTO;
+import com.epmet.dto.result.ParentListResultDTO;
 import com.epmet.dto.result.ScreenCustomerAgencyDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.dto.result.plugins.DeptNodeDTO;
@@ -189,4 +190,6 @@ public interface ScreenCustomerAgencyDao {
      * @return java.util.List<com.epmet.dto.result.ScreenCustomerAgencyDTO>
      */
     List<ScreenCustomerGridDTO> selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId);
+
+    List<ParentListResultDTO> selectPAgencyById(@Param("listStr")List<String> pidList);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/project/ProjectDao.java

@@ -1,5 +1,6 @@
 package com.epmet.datareport.dao.project;
 
+import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.result.*;
@@ -82,4 +83,21 @@ public interface ProjectDao {
      * @date 2020.10.20 10:13
      **/
     List<String> getDifficultyImgList(String eventId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.project.MassesDiscontentResultV2DTO>
+     * @param agencyId
+     * @param areaCode
+     * @param startDate
+     * @param endDate
+     * @param sortType
+     * @author yinzuomei
+     * @description 群众不满列表，改为从指标库的screen_project_data取值 sql里面写死<75分的展示
+     * @Date 2021/6/24 13:16
+     **/
+    List<MassesDiscontentResultV2DTO> selectMassesDiscontentMultic(@Param("agencyId") String agencyId,
+                                                                   @Param("areaCode") String areaCode,
+                                                                   @Param("startDate") String startDate,
+                                                                   @Param("endDate") String endDate,
+                                                                   @Param("sortType") String sortType);
 }

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

@@ -3,10 +3,12 @@ package com.epmet.datareport.service.evaluationindex.screen;
 import com.epmet.dto.AgencyInfoDTO;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AgencyDetailMulticFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
+import com.epmet.dto.result.AgencyDetailMulticResultDTO;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
-import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
 import com.epmet.dto.result.ScreenCustomerAgencyDTO;
+import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
@@ -92,4 +94,12 @@ public interface AgencyService {
      * @return java.util.List<com.epmet.dto.result.ScreenCustomerAgencyDTO>
      */
     List<ScreenCustomerGridDTO> queryGridList(String areaCode, String parentAgencyId);
+
+    /**
+     * 工作端小程序-数据上面的  当前组织调用此接口
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.AgencyDetailMulticResultDTO
+     */
+    AgencyDetailMulticResultDTO queryAgencyDetailMultiC(AgencyDetailMulticFormDTO formDTO);
 }

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

@@ -3,8 +3,10 @@ package com.epmet.datareport.service.evaluationindex.screen.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.AgencyTreeUtils;
+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.ScreenCustomerAgencyDao;
@@ -13,10 +15,10 @@ import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.dto.AgencyInfoDTO;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AgencyDetailMulticFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.result.AreaCodeDictResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
-import com.epmet.dto.result.ScreenCustomerAgencyDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.evaluationindex.screen.constant.ScreenConstant;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;
@@ -26,6 +28,8 @@ import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCrmOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.exceptions.TooManyResultsException;
@@ -34,6 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -53,6 +58,10 @@ public class AgencyServiceImpl implements AgencyService {
     private ScreenCustomerGridDao screenCustomerGridDao;
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
     /**
      * @Description  1、组织机构树
@@ -347,4 +356,74 @@ public class AgencyServiceImpl implements AgencyService {
     public List<ScreenCustomerGridDTO> queryGridList(String areaCode, String parentAgencyId) {
         return screenCustomerAgencyDao.selectGridDTOList(areaCode,parentAgencyId);
     }
+
+    /**
+     * 工作端小程序-数据上面的  当前组织调用此接口
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.AgencyDetailMulticResultDTO
+     */
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @Override
+    public AgencyDetailMulticResultDTO queryAgencyDetailMultiC(AgencyDetailMulticFormDTO formDTO) {
+        AgencyDetailMulticResultDTO agencysResultDTO = new AgencyDetailMulticResultDTO();
+        List<ParentListResultDTO> parentList = new ArrayList<>();
+        agencysResultDTO.setParentList(parentList);
+
+        //1:查询本机关详细信息
+        ScreenCustomerAgencyDTO customerAgencyDTO = screenCustomerAgencyDao.selectByAgencyId(formDTO.getAgencyId());
+        if (null == customerAgencyDTO) {
+            return agencysResultDTO;
+        }
+        agencysResultDTO = ConvertUtils.sourceToTarget(customerAgencyDTO, AgencyDetailMulticResultDTO.class);
+
+        agencysResultDTO.setAreaCodeSwitch(govOrgOpenFeignClient.getAreaCodeSwitch(customerAgencyDTO.getCustomerId()).getData());
+        //如果当前客户不存在子客户则areaCode置为空
+        Result<List<String>> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
+        if (crmRes.success() &&CollectionUtils.isEmpty(crmRes.getData())) {
+            agencysResultDTO.setAreaCode(StrConstant.EPMETY_STR);
+            agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);
+            agencysResultDTO.setParentAreaCode(StrConstant.EPMETY_STR);
+            agencysResultDTO.setHaveSubCustomer(false);
+            agencysResultDTO.setSubCustomerIds(new ArrayList<>());
+        }else{
+            agencysResultDTO.setAreaName(agencysResultDTO.getAgencyName());
+            agencysResultDTO.setHaveSubCustomer(true);
+            agencysResultDTO.setSubCustomerIds(crmRes.getData());
+        }
+
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  start
+        if (null != customerAgencyDTO) {
+            if ("0".equals(customerAgencyDTO.getPid())||StringUtils.isBlank(customerAgencyDTO.getPid())) {
+                agencysResultDTO.setRootlevel(customerAgencyDTO.getLevel());
+            } else {
+                String rootAgencyId ="";
+                if(customerAgencyDTO.getPids().contains(StrConstant.COLON)){
+                    rootAgencyId= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON)).get(NumConstant.ZERO);
+                }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){
+                    rootAgencyId= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA)).get(NumConstant.ZERO);
+                }
+                ScreenCustomerAgencyDTO rootEntity = screenCustomerAgencyDao.selectByAgencyId(rootAgencyId);
+                if (null != rootEntity) {
+                    agencysResultDTO.setRootlevel(rootEntity.getLevel());
+                }
+            }
+        }
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  end
+
+        //2:查询本机关的所有上级机关，按自上而下层级顺序
+        if (StringUtils.isBlank(customerAgencyDTO.getPids())) {
+            agencysResultDTO.setParentList(parentList);
+            return agencysResultDTO;
+        }
+        List<String> pidList =new ArrayList<>();
+        if(customerAgencyDTO.getPids().contains(StrConstant.COLON)){
+            pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON));
+        }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){
+            pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA));
+        }
+        agencysResultDTO.setParentList(screenCustomerAgencyDao.selectPAgencyById(pidList));
+
+        return agencysResultDTO;
+    }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java

@@ -1,6 +1,8 @@
 package com.epmet.datareport.service.project;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
+import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
@@ -99,4 +101,12 @@ public interface ProjectService {
      * @return com.epmet.project.dto.result.ProjectNextAgencyResultDTO
      */
     List<ProjectNextAgencyResultDTO> myNextAgencyMultic(String staffId,String currentCustomerId);
+
+    /**
+     * 群众不满列表，改为从指标库的screen_project_data取值，sql里面写死<75分的展示
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.project.MassesDiscontentResultV2DTO
+     */
+    List<MassesDiscontentResultV2DTO> queryMassesDiscontentMultic(MassesDiscontentFormV2DTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao;
 import com.epmet.datareport.dao.project.ProjectDao;
 import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.datareport.service.project.ProjectService;
@@ -19,7 +20,9 @@ import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.SubAgencyFormDTO;
+import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO;
 import com.epmet.feign.*;
 import com.epmet.project.constant.ProjectConstant;
@@ -72,6 +75,8 @@ public class ProjectServiceImpl implements ProjectService {
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
     @Autowired
     private AgencyService screenAgencyService;
+    @Autowired
+    private ScreenProjectDataDao screenProjectDataDao;
 
     /**
      * @Author sun
@@ -372,7 +377,9 @@ public class ProjectServiceImpl implements ProjectService {
         //多客户测试写死值，别忘了注释掉呀
         // formDTO.setCustomerId("613cc61a6b8ce4c70d21bd413dac72cc");
         // formDTO.setAgencyId("30705f91f1295ae77d372b868596a5e7");
-        Result<List<String>> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
+
+        //06.24决定areaCode让前端传入， 前端从前端从/data/report/screen/agency/agencydetail这取值取值
+        /*Result<List<String>> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
         if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) {
             log.warn("❤当前客户存在子客户❤");
             //2、查询组织信息
@@ -380,8 +387,8 @@ public class ProjectServiceImpl implements ProjectService {
             if (!agencyResult.success() || null == agencyResult.getData()) {
                 throw new RenException(String.format("查询组织信息异常,agencyId:%s", formDTO.getAgencyId()));
             }
-            formDTO.setAgencyAreaCode(agencyResult.getData().getAreaCode());
+            formDTO.setAreaCode(agencyResult.getData().getAreaCode());
-        }
+        }*/
         // 3、升级原来的列表查询接口
         PageHelper.startPage(null == formDTO.getPageNo() ? NumConstant.ONE : formDTO.getPageNo(), formDTO.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRankV2(formDTO);
@@ -501,4 +508,55 @@ public class ProjectServiceImpl implements ProjectService {
         }
         return resultList;
     }
+
+    /**
+     * 群众不满列表，改为从指标库的screen_project_data取值，sql里面写死<75分的展示
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.project.MassesDiscontentResultV2DTO
+     */
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @Override
+    public List<MassesDiscontentResultV2DTO> queryMassesDiscontentMultic(MassesDiscontentFormV2DTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        formDTO.setEndDate(getDateId(ProjectConstant.YESTERDAY));
+        formDTO.setStartDate(getDateId(formDTO.getTimeSection()));
+        log.info(JSON.toJSONString(formDTO,true));
+        //已结案、并且来源于议题、在当前时间范围内的、
+        List<MassesDiscontentResultV2DTO> list = projectDao.selectMassesDiscontentMultic(formDTO.getAgencyId(),
+                formDTO.getAreaCode(),
+                formDTO.getStartDate(),
+                formDTO.getEndDate(),
+                formDTO.getSortType());
+        list.forEach(project -> {
+            project.setPhotos(screenProjectDataDao.selectProjectImgs(project.getProjectId(), project.getCustomerId()));
+        });
+        return list;
+    }
+
+    /**
+     * @Description  处理时间
+     * @Param dateType
+     * @author zxc
+     * @date 2021/5/18 2:28 下午
+     */
+    public String getDateId(String dateType){
+        String result = DateUtils.getBeforeNDay(NumConstant.ONE);
+        switch (dateType) {
+            case ProjectConstant.THREE_MONTH:
+                result = DateUtils.getBeforeNDay(NumConstant.NINETY);
+                break;
+            case ProjectConstant.SIX_MONTH:
+                result = DateUtils.getBeforeNDay(NumConstant.ONE_HUNDRED_AND_EIGHTY);
+                break;
+            case ProjectConstant.TWELVE_MONTH:
+                result = DateUtils.getBeforeNDay(NumConstant.THREE_HUNDRED_AND_SIXTY_FIVE);
+                break;
+            case ProjectConstant.YESTERDAY:
+                result = DateUtils.getBeforeNDay(NumConstant.ONE);
+                break;
+            default:
+        }
+        return result;
+    }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -296,10 +296,10 @@
         ) diff
         WHERE
             diff.DEL_FLAG = '0'
-        <if test="agencyAreaCode != null and agencyAreaCode != ''">
+        <if test="areaCode != null and areaCode != ''">
-            and diff.AREA_CODE like concat(#{agencyAreaCode},'%')
+            and diff.AREA_CODE like concat(#{areaCode},'%')
         </if>
-        <if test="agencyAreaCode == null || agencyAreaCode == ''">
+        <if test="areaCode == null || areaCode == ''">
             <choose>
                 <when test="orgType != null and orgType == 'grid'">
                     AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR}
@@ -326,4 +326,45 @@
 		WHERE EVENT_ID = #{eventId}
 		ORDER BY SORT
     </select>
+
+    <!--    群众不满列表，改为从指标库的screen_project_data取值 sql里面写死<75分的展示 -->
+    <select id="selectMassesDiscontentMultic" parameterType="map" resultType="com.epmet.dto.result.project.MassesDiscontentResultV2DTO">
+        SELECT
+            spd.PROJECT_ID as projectId,
+            '' AS issueId,
+            IFNULL( spd.ORG_NAME, '' ) AS gridName,
+            IFNULL( spd.PROJECT_CONTENT, '' ) AS topicContent,
+            IFNULL( spd.ALL_CATEGORY_NAME, '' ) AS projectCategory,
+            floor( spd.SATISFACTION_SCORE) AS score,
+            spd.CUSTOMER_ID as customerId,
+            spd.PARENT_ID as parentAgencyId,
+            sca.AREA_CODE as areaCode
+        FROM
+            SCREEN_PROJECT_DATA spd
+        left join screen_customer_agency sca
+        on(spd.PARENT_ID =sca.AGENCY_ID )
+        WHERE
+        spd.DEL_FLAG = '0'
+        and  sca.DEL_FLAG='0'
+        AND spd.CLOSE_CASE_TIME IS NOT NULL
+        and spd.SATISFACTION_SCORE is not null
+        AND DATE_FORMAT( spd.CLOSE_CASE_TIME, '%Y%m%d' ) &gt;= #{startDate}
+        AND DATE_FORMAT( spd.CLOSE_CASE_TIME, '%Y%m%d' ) &lt;= #{endDate}
+        AND spd.SATISFACTION_SCORE &lt; 75
+        <choose >
+            <when test="areaCode != null and areaCode.trim() != ''">
+                and sca.area_code is not null
+                and sca.area_code like concat(#{areaCode},'%')
+            </when>
+            <otherwise>
+                and spd.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+            </otherwise>
+        </choose>
+        <if test="sortType == 'desc' ">
+            ORDER BY spd.SATISFACTION_SCORE DESC,spd.CLOSE_CASE_TIME desc
+        </if>
+        <if test="sortType == 'asc' ">
+            ORDER BY spd.SATISFACTION_SCORE ASC,spd.CLOSE_CASE_TIME desc
+        </if>
+    </select>
 </mapper>

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

@@ -372,4 +372,23 @@
             AND scg.PARENT_AGENCY_ID = #{parentAgencyId}
         </if>
     </select>
+
+    <!-- 按照foreach中遍历的Id顺序排序(按组织机构自上而下排序) -->
+    <select id="selectPAgencyById" resultType="com.epmet.dto.result.ParentListResultDTO">
+        SELECT
+        sca.AGENCY_ID as id,
+        sca.AGENCY_NAME AS 'name'
+        from screen_customer_agency sca
+        WHERE del_flag = '0'
+        AND AGENCY_ID IN
+        <foreach item="id" collection="listStr" open="(" separator="," close=")" index="">
+            #{id}
+        </foreach>
+        ORDER BY field(
+        AGENCY_ID,
+        <foreach item="id" collection="listStr" separator=",">
+            #{id}
+        </foreach>
+        )
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -342,4 +342,14 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customerstaffgrid/gridstaff")
     Result<List<GridStaffResultDTO>> selectGridStaffByGridIds(@RequestBody List<String> gridIds);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @param customerId
+     * @author yinzuomei
+     * @description  根据customerId查询参数(area_code_switch)值open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参;没配置,返回closed
+     * @Date 2021/6/24 16:11
+     **/
+    @PostMapping(value = "getAreaCodeSwitch/{customerId}")
+    Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -197,4 +197,16 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<GridStaffResultDTO>> selectGridStaffByGridIds(List<String> gridIds) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridStaffByGridIds", gridIds);
     }
+
+    /**
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 根据customerId查询参数(area_code_switch)值open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参;没配置,返回closed
+     * @Date 2021/6/24 16:11
+     **/
+    @Override
+    public Result<String> getAreaCodeSwitch(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAreaCodeSwitch", customerId);
+    }
 }

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

@@ -17,7 +17,6 @@
 
 package com.epmet.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -34,13 +33,12 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
+import com.epmet.service.CustomerOrgParameterService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -58,6 +56,8 @@ public class CustomerAgencyController {
 
     @Autowired
     private CustomerAgencyService customerAgencyService;
+    @Autowired
+    private CustomerOrgParameterService customerOrgParameterService;
 
     @GetMapping("page")
     public Result<PageData<CustomerAgencyDTO>> page(@RequestParam Map<String, Object> params) {
@@ -297,4 +297,9 @@ public class CustomerAgencyController {
     Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
         return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
     }
+
+    @PostMapping("getAreaCodeSwitch/{customerId}")
+    public Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId){
+     return new Result<String>().ok(customerOrgParameterService.getAreaCodeSwitch(customerId));
+    }
 }