Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -234,7 +234,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 List<UserMockRecord> userMockRecordList = iUserMockRecordService.list(lqw);
                 if (userMockRecordList != null && userMockRecordList.size() > 0) {
                     userMockSubscribeVo.setDoNum(userMockRecordList.size());
-                    userMockSubscribeVo.setFirstScore(userMockRecordList.get(0).getTotalScore());
+                    userMockSubscribeVo.setFirstScore(userMockRecordList.get(0).getPerformance().add(userMockRecordList.get(0).getScore()));
                     userMockSubscribeVo.setFirstSubjectiveScore(userMockRecordList.get(0).getScore() == null ? 0 : 1);
                 }
             });

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -228,7 +228,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN mock_major_subject mms ON mm.mock_major_id = mms.mock_major_id
         WHERE
             unix_timestamp(now()) < ma.apply_end_time
-            AND unix_timestamp(now()) > ma.apply_start_time
             AND ma.mock_remind = 0
     </select>
     <select id="mockLiving" parameterType="java.lang.Long" resultType="java.lang.String">