fix: 日期显示 回复为空时userid为空异常

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

@@ -640,10 +640,10 @@ public class AnalysisController {
             System.out.println("myStar: user == null, token=" + token);
             return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
         }
-        if (!rankingListService.isRankingInTop200(user.getId())) {
+        /*if (!rankingListService.isRankingInTop200(user.getId())) {
             return ReturnUtil.getPicaResponse(PicaResultCode.PERMISSION_NO_ACCESS);
         }
-
+*/
         if (roundId != null)
             System.out.println("myStar: roundId=" +  roundId.toString() + " token=" + token);
 
@@ -668,19 +668,21 @@ public class AnalysisController {
          */
         if ((new Date()).getTime() > analysisRound.getEndTime().getTime()) {
             myStarDto.setIsFinished(1);
+
+            /**
+             * 设置我是否当选
+             */
+            Integer electedDoctorId = analysisService.getElectedDoctorIdByRoundId(roundId);
+            myStarDto.setIsElected(electedDoctorId.intValue() == user.getId().intValue() ? 1 : 0);
         } else {
             myStarDto.setIsFinished(0);
+            myStarDto.setIsElected(0);
         }
 
         /**
          * 设置我的得赞数
          */
         myStarDto.setMyStarCount(analysisService.getStarCountByRoundIdAndDoctorId(roundId, user.getId()));
-        /**
-         * 设置我是否当选
-         */
-        Integer electedDoctorId = analysisService.getElectedDoctorIdByRoundId(roundId);
-        myStarDto.setIsElected(electedDoctorId.intValue() == user.getId().intValue() ? 1 : 0);
 
         /**
          * 我的解析得赞记录

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCAnalysisServiceImpl.java

@@ -613,6 +613,8 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
             }
             userExamTitleDto.setIsReplied(isReplied ? 1 : 0);
             userExamTitleDto.setStarCount(starCount);
+
+            userExamTitleDtos.add(userExamTitleDto);
         }
 
         return userExamTitleDtos;

server/src/main/java/com/pica/cloud/online/exam/analysis/server/utils/DateUtils.java

@@ -40,7 +40,7 @@ public class DateUtils {
     public static String remainingTime(Date date) {
         long time = date.getTime() / 1000;
         long now = (new Date()).getTime() / 1000;
-        long interval = now - time;
+        long interval = time - now;
 
         if (interval < 0)
             return "";

server/src/main/resources/mybatis/ReplyMapper.xml

@@ -98,7 +98,7 @@
 
   <select id="selectElectedDoctorIdByExamTitleIdList" resultType="java.lang.Integer">
     select
-     user_id
+     ifnull(user_id,0)
     from p_reply
     where analysis_round_exam_title_id in
     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
@@ -112,7 +112,7 @@
 
   <select id="selectStarCountByParam" resultType="java.lang.Integer">
     select
-      sum(star_count)
+      ifnull(sum(star_count),0)
     from p_reply
     where analysis_round_exam_title_id in
     <foreach item="item" index="index" collection="examTitleList" open="(" separator="," close=")">