he2802 3 жил өмнө
parent
commit
ac8d350b8d

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamNumberMapper.java

@@ -24,5 +24,5 @@ public interface ExamNumberMapper extends BaseMapper<ExamNumber> {
 
     Integer selectApplyBefore(Long goodsId);
 
-    List<ExamNumber> selectUpExamNum();
+    List<ExamNumberVo> selectUpExamNum();
 }

+ 18 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -29,6 +29,7 @@ import com.zhongzheng.modules.exam.mapper.ExamBeforeMapper;
 import com.zhongzheng.modules.exam.mapper.ExamNumberMapper;
 import com.zhongzheng.modules.exam.vo.ExamApplyVo;
 import com.zhongzheng.modules.exam.vo.ExamBeforeVo;
+import com.zhongzheng.modules.exam.vo.ExamNumberVo;
 import com.zhongzheng.modules.exam.vo.ExamUserApplyVo;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -740,9 +741,23 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     @Override
     public void UpExamNum(UserQueryBo bo) {
-        List<ExamNumber> examNumbers = examNumberMapper.selectUpExamNum();
-        for (ExamNumber examNumber : examNumbers) {
-            
+        List<ExamNumberVo> examNumbers = examNumberMapper.selectUpExamNum();
+        for (ExamNumberVo examNumber : examNumbers) {
+            UserExamGoods add = new UserExamGoods();
+            add.setGoodsId(examNumber.getGoodsIds());
+            add.setUserId(examNumber.getUserId());
+            add.setExamNumber(examNumber.getExamNumber());
+            add.setDoNumber(examNumber.getDoNumber());
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            userExamGoodsService.save(add);
+            UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
+            userExamGoodsSupplementAddBo.setGoodsId(examNumber.getGoodsIds());
+            userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
+            userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
+            userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
+            userExamGoodsSupplementAddBo.setStatus(3);
+            userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
         }
     }
 

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -172,5 +172,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.section_id=#{typeId}
           and up.exam_id=#{examId}
           AND ups.period_status =1
+          and ups.record_end_time is not null
     </select>
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -184,5 +184,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.chapter_id=0
           and up.section_id=#{sectionId}
           AND ups.period_status =1
+          and ups.record_end_time is not null
     </select>
 </mapper>

+ 4 - 4
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamNumberMapper.xml

@@ -92,13 +92,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUpExamNum" resultMap="ExamNumberVoResult">
         SELECT
         en.*,
-        o.user_id,
+        od.user_id,
         eng.goods_id
         FROM
-        exam_number_goods eng
+        `order` od
+        LEFT JOIN order_goods og on od.order_sn = og.order_sn
+        LEFT JOIN exam_number_goods eng  on eng.goods_id = og.goods_id
         LEFT JOIN exam_number en ON eng.exam_number_id = en.exam_number_id
-        LEFT JOIN order_goods og on eng.goods_id = og.goods_id
-        LEFT JOIN `order` o on o.order_sn = og.order_sn
         where en.`status` = 1
         and og.`status` = 1
         and og.refund_status in (0,1,3)