4、下级部门指数排行,3、月度指数分析-柱状图

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -37,6 +37,8 @@ public interface NumConstant {
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;
 
+    double ZERO_DOT_ZERO = 0.0;
+
 
     long ZERO_L = 0L;
     long ONE_L = 1L;

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

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 5:20 下午
+ */
+@Data
+public class MonthBarchartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4852721296827851714L;
+
+    public interface MonthBarchart{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {MonthBarchart.class})
+    private String agencyId;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 4:34 下午
+ */
+@Data
+public class ProjectDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6588246858516674808L;
+
+    public interface ProjectDetail{}
+
+    /**
+     * 项目ID
+     */
+    @NotBlank(message = "项目ID不能为空",groups = {ProjectDetail.class})
+    private String projectId;
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 9:54 上午
+ */
+@Data
+public class SubAgencyIndexRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2920561669035794486L;
+
+    public interface SubAgencyIndexRank{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {SubAgencyIndexRank.class})
+    private String agencyId;
+
+    /**
+     * 默认查询前几名
+     */
+    @NotNull(message = "默认查询名次不能为空",groups = {SubAgencyIndexRank.class})
+    private Integer topNum;
+
+    private String monthId;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 9:12 上午
+ */
+@Data
+public class MonthBarchartResult implements Serializable {
+
+    private static final long serialVersionUID = 3777652772902180088L;
+
+    private String monthId;
+
+    private Double serviceAbility;
+
+    private Double partyDevAbility;
+
+    private Double governAbility;
+
+    private Double indexTotal;
+}

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

@@ -0,0 +1,42 @@
+package com.epmet.screen.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 5:23 下午
+ */
+@Data
+public class MonthBarchartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 561457498288576566L;
+
+    /**
+     * 服务能力
+     */
+    private List<Double> serviceAbilityData;
+
+    /**
+     * 党建能力
+     */
+    private List<Double> partyDevAbilityData;
+
+    /**
+     * 治理能力
+     */
+    private List<Double> governAbilityData;
+
+    /**
+     * 横坐标月份集合
+     */
+    private List<String> xAxis;
+
+    /**
+     * 总指数集合
+     */
+    private List<Double> totalIndexData;
+}

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

@@ -0,0 +1,46 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 4:37 下午
+ */
+@Data
+public class ProjectDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2884179183725459493L;
+
+    /**
+     * 项目内容
+     */
+    private String projectContent = "";
+
+    /**
+     * 当前状态
+     */
+    private String status = "";
+
+    /**
+     * 最后一次处理的部门
+     */
+    private String latestHandleDept = "";
+
+    /**
+     * 最后一次处理的时间yyyy-MM-dd HH:mm
+     */
+    private String latestHandleTime = "";
+
+    /**
+     * 操作描述
+     */
+    private String operDesc = "";
+
+    /**
+     * 图片列表
+     */
+    private List<String> imgList;
+}

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

@@ -0,0 +1,40 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 9:58 上午
+ */
+@Data
+public class SubAgencyIndexRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2767000156092731932L;
+
+    /**
+     * 名称（组织或者网格名称，部门名称）
+     */
+    private String name = "";
+
+    /**
+     * 总指数
+     */
+    private Double totalIndex = 0.0;
+
+    /**
+     * 党建能力
+     */
+    private Double governAbility = 0.0;
+
+    /**
+     * 治理能力
+     */
+    private Double partyDevAbility = 0.0;
+
+    /**
+     * 服务能力
+     */
+    private Double serviceAbility = 0.0;
+}

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

@@ -1,12 +1,17 @@
 package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthBarchartFormDTO;
 import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
 import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
 import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 指数相关相关各指标查询
  *
@@ -53,5 +60,30 @@ public class IndexController {
         return new Result<MonthPieChartResultDTO>().ok(indexService.monthPieChart(monthPieChartFormDTO));
     }
 
