Merge branches 'dev' and 'dev_voice_scan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice_scan

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

@@ -38,6 +38,17 @@ public class AgencyDistributionResultDTO implements Serializable {
      */
     private String type;
 
+    /**
+     * 若果是组织，对应返回screen_customer_agency的 level
+     * 机关级别
+     * 社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province
+     */
+    private String agencyLevel;
+
     public AgencyDistributionResultDTO() {
         this.subAreaMarks = "";
         this.subCenterMark = "";

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

@@ -31,7 +31,10 @@ public class CompartmentResultDTO implements Serializable {
      */
     private String areaMarks = "";
 
+    @JsonIgnore
+    private String level;
     /**
+     * 当前组织的级别
      * 机关级别
      * 社区级：community，
      * 乡（镇、街道）级:street,
@@ -39,8 +42,7 @@ public class CompartmentResultDTO implements Serializable {
      * 市级: city
      * 省级:province
      */
-    @JsonIgnore
+    private String agencyLevel;
-    private String level;
 
     /**
      * 子级用户分布

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

@@ -195,7 +195,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
@@ -213,7 +213,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -77,12 +77,12 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //4.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据
                 list = factIndexAgencyScoreDao.selectAgencyAblityWeightScoreIndex(formDTO);
 
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexCommunityScoreDao.selectCommunityAblityWeightScore(formDTO);
             } else {
@@ -179,11 +179,11 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //3.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
                 resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO);
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
                 resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO);
             } else {
@@ -227,12 +227,12 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //4.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO);
 
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO);
             } else {
@@ -298,8 +298,8 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //3.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
-                if ("district".equals(agency.getLevel())) {
+                if ("district".equals(agency.getAgencyLevel())) {
                     formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 } else {
                     formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
@@ -307,7 +307,7 @@ public class FactIndexServiceImpl implements FactIndexService {
                 resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO);
 
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO);
             } else {
@@ -366,10 +366,10 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //4.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO);
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO);
             } else {
                 //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));

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

@@ -44,7 +44,8 @@
             agency_id AS agencyId,
             agency_name AS name,
             area_marks AS areaMarks,
-            level AS level
+            level as level,
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE
@@ -60,7 +61,8 @@
             agency_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'agency' AS type
+            'agency' AS type,
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE

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

@@ -10,7 +10,8 @@
             grid_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'grid' AS type
+            'grid' AS type,
+            '' as agencyLevel
         FROM
             screen_customer_grid
         WHERE

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java

@@ -54,7 +54,7 @@ public class ResiTopicAttachmentDTO implements Serializable {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java

@@ -54,7 +54,7 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -315,6 +315,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
+                attachment.setAttachmentType("image");
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `resi_topic_attachment`
+MODIFY COLUMN `ATTACHMENT_TYPE`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））' AFTER `ATTACHMENT_FORMAT`;
+
+UPDATE resi_topic_attachment SET ATTACHMENT_TYPE = 'image';