fix: roundDetail中增加remainingTime

common/pom.xml

@@ -12,7 +12,7 @@
     <groupId>com.pica.cloud.online.exam</groupId>
     <artifactId>pica-cloud-analysis-common</artifactId>
     <name>pica-cloud-analysis-common</name>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <packaging>jar</packaging>
 
     <properties>

common/src/main/java/com/pica/cloud/online/exam/analysis.common/dto/RoundExamTitleV2Dto.java

@@ -11,6 +11,8 @@ public class RoundExamTitleV2Dto {
 
     private Integer roundId;
 
+    private String remainingTime;
+
     private String startTime;
 
     private String endTime;
@@ -54,6 +56,14 @@ public class RoundExamTitleV2Dto {
         this.roundId = roundId;
     }
 
+    public String getRemainingTime() {
+        return remainingTime;
+    }
+
+    public void setRemainingTime(String remainingTime) {
+        this.remainingTime = remainingTime;
+    }
+
     public String getStartTime() {
         return startTime;
     }

server/pom.xml

@@ -138,7 +138,7 @@
         <dependency>
             <groupId>com.pica.cloud.online.exam</groupId>
             <artifactId>pica-cloud-analysis-common</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.8</version>
             <scope>compile</scope>
         </dependency>
 

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -603,21 +603,24 @@ public class AnalysisController {
             /**
              * 转换格式
              */
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat outFormat = new SimpleDateFormat("yyyy-M-d");
             roundExamTitleV2Dto.setAnalysisId(roundExamTitleDto.getAnalysisId());
             roundExamTitleV2Dto.setRoundId(roundExamTitleDto.getRoundId());
-            roundExamTitleV2Dto.setStartTime(roundExamTitleDto.getStartTime());
-            roundExamTitleV2Dto.setEndTime(roundExamTitleDto.getEndTime());
+            roundExamTitleV2Dto.setStartTime(outFormat.format(sdf.parse(roundExamTitleDto.getStartTime())));
+            roundExamTitleV2Dto.setEndTime(outFormat.format(sdf.parse(roundExamTitleDto.getEndTime())));
             roundExamTitleV2Dto.setTotalCount(roundExamTitleDto.getTotalCount());
             roundExamTitleV2Dto.setPublished(roundExamTitleDto.getPublished());
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if ((new Date()).getTime() > sdf.parse(roundExamTitleDto.getEndTime()).getTime()) {
+                roundExamTitleV2Dto.setRemainingTime("");
                 roundExamTitleV2Dto.setIsFinished(1);
                 roundExamTitleV2Dto.setElectedStarCount(analysisService.getElectedStarCountByRoundId(roundId));
 
                 Integer doctorId = analysisService.getElectedDoctorIdByRoundId(roundId);
                 roundExamTitleV2Dto.setElectedDoctor(doctorService.getDoctorDtoById(doctorId));
             } else {
+                roundExamTitleV2Dto.setRemainingTime(DateUtils.remainingTime(sdf.parse(roundExamTitleDto.getEndTime())));
                 roundExamTitleV2Dto.setIsFinished(0);
                 roundExamTitleV2Dto.setElectedDoctor(new DoctorDto());
             }