+    /**
+     * @Description  3、月度指数分析-柱状图
+     * @param monthBarchartFormDTO
+     * @author zxc
+     * @date 2020/8/19 5:27 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("monthindexanalysis/barchart")
+    public Result<MonthBarchartResultDTO> monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam){
+        ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
+        return new Result<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO,externalAppRequestParam));
+    }
+
+    /**
+     * @Description  4、下级部门指数排行
+     * @param subAgencyIndexRankFormDTO
+     * @author zxc
+     * @date 2020/8/20 10:02 上午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("subagencyindexrank")
+    public Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRank(@RequestBody SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO){
+        ValidatorUtils.validateEntity(subAgencyIndexRankFormDTO, SubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
+        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.subAgencyIndexRank(subAgencyIndexRankFormDTO));
+    }
 
 }

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

@@ -1,5 +1,14 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.screen.ScreenProjectService;
+import com.epmet.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,7 +18,24 @@ import org.springframework.web.bind.annotation.RestController;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:16
  */
-@RestController("screeproject")
+@RestController
 @RequestMapping("/screen/project")
 public class ScreenProjectController {
+
+    @Autowired
+    private ScreenProjectService screenProjectService;
+
+    /**
+     * @Description  3、项目详情
+     * @param projectDetailFormDTO
+     * @author zxc
+     * @date 2020/8/19 4:36 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("deatil")
+    public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){
+        ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class);
+        return new Result<ProjectDetailResultDTO>().ok(screenProjectService.projectDetail(projectDetailFormDTO));
+    }
+
 }

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

@@ -17,6 +17,7 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.result.ProjectDetailResultDTO;
 import com.epmet.screen.dto.result.ProjectResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +41,12 @@ public interface ScreenEventDataDao{
      */
     List<ProjectResultDTO> selectEvent(@Param("parentId")String parentId);
 
+    /**
+     * @Description  3、项目详情
+     * @param projectId
+     * @author zxc
+     * @date 2020/8/19 4:36 下午
+     */
+    ProjectDetailResultDTO selectEventDetail(@Param("projectId")String projectId);
+
 }

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

@@ -18,6 +18,9 @@
 package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 中央区-事件数据图片数据
@@ -27,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ScreenEventImgDataDao {
+
+    /**
+     * @Description  查询事件imgUrl集合
+     * @param projectId
+     * @author zxc
+     * @date 2020/8/19 5:11 下午
+     */
+    List<String> selectEventImgList(@Param("projectId")String projectId);
 	
 }

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

@@ -17,10 +17,16 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.screen.dto.result.MonthBarchartResult;
+import com.epmet.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 指数-指数数据
  *
@@ -37,5 +43,22 @@ public interface ScreenIndexDataMonthlyDao{
      * @date 2020/8/19 3:43 下午
      */
     MonthPieChartResultDTO selectMonthPieChart(@Param("agencyId")String agencyId);
+
+    /**
+     * @Description  查询近一年的指数值【不包括本月】
+     * @param customerId
+     * @param agencyId
+     * @author zxc
+     * @date 2020/8/20 9:02 上午
+     */
+    List<MonthBarchartResult> selectMonthBarchart(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
+
+    /**
+     * @Description  4、下级部门指数排行
+     * @param subAgencyIndexRankFormDTO
+     * @author zxc
+     * @date 2020/8/20 10:04 上午
+     */
+    List<SubAgencyIndexRankResultDTO> selectSubAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 	
 }

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

@@ -1,10 +1,17 @@
 package com.epmet.datareport.service.screen;
 
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.screen.dto.form.MonthBarchartFormDTO;
 import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
 import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
 import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
 
+import java.util.List;
+
 /**
  * 指数相关相关各指标查询
  *
@@ -29,4 +36,20 @@ public interface IndexService {
      */
     MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO);
 
+    /**
+     * @Description  3、月度指数分析-柱状图
+     * @param monthBarchartFormDTO
+     * @author zxc
+     * @date 2020/8/19 5:27 下午
+     */
+    MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     * @Description  4、下级部门指数排行
+     * @param subAgencyIndexRankFormDTO
+     * @author zxc
+     * @date 2020/8/20 10:04 上午
+     */
+    List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
+
 }

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

@@ -1,5 +1,8 @@
 package com.epmet.datareport.service.screen;
 
