diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
index 85323027b5..d9d5f5a98c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
@@ -11,6 +11,6 @@ public interface GroupConstant {
String RAIL = "-";
- String NULL_CHAR_STRING = "";
+ String DOT = ".";
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
index 94d4b37e7d..6383b5cfe7 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
@@ -33,5 +33,5 @@ public interface TopicConstant {
String RAIL = "-";
- String NULL_CHAR_STRING = "";
+ String DOT = ".";
}
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index c272e01135..498f28a728 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.20
+ image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22
ports:
- "8109:8109"
network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 612bd928dd..2e9a82b4bd 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- 0.3.20
+ 0.3.22
data-report-server
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
index 57214b658a..d1be53ee85 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
@@ -43,7 +43,7 @@ public class GroupServiceImpl implements GroupService {
GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId);
if (null==result){
GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO();
- resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING));
+ resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.DOT));
return resultDTO;
}
return result;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
index 072516c6dc..6e5366827f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
@@ -57,6 +57,7 @@ public class ProjectServiceImpl implements ProjectService {
resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue()));
resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue()));
} else {
+ resultDTO = new ProjectSummaryResultDTO();
resultDTO.setAgencyId(agencyId);
Date date = DateUtils.getBeforeDay(new Date());
resultDTO.setDateName(DateUtils.format(date, "yyyy.MM.dd"));
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
index 0ab00e729b..298dcae7a3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
@@ -42,10 +42,9 @@ public class TopicServiceImpl implements TopicService {
@Override
public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) {
TopicSummaryResultDTO result = new TopicSummaryResultDTO();
- result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING));
+ result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.DOT));
String agencyId = this.getLoginUserDetails(tokenDto);
List topicStatus = topicDao.getTopicStatus(agencyId);
- result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());
if (topicStatus.size() != NumConstant.ZERO){
topicStatus.forEach(topic -> {
if (topic.getTopicStatus().equals(TopicConstant.DISCUSSING)){
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
index e374c96d45..b3b1faecd7 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
@@ -10,7 +10,7 @@
group_total_count AS groupTotalCount,
group_member_avg_count AS groupPeopleAvg,
group_median AS groupPeopleMedian,
- DATE_FORMAT( date_id, '%Y-%m-%d' ) AS deadline
+ DATE_FORMAT( date_id, '%Y.%m.%d' ) AS deadline
FROM fact_group_agency_daily
WHERE del_flag = '0'
AND agency_id = #{agencyId}