From 551813eaee1f3753c8de1820e15ac0032b59e349 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 17 Jun 2020 17:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B2=BB=E7=90=86=E6=8E=92=E8=A1=8C?=
=?UTF-8?q?=E3=80=91=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?=
=?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-06-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/form/ExportTemplateInfoFormDTO.java | 5 +
.../dto/epdc/result/ExportKpiResultDTO.java | 61 +++
.../epdc/controller/SysDeptController.java | 12 +-
.../com/elink/esua/epdc/dao/SysDeptDao.java | 6 +-
.../esua/epdc/service/SysDeptService.java | 6 +-
.../epdc/service/impl/SysDeptServiceImpl.java | 4 +-
.../src/main/resources/mapper/SysDeptDao.xml | 5 +-
.../epdc/commons/tools/utils/DateUtils.java | 38 ++
.../epdc/commons/tools/utils/ExcelUtils.java | 45 +++
.../esua/epdc/dto/KpiGridEntityDTO.java} | 22 +-
.../esua/epdc/dto/KpiMassEvaluationDTO.java | 127 ++++++
.../esua/epdc/dto/KpiMattersResponseDTO.java | 122 ++++++
.../esua/epdc/dto/KpiPublicOpinionDTO.java | 126 ++++++
.../esua/epdc/dto/KpiTypicalCultureDTO.java | 127 ++++++
.../dto/form/CheckIsScoredByYearFormDTO.java | 26 ++
.../KpiCommunityBuildingController.java | 2 +-
.../controller/KpiGridEntityController.java | 114 ++++++
.../KpiMassEvaluationController.java | 114 ++++++
.../KpiMattersResponseController.java | 95 +++++
.../KpiPublicOpinionController.java | 114 ++++++
.../KpiTypicalCultureController.java | 95 +++++
.../elink/esua/epdc/dao/KpiGridEntityDao.java | 50 +++
.../esua/epdc/dao/KpiMassEvaluationDao.java | 50 +++
.../esua/epdc/dao/KpiMattersResponseDao.java | 42 ++
.../esua/epdc/dao/KpiPublicOpinionDao.java | 50 +++
.../esua/epdc/dao/KpiTypicalCultureDao.java | 42 ++
.../esua/epdc/entity/KpiGridEntityEntity.java | 93 +++++
.../epdc/entity/KpiMassEvaluationEntity.java | 96 +++++
.../epdc/entity/KpiMattersResponseEntity.java | 92 +++++
.../epdc/entity/KpiPublicOpinionEntity.java | 96 +++++
.../epdc/entity/KpiTypicalCultureEntity.java | 93 +++++
.../esua/epdc/excel/KpiGridEntityExcel.java | 87 ++++
.../epdc/excel/KpiMassEvaluationExcel.java | 87 ++++
.../epdc/excel/KpiMattersResponseExcel.java | 87 ++++
.../epdc/excel/KpiPublicOpinionExcel.java | 87 ++++
.../epdc/excel/KpiTypicalCultureExcel.java | 89 +++++
.../esua/epdc/feign/AdminFeignClient.java | 4 +-
.../fallback/AdminFeignClientFallback.java | 4 +-
.../esua/epdc/redis/KpiGridEntityRedis.java | 47 +++
.../epdc/redis/KpiMassEvaluationRedis.java | 47 +++
.../epdc/redis/KpiMattersResponseRedis.java | 47 +++
.../epdc/redis/KpiPublicOpinionRedis.java | 47 +++
.../epdc/redis/KpiTypicalCultureRedis.java | 47 +++
.../service/KpiCommunityBuildingService.java | 2 +-
.../epdc/service/KpiGridEntityService.java | 124 ++++++
.../service/KpiMassEvaluationService.java | 124 ++++++
.../service/KpiMattersResponseService.java | 103 +++++
.../epdc/service/KpiPublicOpinionService.java | 124 ++++++
.../service/KpiTypicalCultureService.java | 102 +++++
.../impl/KpiCommunityBuildingServiceImpl.java | 134 ++-----
.../impl/KpiGridEntityServiceImpl.java | 377 ++++++++++++++++++
.../impl/KpiMassEvaluationServiceImpl.java | 375 +++++++++++++++++
.../impl/KpiMattersResponseServiceImpl.java | 137 +++++++
.../impl/KpiPublicOpinionServiceImpl.java | 377 ++++++++++++++++++
.../impl/KpiTypicalCultureServiceImpl.java | 137 +++++++
.../resources/mapper/KpiGridEntityDao.xml | 95 +++++
.../resources/mapper/KpiMassEvaluationDao.xml | 95 +++++
.../mapper/KpiMattersResponseDao.xml | 63 +++
.../resources/mapper/KpiPublicOpinionDao.xml | 95 +++++
.../resources/mapper/KpiTypicalCultureDao.xml | 67 ++++
60 files changed, 5039 insertions(+), 142 deletions(-)
create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportKpiResultDTO.java
rename esua-epdc/{epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportTemplateInfoResultDTO.java => epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java} (82%)
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMassEvaluationDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMattersResponseDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPublicOpinionDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTypicalCultureDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CheckIsScoredByYearFormDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiGridEntityController.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMassEvaluationController.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMattersResponseController.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiPublicOpinionController.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTypicalCultureController.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTypicalCultureDao.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMassEvaluationEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMattersResponseEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiPublicOpinionEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTypicalCultureEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMattersResponseExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiPublicOpinionExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiTypicalCultureExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiGridEntityRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMassEvaluationRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMattersResponseRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiPublicOpinionRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTypicalCultureRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMattersResponseService.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPublicOpinionService.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiTypicalCultureService.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTypicalCultureServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml
create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTypicalCultureDao.xml
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/ExportTemplateInfoFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/ExportTemplateInfoFormDTO.java
index d8b2be885..29747af63 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/ExportTemplateInfoFormDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/ExportTemplateInfoFormDTO.java
@@ -32,4 +32,9 @@ public class ExportTemplateInfoFormDTO implements Serializable {
* 部门类型
*/
private String deptTypeKey;
+
+ /**
+ * 年
+ */
+ private String year;
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportKpiResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportKpiResultDTO.java
new file mode 100644
index 000000000..797384f7f
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportKpiResultDTO.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > getExportTemplateInfo(@RequestBody ExportTemplateInfoFormDTO formDTO) {
- List list = sysDeptService.getExportTemplateInfo(formDTO);
- return new Result>().ok(list);
+ public Result> getExportTemplateInfo(@RequestBody ExportTemplateInfoFormDTO formDTO) {
+ List list = sysDeptService.getExportTemplateInfo(formDTO);
+ return new Result>().ok(list);
}
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index a684df9d3..0f5d5f29a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -13,7 +13,7 @@ import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.ExportTemplateInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -214,10 +214,10 @@ public interface SysDeptDao extends BaseDao {
/**
* @param formDTO
- * @return ExportTemplateInfoResultDTO
+ * @return ExportKpiResultDTO
* @Author wanggongfeng
* @Description 获取网格建设打分模板
* @Date 2020-06-15
**/
- List getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
+ List getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 44e842de7..249f91e06 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -15,7 +15,7 @@ import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.ExportTemplateInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
@@ -294,10 +294,10 @@ public interface SysDeptService extends BaseService {
/**
* @param formDTO
- * @return ExportTemplateInfoResultDTO
+ * @return ExportKpiResultDTO
* @Author wanggongfeng
* @Description 获取网格建设打分模板
* @Date 2020-06-15
**/
- List getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
+ List getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index d0614871f..6789f7d3c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -34,7 +34,7 @@ import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.ExportTemplateInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.feign.GroupFeignClient;
@@ -1097,7 +1097,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO) {
+ public List getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO) {
return baseDao.getExportTemplateInfo(formDTO);
}
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index eddb6c85c..4c55f733c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -367,13 +367,16 @@
-
+
SELECT
sd.id deptId,
CONCAT(st.NAME,'-',sd.NAME) deptName,
#{monthYear} as monthYear,
+
+ #{year} as year,
+
sdi.dict_name deptTypeKey
FROM
sys_dept sd
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
index bff6daf43..336e78444 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
@@ -17,6 +17,7 @@ import org.joda.time.format.DateTimeFormatter;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -211,4 +212,41 @@ public class DateUtils {
return df2.format(date1);
}
+ /**
+ * 获取上一个月字符串yyyy-MM
+ * @return
+ */
+ public static String getLastMonth() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+ Date date = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date); // 设置为当前时间
+ calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
+ date = calendar.getTime();
+ String accDate = format.format(date);
+ return accDate;
+ }
+
+ /**
+ * 获取当前月字符串yyyy-MM
+ * @return
+ */
+ public static String getCurrentMonth() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+ Date date = new Date();
+ String currentDate = format.format(date);
+ return currentDate;
+ }
+
+ /**
+ * 获取当前年字符串yyyy
+ * @return
+ */
+ public static String getCurrentYear() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy");
+ Date date = new Date();
+ String currentDate = format.format(date);
+ return currentDate;
+ }
+
}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
index f3f675bcb..72b2151c8 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
@@ -20,12 +20,15 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Excel工具类
@@ -145,4 +148,46 @@ public class ExcelUtils {
public static boolean isExcel2007(String filePath) {
return filePath.matches("^.+\\.(?i)(xlsx)$");
}
+
+ /**
+ * 校验是否为数字字符串
+ * @param numStr
+ * @return
+ */
+ public static Boolean checkNumber(String numStr){
+ Pattern pattern = Pattern.compile("([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])");
+ Matcher isNum = pattern.matcher(numStr);
+ if( !isNum.matches() ){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 删除文件夹（强制删除）
+ *
+ * @param path
+ */
+ public static void deleteAllFilesOfDir(File path) {
+ if (null != path) {
+ if (!path.exists()) {
+ return;
+ }
+ if (path.isFile()) {
+ boolean result = path.delete();
+ int tryCount = 0;
+ while (!result && tryCount++ < 10) {
+ System.gc(); // 回收资源
+ result = path.delete();
+ }
+ }
+ File[] files = path.listFiles();
+ if (null != files) {
+ for (int i = 0; i < files.length; i++) {
+ deleteAllFilesOfDir(files[i]);
+ }
+ }
+ path.delete();
+ }
+ }
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportTemplateInfoResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java
similarity index 82%
rename from esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportTemplateInfoResultDTO.java
rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java
index 87f1e533e..355e13808 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ExportTemplateInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see checkList;
+
+ /**
+ * 年月
+ */
+ private String year;
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiCommunityBuildingController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiCommunityBuildingController.java
index e9dd6c02d..fecaad8ad 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiCommunityBuildingController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiCommunityBuildingController.java
@@ -104,7 +104,7 @@ public class KpiCommunityBuildingController {
}
/**
- * @Description: 导入治理排行管理-手动打分记录
+ * @Description: 导入治理排行管理-社区建设打分
* @Param: [file]
* @return: Result
* @Author: wanggongfeng
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiGridEntityController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiGridEntityController.java
new file mode 100644
index 000000000..c6de39859
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiGridEntityController.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ //PageData page = kpiGridEntityService.page(params);
+ PageData page = kpiGridEntityService.getInfoPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ KpiGridEntityDTO data = kpiGridEntityService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody KpiGridEntityDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ kpiGridEntityService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody KpiGridEntityDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ kpiGridEntityService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ kpiGridEntityService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiGridEntityService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiGridEntityExcel.class);
+ }
+
+ @GetMapping("exportTemplate")
+ public void exportTemplate(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiGridEntityService.exportTemplate(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiGridEntityExcel.class);
+ }
+
+ /**
+ * @Description: 导入治理排行管理-网格实体化运作
+ * @Param: [file]
+ * @return: Result
+ * @Author: wanggongfeng
+ * @Date: 2020-06-16
+ */
+ @PostMapping("importManualScoreExcel")
+ public Result importManualScoreExcel(@RequestParam("file") MultipartFile file) {
+ return kpiGridEntityService.importManualScoreExcel(file);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMassEvaluationController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMassEvaluationController.java
new file mode 100644
index 000000000..becf753c2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMassEvaluationController.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ //PageData page = kpiMassEvaluationService.page(params);
+ PageData page = kpiMassEvaluationService.getInfoPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ KpiMassEvaluationDTO data = kpiMassEvaluationService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody KpiMassEvaluationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ kpiMassEvaluationService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody KpiMassEvaluationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ kpiMassEvaluationService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ kpiMassEvaluationService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiMassEvaluationService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiMassEvaluationExcel.class);
+ }
+
+ @GetMapping("exportTemplate")
+ public void exportTemplate(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiMassEvaluationService.exportTemplate(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiMassEvaluationExcel.class);
+ }
+
+ /**
+ * @Description: 导入治理排行管理-群众评价打分
+ * @Param: [file]
+ * @return: Result
+ * @Author: wanggongfeng
+ * @Date: 2020-06-17
+ */
+ @PostMapping("importManualScoreExcel")
+ public Result importManualScoreExcel(@RequestParam("file") MultipartFile file) {
+ return kpiMassEvaluationService.importManualScoreExcel(file);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMattersResponseController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMattersResponseController.java
new file mode 100644
index 000000000..d535323d6
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMattersResponseController.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ //PageData page = kpiMattersResponseService.page(params);
+ PageData page = kpiMattersResponseService.getInfoPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ KpiMattersResponseDTO data = kpiMattersResponseService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody KpiMattersResponseDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ kpiMattersResponseService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody KpiMattersResponseDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ kpiMattersResponseService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ kpiMattersResponseService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiMattersResponseService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiMattersResponseExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiPublicOpinionController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiPublicOpinionController.java
new file mode 100644
index 000000000..37f4924c4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiPublicOpinionController.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ //PageData page = kpiPublicOpinionService.page(params);
+ PageData page = kpiPublicOpinionService.getInfoPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ KpiPublicOpinionDTO data = kpiPublicOpinionService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody KpiPublicOpinionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ kpiPublicOpinionService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody KpiPublicOpinionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ kpiPublicOpinionService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ kpiPublicOpinionService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiPublicOpinionService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiPublicOpinionExcel.class);
+ }
+
+ @GetMapping("exportTemplate")
+ public void exportTemplate(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiPublicOpinionService.exportTemplate(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiPublicOpinionExcel.class);
+ }
+
+ /**
+ * @Description: 导入治理排行管理-舆论监督打分
+ * @Param: [file]
+ * @return: Result
+ * @Author: wanggongfeng
+ * @Date: 2020-06-17
+ */
+ @PostMapping("importManualScoreExcel")
+ public Result importManualScoreExcel(@RequestParam("file") MultipartFile file) {
+ return kpiPublicOpinionService.importManualScoreExcel(file);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTypicalCultureController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTypicalCultureController.java
new file mode 100644
index 000000000..5303992f4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTypicalCultureController.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ //PageData page = kpiTypicalCultureService.page(params);
+ PageData page = kpiTypicalCultureService.getInfoPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ KpiTypicalCultureDTO data = kpiTypicalCultureService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody KpiTypicalCultureDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ kpiTypicalCultureService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody KpiTypicalCultureDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ kpiTypicalCultureService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ kpiTypicalCultureService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = kpiTypicalCultureService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, KpiTypicalCultureExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
new file mode 100644
index 000000000..1edc7ecf0
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getInfoPage(Map params);
+
+ /**
+ * 条件查询
+ * @param checkIsScoredFormDTO
+ * @return
+ */
+ List getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
new file mode 100644
index 000000000..1eaa17fbc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getInfoPage(Map params);
+
+ /**
+ * 条件查询
+ * @param checkIsScoredByYearFormDTO
+ * @return
+ */
+ List getDuplicateData(CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java
new file mode 100644
index 000000000..b6745a887
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getInfoPage(Map params);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
new file mode 100644
index 000000000..19ff84633
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getInfoPage(Map params);
+
+ /**
+ * 条件查询
+ * @param checkIsScoredFormDTO
+ * @return
+ */
+ List getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTypicalCultureDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTypicalCultureDao.java
new file mode 100644
index 000000000..dfbc39027
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTypicalCultureDao.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getInfoPage(Map params);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
new file mode 100644
index 000000000..0a9f6cfba
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > getExportTemplateInfo(ExportTemplateInfoFormDTO exportTemplateInfoFormDTO);
+ Result> getExportTemplateInfo(ExportTemplateInfoFormDTO exportTemplateInfoFormDTO);
}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index 44ab214e4..bb46f7318 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -7,7 +7,7 @@ import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.ExportTemplateInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import org.springframework.stereotype.Component;
@@ -59,7 +59,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
}
@Override
- public Result> getExportTemplateInfo(ExportTemplateInfoFormDTO exportTemplateInfoFormDTO) {
+ public Result> getExportTemplateInfo(ExportTemplateInfoFormDTO exportTemplateInfoFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getExportTemplateInfo", exportTemplateInfoFormDTO);
}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiGridEntityRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiGridEntityRedis.java
new file mode 100644
index 000000000..96c910ec3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiGridEntityRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see exportTemplate(Map params);
/**
- * 网格建设打分导入
+ * 社区建设打分导入
*
* @param file
* @return Result
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java
new file mode 100644
index 000000000..e64e9efc5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-16
+ */
+ PageData page(Map params);
+
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getInfoPage(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-16
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return KpiGridEntityDTO
+ * @author generator
+ * @date 2020-06-16
+ */
+ KpiGridEntityDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void save(KpiGridEntityDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void update(KpiGridEntityDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void delete(String[] ids);
+
+ /**
+ * 导出模板
+ *
+ * @param params
+ * @return java.util.List
+ * @author wanggongfeng
+ * @date 2020-06-16
+ */
+ List exportTemplate(Map params);
+
+ /**
+ * 网格实体化运作打分导入
+ *
+ * @param file
+ * @return Result
+ * @author wanggongfeng
+ * @date 2020-06-16
+ */
+ Result importManualScoreExcel(MultipartFile file);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java
new file mode 100644
index 000000000..62220fb83
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-16
+ */
+ PageData page(Map params);
+
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getInfoPage(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-16
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return KpiMassEvaluationDTO
+ * @author generator
+ * @date 2020-06-16
+ */
+ KpiMassEvaluationDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void save(KpiMassEvaluationDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void update(KpiMassEvaluationDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void delete(String[] ids);
+
+ /**
+ * 导出模板
+ *
+ * @param params
+ * @return java.util.List
+ * @author wanggongfeng
+ * @date 2020-06-15
+ */
+ List exportTemplate(Map params);
+
+ /**
+ * 群众评价打分导入
+ *
+ * @param file
+ * @return Result
+ * @author wanggongfeng
+ * @date 2020-06-17
+ */
+ Result importManualScoreExcel(MultipartFile file);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMattersResponseService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMattersResponseService.java
new file mode 100644
index 000000000..015a6fc45
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMattersResponseService.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-16
+ */
+ PageData page(Map params);
+
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getInfoPage(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-16
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return KpiMattersResponseDTO
+ * @author generator
+ * @date 2020-06-16
+ */
+ KpiMattersResponseDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void save(KpiMattersResponseDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void update(KpiMattersResponseDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPublicOpinionService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPublicOpinionService.java
new file mode 100644
index 000000000..bac578a1c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPublicOpinionService.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-16
+ */
+ PageData page(Map params);
+
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getInfoPage(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-16
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return KpiPublicOpinionDTO
+ * @author generator
+ * @date 2020-06-16
+ */
+ KpiPublicOpinionDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void save(KpiPublicOpinionDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void update(KpiPublicOpinionDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void delete(String[] ids);
+
+ /**
+ * 导出模板
+ *
+ * @param params
+ * @return java.util.List
+ * @author wanggongfeng
+ * @date 2020-06-15
+ */
+ List exportTemplate(Map params);
+
+ /**
+ * 舆论监督打分导入
+ *
+ * @param file
+ * @return Result
+ * @author wanggongfeng
+ * @date 2020-06-17
+ */
+ Result importManualScoreExcel(MultipartFile file);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiTypicalCultureService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiTypicalCultureService.java
new file mode 100644
index 000000000..81aed3af3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiTypicalCultureService.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-16
+ */
+ PageData page(Map params);
+
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getInfoPage(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-16
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return KpiTypicalCultureDTO
+ * @author generator
+ * @date 2020-06-16
+ */
+ KpiTypicalCultureDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void save(KpiTypicalCultureDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void update(KpiTypicalCultureDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-16
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
index 0d72ea1f8..1c85b792e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
@@ -31,13 +31,15 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.KpiCommunityBuildingDao;
import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
import com.elink.esua.epdc.dto.KpiCommunityBuildingDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.ExportTemplateInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
import com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO;
import com.elink.esua.epdc.entity.KpiCommunityBuildingEntity;
import com.elink.esua.epdc.excel.KpiCommunityBuildingExcel;
@@ -53,10 +55,10 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* 网格建设打分表
@@ -128,7 +130,7 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl checkList = new ArrayList();
checkList.add(deptId);
// 判断录入月份是否为当前月或者前一个月
- if(!dto.getMonthYear().equals(getLastMonth()) && !dto.getMonthYear().equals(getCurrentMonth())){
+ if(!dto.getMonthYear().equals(DateUtils.getLastMonth()) && !dto.getMonthYear().equals(DateUtils.getCurrentMonth())){
throw new RenException("只能对当前月份或者上个月份进行打分，请维护后重试！");
}
// 检测excel中是否存在已打分部门
@@ -175,13 +177,13 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl> result = adminFeignClient.getExportTemplateInfo(exportTemplateInfoFormDTO);
- List resultList = result.getData();
+ Result> result = adminFeignClient.getExportTemplateInfo(exportTemplateInfoFormDTO);
+ List resultList = result.getData();
return ConvertUtils.sourceToTarget(resultList, KpiCommunityBuildingDTO.class);
}
/**
- * @Description: 导入治理排行管理-手动打分记录
+ * @Description: 导入治理排行管理-社区建设打分
* @Param: [file]
* @return: Result
* @Author: wanggongfeng
@@ -237,7 +239,7 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl 3
- || gridNegotiationCaseInt < 0 || gridNegotiationCaseInt > 4
- || residentConventionSystemInt < 0 || residentConventionSystemInt > 3){
+ Double residentConventionSystemDouble = Double.parseDouble(residentConventionSystem);
+ if(democraticConsultationMechanismDouble < 0 || democraticConsultationMechanismDouble > 3
+ || gridNegotiationCaseDouble < 0 || gridNegotiationCaseDouble > 4
+ || residentConventionSystemDouble < 0 || residentConventionSystemDouble > 3){
return true;
}
return false;
}
- /**
- * 校验是否为数字字符串
- * @param numStr
- * @return
- */
- private Boolean checkNumber(String numStr){
- Pattern pattern = Pattern.compile("([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])");
- Matcher isNum = pattern.matcher(numStr);
- if( !isNum.matches() ){
- return true;
- }
- return false;
- }
-
- /**
- * 获取上一个月字符串yyyy-MM
- * @return
- */
- public String getLastMonth() {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
- Date date = new Date();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date); // 设置为当前时间
- calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
- date = calendar.getTime();
- String accDate = format.format(date);
- return accDate;
- }
-
- /**
- * 获取当前月字符串yyyy-MM
- * @return
- */
- public String getCurrentMonth() {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
- Date date = new Date();
- String currentDate = format.format(date);
- return currentDate;
- }
-
/**
* 拼接已打分部门提示信息
* @param checkList
@@ -400,7 +362,7 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl999){
- Guid=100;
- }
- ran=Guid;
- String str = time+currentTimeMillis.substring(1, currentTimeMillis.length())+ran;
- return str;
- }*/
-
-
- /**
- * 删除文件夹（强制删除）
- *
- * @param path
- */
- private void deleteAllFilesOfDir(File path) {
- if (null != path) {
- if (!path.exists()) {
- return;
- }
- if (path.isFile()) {
- boolean result = path.delete();
- int tryCount = 0;
- while (!result && tryCount++ < 10) {
- System.gc(); // 回收资源
- result = path.delete();
- }
- }
- File[] files = path.listFiles();
- if (null != files) {
- for (int i = 0; i < files.length; i++) {
- deleteAllFilesOfDir(files[i]);
- }
- }
- path.delete();
- }
- }
-
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
new file mode 100644
index 000000000..4589a9c83
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
@@ -0,0 +1,377 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements KpiGridEntityService {
+
+ @Autowired
+ private KpiGridEntityRedis kpiGridEntityRedis;
+
+ @Autowired
+ private AdminFeignClient adminFeignClient;
+
+ @Autowired
+ private DeptUtils deptUtils;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, KpiGridEntityDTO.class);
+ }
+
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ @Override
+ public PageData getInfoPage(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.getInfoPage(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, KpiGridEntityDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public KpiGridEntityDTO get(String id) {
+ KpiGridEntityEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, KpiGridEntityDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(KpiGridEntityDTO dto) {
+ String deptId = dto.getDeptId();
+ List checkList = new ArrayList();
+ checkList.add(deptId);
+ // 判断录入月份是否为当前月或者前一个月
+ if(!dto.getMonthYear().equals(DateUtils.getLastMonth()) && !dto.getMonthYear().equals(DateUtils.getCurrentMonth())){
+ throw new RenException("只能对当前月份或者上个月份进行打分，请维护后重试！");
+ }
+ // 检测excel中是否存在已打分部门
+ StringBuffer deptErrorInfo = this.getDuplicateData(checkList,dto.getMonthYear());
+ if (deptErrorInfo.length() > 0) {
+ throw new RenException(deptErrorInfo + " 已打分, 不可重复打分!");
+ }
+ // 查询机构类型键值
+ Result result = adminFeignClient.get(Long.valueOf(deptId));
+ SysDeptDTO sysDeptDTO = result.getData();
+ // 设置部门类别
+ dto.setDeptTypeKey(sysDeptDTO.getTypeKey());
+ KpiGridEntityEntity entity = ConvertUtils.sourceToTarget(dto, KpiGridEntityEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(KpiGridEntityDTO dto) {
+ KpiGridEntityEntity entity = ConvertUtils.sourceToTarget(dto, KpiGridEntityEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 拼接已打分部门提示信息
+ * @param checkList
+ * @return
+ */
+ private StringBuffer getDuplicateData(List checkList ,String monthYear){
+ CheckIsScoredFormDTO checkIsScoredFormDTO = new CheckIsScoredFormDTO();
+ checkIsScoredFormDTO.setCheckList(checkList);
+ checkIsScoredFormDTO.setMonthYear(monthYear);
+ StringBuffer deptErrorInfo = new StringBuffer();
+ List list = baseDao.getDuplicateData(checkIsScoredFormDTO);
+ for(int i = 0 ; i < list.size() ; i++){
+ KpiGridEntityDTO kpiGridEntityDTO = list.get(i);
+ if(i == (list.size()-1)){
+ deptErrorInfo.append(kpiGridEntityDTO.getDeptName());
+ }else{
+ deptErrorInfo.append(kpiGridEntityDTO.getDeptName()).append("、");
+ }
+ }
+ return deptErrorInfo;
+ }
+
+ /**
+ * 获取导出模板
+ *
+ * @param params
+ * @return java.util.List
+ * @author wanggongfeng
+ * @date 2020-06-16
+ */
+ @Override
+ public List exportTemplate(Map params) {
+ List deptIdList = SecurityUser.getUser().getDeptIdList(); //获取用户权限
+ ExportTemplateInfoFormDTO exportTemplateInfoFormDTO = new ExportTemplateInfoFormDTO();
+ exportTemplateInfoFormDTO.setDeptIdList(deptIdList);
+ exportTemplateInfoFormDTO.setDeptId(params.get("deptId") == null ? "" : params.get("deptId").toString());
+ exportTemplateInfoFormDTO.setDeptTypeKey(params.get("deptTypeKey") == null ? "" : params.get("deptTypeKey").toString());
+ exportTemplateInfoFormDTO.setMonthYear(params.get("monthYear") == null ? "" : params.get("monthYear").toString());
+ Result> result = adminFeignClient.getExportTemplateInfo(exportTemplateInfoFormDTO);
+ List resultList = result.getData();
+ return ConvertUtils.sourceToTarget(resultList, KpiGridEntityDTO.class);
+ }
+
+ /**
+ * @Description: 导入治理排行管理-网格实体化运作
+ * @Param: [file]
+ * @return: Result
+ * @Author: wanggongfeng
+ * @Date: 2020-06-16
+ */
+ @Override
+ public Result importManualScoreExcel(MultipartFile file) {
+ File f = StreamUtils.conversionFile(file);
+ try {
+ //判断上传文件类型
+ String originalFilename = file.getOriginalFilename();
+ if (!originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2003) && !originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2007)) {
+ return new Result().error("请选择.xls或者.xlsx格式文件");
+ }
+ List recordList = ExcelImportUtil.importExcel(f, KpiGridEntityExcel.class, new ImportParams());
+ if (CollUtil.isEmpty(recordList)) {
+ return new Result().error("导入内容不能为空");
+ }
+ // 存储检测excel是否存在重复ID使用
+ List checkList = new ArrayList();
+ StringBuffer checkInfo = new StringBuffer();
+ String monthYear = "";
+ for(int i = 0 ; i < recordList.size() ; i++){
+ KpiGridEntityExcel kpiGridEntityExcel = recordList.get(i);
+
+ // 校验是否存在空单元格
+ if(checkNullCell(kpiGridEntityExcel)){
+ return new Result().error("导入文件中存在空单元格，请完善后重试!");
+ }
+
+ // 校验是否存在分数范围不正确的打分
+ if(checkScoreCell(kpiGridEntityExcel)){
+ return new Result().error("存在不符合分值范围的分数!");
+ }
+
+ // 校验月份是否不一致
+ if(i == 0){
+ monthYear = kpiGridEntityExcel.getMonthYear();
+ }else{
+ if(!monthYear.equals(kpiGridEntityExcel.getMonthYear())){
+ return new Result().error("导入文件中月份不一致，请修改一致后重试!");
+ }
+ monthYear = kpiGridEntityExcel.getMonthYear();
+ }
+
+ // 校验ID是否存在重复
+ if(checkList.contains(kpiGridEntityExcel.getDeptId())){
+ return new Result().error(kpiGridEntityExcel.getDeptName() + "ID重复，请维护唯一ID后重试!");
+ }
+ checkList.add(kpiGridEntityExcel.getDeptId());
+
+ // 拼接部门ID不在当前用户权限内的部门名称
+ checkInfo.append(splicingErrorDeptName(i,kpiGridEntityExcel,recordList));
+ }
+ // 判断导入月份是否为当前月或者前一个月
+ if(!monthYear.equals(DateUtils.getLastMonth()) && !monthYear.equals(DateUtils.getCurrentMonth())){
+ return new Result().error("只能对当前月份或者上个月份进行打分，请维护后重试！");
+ }
+ // 校验部门ID是否存在当前用户权限内
+ if (checkInfo.length() > 0) {
+ return new Result().error(checkInfo.append("部门ID错误，请维护后重试!").toString());
+ }
+ // 检测excel中是否存在已打分部门
+ StringBuffer deptErrorInfo = this.getDuplicateData(checkList,monthYear);
+ if (deptErrorInfo.length() > 0) {
+ return new Result().error(deptErrorInfo + " 已打分, 不可重复打分!");
+ }
+
+ // 插入网格建设打分数据（必要时可改为批量插入）
+ for (KpiGridEntityExcel kpiGridEntityExcel : recordList) {
+ KpiGridEntityEntity entity = splicingEntity(kpiGridEntityExcel);
+ insert(entity);
+ }
+ } catch (Exception e) {
+ return new Result().error("数据异常，解析excel文件失败");
+ } finally {
+ // 删除文件
+ ExcelUtils.deleteAllFilesOfDir(f);
+ }
+ return new Result();
+ }
+
+ /**
+ * 校验是否存在空单元格
+ * @param kpiGridEntityExcel
+ * @return
+ */
+ private Boolean checkNullCell(KpiGridEntityExcel kpiGridEntityExcel){
+ if(StringUtils.isBlank(kpiGridEntityExcel.getDeptId()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptName()) || StringUtils.isBlank(kpiGridEntityExcel.getMonthYear())
+ || StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishment()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptTypeKey())
+ || StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacement()) || StringUtils.isBlank(kpiGridEntityExcel.getGridOperation())){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 校验分数是否规范
+ * @param kpiGridEntityExcel
+ * @return
+ */
+ private Boolean checkScoreCell(KpiGridEntityExcel kpiGridEntityExcel){
+ // 建站达标分数（4分）
+ String stationEstablishment = kpiGridEntityExcel.getStationEstablishment();
+ if(ExcelUtils.checkNumber(stationEstablishment)){
+ return true;
+ }
+ Double stationEstablishmentDouble = Double.parseDouble(stationEstablishment);
+ // 人员配备分数（3分）
+ String staffingPlacement = kpiGridEntityExcel.getStaffingPlacement();
+ if(ExcelUtils.checkNumber(staffingPlacement)){
+ return true;
+ }
+ Double staffingPlacementDouble = Double.parseDouble(staffingPlacement);
+ // 网格运行分数（3分）
+ String gridOperation = kpiGridEntityExcel.getGridOperation();
+ if(ExcelUtils.checkNumber(gridOperation)){
+ return true;
+ }
+ Double gridOperationDouble = Double.parseDouble(gridOperation);
+ if(stationEstablishmentDouble < 0 || stationEstablishmentDouble > 4
+ || staffingPlacementDouble < 0 || staffingPlacementDouble > 3
+ || gridOperationDouble < 0 || gridOperationDouble > 3){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 拼接部门ID不在当前用户权限内的部门名称
+ * @param index
+ * @param kpiGridEntityExcel
+ * @param recordList
+ * @return
+ */
+ private String splicingErrorDeptName(int index, KpiGridEntityExcel kpiGridEntityExcel, List recordList){
+ UserDetail user = SecurityUser.getUser();
+ List deptIdList = user.getDeptIdList();
+ if(!deptIdList.contains(Long.valueOf(kpiGridEntityExcel.getDeptId()))){
+ if(index == (recordList.size()-1)){
+ return kpiGridEntityExcel.getDeptName();
+ }else{
+ return kpiGridEntityExcel.getDeptName() + "、";
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 拼接网格建设打分实体
+ * @param kpiGridEntityExcel
+ * @return
+ */
+ private KpiGridEntityEntity splicingEntity(KpiGridEntityExcel kpiGridEntityExcel){
+ KpiGridEntityEntity entity = ConvertUtils.sourceToTarget(kpiGridEntityExcel, KpiGridEntityEntity.class);
+ // 查询设置部门类别和部门名称
+ String deptId = entity.getDeptId();
+ Result result = adminFeignClient.get(Long.valueOf(deptId));
+ SysDeptDTO sysDeptDTO = result.getData();
+ entity.setDeptTypeKey(sysDeptDTO.getTypeKey());
+ entity.setDeptName(sysDeptDTO.getName());
+ // 查询设置上级部门信息
+ DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(Long.valueOf(deptId), YesOrNoEnum.YES);
+ entity.setAllDeptIds(deptLevelInfo.getAllDeptIds());
+ entity.setAllDeptNames(deptLevelInfo.getAllDeptNames());
+ entity.setParentDeptIds(deptLevelInfo.getParentDeptIds());
+ entity.setParentDeptNames(deptLevelInfo.getParentDeptNames());
+ return entity;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
new file mode 100644
index 000000000..68a07cc60
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
@@ -0,0 +1,375 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements KpiMassEvaluationService {
+
+ @Autowired
+ private KpiMassEvaluationRedis kpiMassEvaluationRedis;
+
+ @Autowired
+ private AdminFeignClient adminFeignClient;
+
+ @Autowired
+ private DeptUtils deptUtils;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, KpiMassEvaluationDTO.class);
+ }
+
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ @Override
+ public PageData getInfoPage(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.getInfoPage(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, KpiMassEvaluationDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public KpiMassEvaluationDTO get(String id) {
+ KpiMassEvaluationEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, KpiMassEvaluationDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(KpiMassEvaluationDTO dto) {
+ String deptId = dto.getDeptId();
+ List checkList = new ArrayList();
+ checkList.add(deptId);
+ // 判断录入年份是否为当前年份
+ if(!dto.getYear().equals(DateUtils.getCurrentYear())){
+ throw new RenException("只能对当前年份进行打分，请维护后重试！");
+ }
+ // 检测excel中是否存在已打分部门
+ StringBuffer deptErrorInfo = this.getDuplicateData(checkList,dto.getYear());
+ if (deptErrorInfo.length() > 0) {
+ throw new RenException(deptErrorInfo + " 已打分, 不可重复打分!");
+ }
+ // 查询机构类型键值
+ Result result = adminFeignClient.get(Long.valueOf(deptId));
+ SysDeptDTO sysDeptDTO = result.getData();
+ // 设置部门类别
+ dto.setDeptTypeKey(sysDeptDTO.getTypeKey());
+ KpiMassEvaluationEntity entity = ConvertUtils.sourceToTarget(dto, KpiMassEvaluationEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(KpiMassEvaluationDTO dto) {
+ KpiMassEvaluationEntity entity = ConvertUtils.sourceToTarget(dto, KpiMassEvaluationEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 拼接已打分部门提示信息
+ * @param checkList
+ * @return
+ */
+ private StringBuffer getDuplicateData(List checkList ,String year){
+ CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO = new CheckIsScoredByYearFormDTO();
+ checkIsScoredByYearFormDTO.setCheckList(checkList);
+ checkIsScoredByYearFormDTO.setYear(year);
+ StringBuffer deptErrorInfo = new StringBuffer();
+ List list = baseDao.getDuplicateData(checkIsScoredByYearFormDTO);
+ for(int i = 0 ; i < list.size() ; i++){
+ KpiMassEvaluationDTO kpiMassEvaluationDTO = list.get(i);
+ if(i == (list.size()-1)){
+ deptErrorInfo.append(kpiMassEvaluationDTO.getDeptName());
+ }else{
+ deptErrorInfo.append(kpiMassEvaluationDTO.getDeptName()).append("、");
+ }
+ }
+ return deptErrorInfo;
+ }
+
+ /**
+ * 获取导出模板
+ *
+ * @param params
+ * @return java.util.List
+ * @author wanggongfeng
+ * @date 2020-06-15
+ */
+ @Override
+ public List exportTemplate(Map params) {
+ List deptIdList = SecurityUser.getUser().getDeptIdList(); //获取用户权限
+ ExportTemplateInfoFormDTO exportTemplateInfoFormDTO = new ExportTemplateInfoFormDTO();
+ exportTemplateInfoFormDTO.setDeptIdList(deptIdList);
+ exportTemplateInfoFormDTO.setDeptId(params.get("deptId") == null ? "" : params.get("deptId").toString());
+ exportTemplateInfoFormDTO.setDeptTypeKey(params.get("deptTypeKey") == null ? "" : params.get("deptTypeKey").toString());
+ exportTemplateInfoFormDTO.setYear(params.get("year") == null ? "" : params.get("year").toString());
+ Result> result = adminFeignClient.getExportTemplateInfo(exportTemplateInfoFormDTO);
+ List resultList = result.getData();
+ return ConvertUtils.sourceToTarget(resultList, KpiMassEvaluationDTO.class);
+ }
+
+ /**
+ * @Description: 导入治理排行管理-群众评价打分
+ * @Param: [file]
+ * @return: Result
+ * @Author: wanggongfeng
+ * @Date: 2020-06-17
+ */
+ @Override
+ public Result importManualScoreExcel(MultipartFile file) {
+ File f = StreamUtils.conversionFile(file);
+ try {
+ //判断上传文件类型
+ String originalFilename = file.getOriginalFilename();
+ if (!originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2003) && !originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2007)) {
+ return new Result().error("请选择.xls或者.xlsx格式文件");
+ }
+ List recordList = ExcelImportUtil.importExcel(f, KpiMassEvaluationExcel.class, new ImportParams());
+ if (CollUtil.isEmpty(recordList)) {
+ return new Result().error("导入内容不能为空");
+ }
+ // 存储检测excel是否存在重复ID使用
+ List checkList = new ArrayList();
+ StringBuffer checkInfo = new StringBuffer();
+ String year = "";
+ for(int i = 0 ; i < recordList.size() ; i++){
+ KpiMassEvaluationExcel kpiMassEvaluationExcel = recordList.get(i);
+
+ // 校验是否存在空单元格
+ if(checkNullCell(kpiMassEvaluationExcel)){
+ return new Result().error("导入文件中存在空单元格，请完善后重试!");
+ }
+
+ // 校验是否存在分数范围不正确的打分
+ if(checkScoreCell(kpiMassEvaluationExcel)){
+ return new Result().error("存在分值总和超过20分的部门，请维护后重试!");
+ }
+
+ // 校验月份是否不一致
+ if(i == 0){
+ year = kpiMassEvaluationExcel.getYear();
+ }else{
+ if(!year.equals(kpiMassEvaluationExcel.getYear())){
+ return new Result().error("导入文件中年份不一致，请修改一致后重试!");
+ }
+ year = kpiMassEvaluationExcel.getYear();
+ }
+
+ // 校验ID是否存在重复
+ if(checkList.contains(kpiMassEvaluationExcel.getDeptId())){
+ return new Result().error(kpiMassEvaluationExcel.getDeptName() + "ID重复，请维护唯一ID后重试!");
+ }
+ checkList.add(kpiMassEvaluationExcel.getDeptId());
+
+ // 拼接部门ID不在当前用户权限内的部门名称
+ checkInfo.append(splicingErrorDeptName(i,kpiMassEvaluationExcel,recordList));
+ }
+ // 判断导入年份是否为当前年份
+ if(!year.equals(DateUtils.getCurrentYear())){
+ return new Result().error("只能对当前年份进行打分，请维护后重试！");
+ }
+ // 校验部门ID是否存在当前用户权限内
+ if (checkInfo.length() > 0) {
+ return new Result().error(checkInfo.append("部门ID错误，请维护后重试!").toString());
+ }
+ // 检测excel中是否存在已打分部门
+ StringBuffer deptErrorInfo = this.getDuplicateData(checkList,year);
+ if (deptErrorInfo.length() > 0) {
+ return new Result().error(deptErrorInfo + " 已打分, 不可重复打分!");
+ }
+
+ // 插入群众评价打分数据（必要时可改为批量插入）
+ for (KpiMassEvaluationExcel kpiMassEvaluationExcel : recordList) {
+ KpiMassEvaluationEntity entity = splicingEntity(kpiMassEvaluationExcel);
+ insert(entity);
+ }
+ } catch (Exception e) {
+ return new Result().error("数据异常，解析excel文件失败");
+ } finally {
+ // 删除文件
+ ExcelUtils.deleteAllFilesOfDir(f);
+ }
+ return new Result();
+ }
+
+ /**
+ * 校验是否存在空单元格
+ * @param kpiMassEvaluationExcel
+ * @return
+ */
+ private Boolean checkNullCell(KpiMassEvaluationExcel kpiMassEvaluationExcel){
+ if(StringUtils.isBlank(kpiMassEvaluationExcel.getDeptId()) || StringUtils.isBlank(kpiMassEvaluationExcel.getDeptName()) || StringUtils.isBlank(kpiMassEvaluationExcel.getYear())
+ || StringUtils.isBlank(kpiMassEvaluationExcel.getSatisfied()) || StringUtils.isBlank(kpiMassEvaluationExcel.getDeptTypeKey())
+ || StringUtils.isBlank(kpiMassEvaluationExcel.getBasicSatisfaction()) || StringUtils.isBlank(kpiMassEvaluationExcel.getDissatisfied())){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 校验分数是否规范
+ * @param kpiMassEvaluationExcel
+ * @return
+ */
+ private Boolean checkScoreCell(KpiMassEvaluationExcel kpiMassEvaluationExcel){
+ // 满意分数
+ String satisfied = kpiMassEvaluationExcel.getSatisfied();
+ if(ExcelUtils.checkNumber(satisfied)){
+ return true;
+ }
+ Double satisfiedDouble = Double.parseDouble(satisfied);
+ // 基本满意分数
+ String basicSatisfaction = kpiMassEvaluationExcel.getBasicSatisfaction();
+ if(ExcelUtils.checkNumber(basicSatisfaction)){
+ return true;
+ }
+ Double basicSatisfactionDouble = Double.parseDouble(basicSatisfaction);
+ // 不满意分数
+ String dissatisfied = kpiMassEvaluationExcel.getDissatisfied();
+ if(ExcelUtils.checkNumber(dissatisfied)){
+ return true;
+ }
+ Double dissatisfiedDouble = Double.parseDouble(dissatisfied);
+ if((satisfiedDouble + basicSatisfactionDouble + dissatisfiedDouble) > 20){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 拼接部门ID不在当前用户权限内的部门名称
+ * @param index
+ * @param kpiMassEvaluationExcel
+ * @param recordList
+ * @return
+ */
+ private String splicingErrorDeptName(int index,KpiMassEvaluationExcel kpiMassEvaluationExcel,List recordList){
+ UserDetail user = SecurityUser.getUser();
+ List deptIdList = user.getDeptIdList();
+ if(!deptIdList.contains(Long.valueOf(kpiMassEvaluationExcel.getDeptId()))){
+ if(index == (recordList.size()-1)){
+ return kpiMassEvaluationExcel.getDeptName();
+ }else{
+ return kpiMassEvaluationExcel.getDeptName() + "、";
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 拼接网格建设打分实体
+ * @param kpiMassEvaluationExcel
+ * @return
+ */
+ private KpiMassEvaluationEntity splicingEntity(KpiMassEvaluationExcel kpiMassEvaluationExcel){
+ KpiMassEvaluationEntity entity = ConvertUtils.sourceToTarget(kpiMassEvaluationExcel, KpiMassEvaluationEntity.class);
+ // 查询设置部门类别和部门名称
+ String deptId = entity.getDeptId();
+ Result result = adminFeignClient.get(Long.valueOf(deptId));
+ SysDeptDTO sysDeptDTO = result.getData();
+ entity.setDeptTypeKey(sysDeptDTO.getTypeKey());
+ entity.setDeptName(sysDeptDTO.getName());
+ // 查询设置上级部门信息
+ DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(Long.valueOf(deptId), YesOrNoEnum.YES);
+ entity.setAllDeptIds(deptLevelInfo.getAllDeptIds());
+ entity.setAllDeptNames(deptLevelInfo.getAllDeptNames());
+ entity.setParentDeptIds(deptLevelInfo.getParentDeptIds());
+ entity.setParentDeptNames(deptLevelInfo.getParentDeptNames());
+ return entity;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java
new file mode 100644
index 000000000..27991b3e7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements KpiMattersResponseService {
+
+ @Autowired
+ private KpiMattersResponseRedis kpiMattersResponseRedis;
+
+ @Autowired
+ private AdminFeignClient adminFeignClient;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, KpiMattersResponseDTO.class);
+ }
+
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ @Override
+ public PageData getInfoPage(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.getInfoPage(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, KpiMattersResponseDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public KpiMattersResponseDTO get(String id) {
+ KpiMattersResponseEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, KpiMattersResponseDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(KpiMattersResponseDTO dto) {
+ String deptId = dto.getDeptId();
+ List