+import com.epmet.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+
 /**
  * 项目
  *
@@ -7,4 +10,13 @@ package com.epmet.datareport.service.screen;
  * @date 2020/8/18 10:22
  */
 public interface ScreenProjectService {
+
+    /**
+     * @Description  3、项目详情
+     * @param projectDetailFormDTO
+     * @author zxc
+     * @date 2020/8/19 4:36 下午
+     */
+    ProjectDetailResultDTO projectDetail(ProjectDetailFormDTO projectDetailFormDTO);
+
 }

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

@@ -1,15 +1,25 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao;
 import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthBarchartFormDTO;
 import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
 import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import com.epmet.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 指数相关相关各指标查询
  *
@@ -23,6 +33,8 @@ public class IndexServiceImpl implements IndexService {
     private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
     @Autowired
     private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao;
+    @Autowired
+    private GrassrootsPartyDevServiceImpl grassrootsPartyDevServiceImpl;
 
     /**
      * @Description  1、年度平均指数
@@ -53,4 +65,68 @@ public class IndexServiceImpl implements IndexService {
         }
         return monthPieChartResultDTO;
     }
+
+    /**
+     * @Description  3、月度指数分析-柱状图
+     * @param monthBarchartFormDTO
+     * @author zxc
+     * @date 2020/8/19 5:27 下午
+     */
+    @Override
+    public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        MonthBarchartResultDTO result = new MonthBarchartResultDTO();
+        List<Double> serviceAbilityData = new ArrayList<>();
+        List<Double> partyDevAbilityData = new ArrayList<>();
+        List<Double> governAbilityData = new ArrayList<>();
+        List<Double> totalIndexData = new ArrayList<>();
+        // 1. x轴
+        Map<String, String> x = grassrootsPartyDevServiceImpl.getX();
+        result.setXAxis(x.values().stream().collect(Collectors.toList()));
+        // 2. 查询近一年的指数值【不包括本月】
+        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(customerId, monthBarchartFormDTO.getAgencyId());
+        if (monthBarchartResults.size() == NumConstant.ZERO){
+            for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
+                serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);
+                partyDevAbilityData.add(NumConstant.ZERO_DOT_ZERO);
+                governAbilityData.add(NumConstant.ZERO_DOT_ZERO);
+                totalIndexData.add(NumConstant.ZERO_DOT_ZERO);
+            }
+            result.setServiceAbilityData(serviceAbilityData);
+            result.setPartyDevAbilityData(partyDevAbilityData);
+            result.setGovernAbilityData(governAbilityData);
+            result.setTotalIndexData(totalIndexData);
+            return result;
+        }
+        List<MonthBarchartResult> collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList());
+        collect.forEach(month -> {
+            serviceAbilityData.add(null == month.getServiceAbility() ? NumConstant.ZERO_DOT_ZERO : month.getServiceAbility());
+            partyDevAbilityData.add(null == month.getPartyDevAbility() ? NumConstant.ZERO_DOT_ZERO : month.getPartyDevAbility());
+            governAbilityData.add(null == month.getGovernAbility() ? NumConstant.ZERO_DOT_ZERO : month.getGovernAbility());
+            totalIndexData.add(null == month.getIndexTotal() ? NumConstant.ZERO_DOT_ZERO : month.getIndexTotal());
+        });
+        result.setServiceAbilityData(serviceAbilityData);
+        result.setPartyDevAbilityData(partyDevAbilityData);
+        result.setGovernAbilityData(governAbilityData);
+        result.setTotalIndexData(totalIndexData);
+        return result;
+    }
+
+    /**
+     * @Description  4、下级部门指数排行
+     * @param subAgencyIndexRankFormDTO
+     * @author zxc
+     * @date 2020/8/20 10:04 上午
+     */
+    @Override
+    public List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) {
+        LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
+        String monthId = now.toString().substring(NumConstant.ZERO,NumConstant.FOUR).concat(now.toString().substring(NumConstant.FIVE,NumConstant.SEVEN));
+        subAgencyIndexRankFormDTO.setMonthId(monthId);
+        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRank(subAgencyIndexRankFormDTO);
+        if (subAgencyIndexRankResultDTOS.size() == NumConstant.ZERO){
+            return new ArrayList<>();
+        }
+        return subAgencyIndexRankResultDTOS;
+    }
 }

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

