submit

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

@@ -2153,7 +2153,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     }
                 }
                 if (ObjectUtils.isNotNull(vo.getApplySiteExamTime())){
-                    String format = String.format("%s %s-%s", DateUtils.timestampToDateFormat(vo.getApplySiteExamTime()), "yyyy-MM-dd", vo.getApplySiteStartTime(), vo.getApplySiteEndTime());
+                    String format = String.format("%s %s-%s", DateUtils.timestampToDateFormat(vo.getApplySiteExamTime(), "yyyy-MM-dd"), vo.getApplySiteStartTime(), vo.getApplySiteEndTime());
                     item.setApplyTime(format);
                 }
                 if (ObjectUtils.isNotNull(vo.getSubscribeId())){

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

@@ -48,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                   AND type = 3
             ) a
                 LEFT JOIN exam e ON a.exam_id = e.exam_id
-            exam e
                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
         WHERE
             e.exam_paper_id IS NOT NULL AND ep.`status` != -1
@@ -104,56 +103,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getGoodsExamPaperByGoodsIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">
-        SELECT
-            ep.paper_id,
-            ga.goods_id,
-            ep.paper_name
-        FROM goods_attached ga
-                 LEFT JOIN question_module_chapter qmc ON ga.major_id = qmc.module_exam_id
-                 LEFT JOIN question_chapter_exam qce ON qmc.chapter_exam_id = qce.chapter_exam_id
-                 LEFT JOIN exam e ON qce.exam_id = e.exam_id
-                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
-        WHERE ga.type = 1
-        <if test="goodsIds != null and goodsIds.size()!=0 ">
-            AND ga.goods_id in
-            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        UNION ALL
-        SELECT
-            ep.paper_id,
-            ga.goods_id,
-            ep.paper_name
-        FROM goods_attached ga
-                 LEFT JOIN question_chapter_exam qce ON ga.major_id = qce.chapter_exam_id
-                 LEFT JOIN exam e ON qce.exam_id = e.exam_id
-                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
-        WHERE ga.type = 2
-        <if test="goodsIds != null and goodsIds.size()!=0 ">
-            AND ga.goods_id in
-            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        UNION ALL
-        SELECT
-            ep.paper_id,
-            ga.goods_id,
-            ep.paper_name
-        FROM goods_attached ga
-                 LEFT JOIN exam e ON ga.major_id = e.exam_id
-                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
-        WHERE ga.type = 3
-        <if test="goodsIds != null and goodsIds.size()!=0 ">
-            AND ga.goods_id in
-            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-    </select>
-
     <select id="getGoodsExamPaperByGoodsId" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">
         SELECT
         ep.paper_id,