luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
yinzuomei 5 years ago
parent
c8ef688509 87faef26be
commit
5e244f5c3b
10 changed files with 41 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
  2. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
  3. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
  4. 22
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
  5. 6
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
  6. 3
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
  7. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
  8. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
  9. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  10. 4
      epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql

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

@ -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 = "";

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

@ -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 level;
private String agencyLevel;
/**
* 子级用户分布

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

@ -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);

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

@ -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.getLevel())) {
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
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()));

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

@ -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

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

@ -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

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

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

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

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

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

@ -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);
}
}

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

@ -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';
Write Preview
Loading…
Cancel
Save