@@ -1,8 +1,15 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.datareport.dao.screen.ScreenEventDataDao;
+import com.epmet.datareport.dao.screen.ScreenEventImgDataDao;
 import com.epmet.datareport.service.screen.ScreenProjectService;
+import com.epmet.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 项目
  *
@@ -11,4 +18,26 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ScreenProjectServiceImpl implements ScreenProjectService {
+
+    @Autowired
+    private ScreenEventDataDao screenEventDataDao;
+    @Autowired
+    private ScreenEventImgDataDao screenEventImgDataDao;
+
+    /**
+     * @Description  3、项目详情
+     * @param projectDetailFormDTO
+     * @author zxc
+     * @date 2020/8/19 4:36 下午
+     */
+    @Override
+    public ProjectDetailResultDTO projectDetail(ProjectDetailFormDTO projectDetailFormDTO) {
+        ProjectDetailResultDTO projectDetailResultDTO = screenEventDataDao.selectEventDetail(projectDetailFormDTO.getProjectId());
+        if (null == projectDetailResultDTO){
+            return new ProjectDetailResultDTO();
+        }
+        List<String> imgList = screenEventImgDataDao.selectEventImgList(projectDetailFormDTO.getProjectId());
+        projectDetailResultDTO.setImgList(imgList);
+        return projectDetailResultDTO;
+    }
 }

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

@@ -18,4 +18,19 @@
             del_flag = '0'
             AND parent_id = #{parentId}
     </select>
+
+    <!-- 项目详情 -->
+    <select id="selectEventDetail" resultType="com.epmet.screen.dto.result.ProjectDetailResultDTO">
+        SELECT
+            event_content AS projectContent,
+            event_status_desc AS STATUS,
+            last_process_dept AS latestHandleDept,
+            last_process_date AS latestHandleTime,
+            latest_operate_desc AS operDesc
+        FROM
+            screen_event_data
+        WHERE
+            del_flag = '0'
+            AND event_id = #{projectId}
+    </select>
 </mapper>

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

@@ -3,6 +3,14 @@
 
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenEventImgDataDao">
 
-
-
+    <!-- 查询事件imgUrl集合 -->
+    <select id="selectEventImgList" resultType="java.lang.String">
+        SELECT
+            event_img_url AS eventImgUrl
+        FROM
+            screen_event_img_data
+        WHERE
+            del_flag = '0'
+            AND event_id = #{projectId}
+    </select>
 </mapper>

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

@@ -17,4 +17,40 @@
             AND org_id = #{agencyId}
             AND month_id = DATE_FORMAT(NOW(),'%Y%m')
     </select>
+
+    <!-- 查询近一年的指数值【不包括本月】 -->
+    <select id="selectMonthBarchart" resultType="com.epmet.screen.dto.result.MonthBarchartResult">
+        SELECT
+	        month_id AS monthId,
+            service_ablity AS serviceAbility,
+            party_dev_ablity AS partyDevAbility,
+            govern_ablity AS governAbility,
+            index_total AS indexTotal
+        FROM
+            screen_index_data_monthly
+        WHERE
+            del_flag = '0'
+            AND org_id = #{agencyId}
+            AND customer_id = #{customerId}
+            ORDER BY MONTH_ID DESC
+            LIMIT 12
+    </select>
+
+    <!-- 下级部门指数排行 -->
+    <select id="selectSubAgencyIndexRank" resultType="com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+            org_name AS NAME,
+            index_total AS totalIndex,
+            govern_ablity AS governAbility,
+            party_dev_ablity AS partyDevAbility,
+            service_ablity AS serviceAbility
+        FROM
+            screen_index_data_monthly
+        WHERE
+            del_flag = '0'
+            AND parent_id = #{agencyId}
+            AND month_id = #{monthId}
+        ORDER BY index_total DESC
+            LIMIT #{topNum}
+    </select>
 </mapper>