我的学时

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CoursePeriodController.java

@@ -1,7 +1,10 @@
 package com.zhongzheng.controller.course;
 
+import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.*;
 import com.zhongzheng.framework.web.service.WxTokenService;
@@ -14,15 +17,14 @@ import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeCertificateEditBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +49,6 @@ public class CoursePeriodController extends BaseController {
      * 查询用户拥有商品的学时记录
      */
     @ApiOperation("查询用户拥有商品的学时记录")
-    @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/listGoods")
     public TableDataInfo<GoodsPeriodVo> listGoods(UserPlanQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
@@ -60,8 +61,7 @@ public class CoursePeriodController extends BaseController {
      * 查询学习计划列表
      */
     @ApiOperation("查看班级作弊重学详细情况")
-    @PreAuthorize("@ss.hasPermi('system:plan:list')")
-    @GetMapping("/listSection")
+    @GetMapping("/cheat")
     public TableDataInfo<GoodsPeriodStatusVo> listSection(ClassGradeUserQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
@@ -69,5 +69,15 @@ public class CoursePeriodController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 修改用户预约考试
+     */
+    @ApiOperation("确认重学")
+    @Log(title = "确认重学", businessType = BusinessType.UPDATE)
+    @PostMapping("rebuild")
+    public AjaxResult<Void> editRebuild(@RequestBody ClassGradeUserQueryBo bo) {
+        return toAjax(courseService.editRebuild(bo) ? 1 : 0);
+    }
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseService.java

@@ -62,4 +62,6 @@ public interface ICourseService extends IService<Course> {
     List<GoodsPeriodVo> listGoodsPeriodVo(UserPlanQueryBo bo);
 
 	List<GoodsPeriodStatusVo> listSection(ClassGradeUserQueryBo bo);
+
+    boolean editRebuild(ClassGradeUserQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -20,6 +20,9 @@ import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.vo.GoodsPeriodStatusVo;
 import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
+import com.zhongzheng.modules.grade.bo.UserPeriodStatusAddBo;
+import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
@@ -33,6 +36,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -52,6 +56,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Autowired
     private CourseMapper courseMapper;
 
+    @Autowired
+    private IUserPeriodStatusService userPeriodStatusService;
+
     @Autowired
     private IUserStudyRecordPhotoService userStudyRecordPhotoService;
 
@@ -196,6 +203,22 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         }
         return goodsPeriodStatusVos;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean editRebuild(ClassGradeUserQueryBo bo) {
+        List<GoodsPeriodStatusVo> goodsPeriodStatusVos = baseMapper.listSection(bo);
+        for (GoodsPeriodStatusVo goodsPeriodStatusVo : goodsPeriodStatusVos) {
+            UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
+            userPeriodStatus.setId(goodsPeriodStatusVo.getId());
+            userPeriodStatus.setPeriodStatus(0);
+            userPeriodStatusService.updateById(userPeriodStatus);
+            UserPeriodStatusAddBo userPeriodStatusAddBo = new UserPeriodStatusAddBo();
+            userPeriodStatusService.insertByAddBo(userPeriodStatusAddBo);
+        }
+        return true;
+    }
+
     private List<UserStudyRecordPhotoVo> entity2PhotoVo(Collection<UserStudyRecordPhoto> collection) {
         List<UserStudyRecordPhotoVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, UserStudyRecordPhotoVo.class))

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPeriodStatusVo.java

@@ -35,6 +35,11 @@ public class GoodsPeriodStatusVo {
 	@ApiModelProperty("1 节 2卷")
 	private Long type;
 
+	/** 1 节 2卷 */
+	@Excel(name = "1 节 2卷")
+	@ApiModelProperty("1 节 2卷")
+	private Long periodId;
+
 	/** 拍照详情 */
 	@Excel(name = "拍照详情")
 	@ApiModelProperty("拍照详情")

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -232,6 +232,7 @@
     <select id="listSection" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"  resultMap="CourseResultVo">
         SELECT
             ups.id,
+            ups.period_id,
             cs.`name`,
             1 as type
         FROM

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="studentType != null and studentType != '' ">
             and us.student_type = #{studentType}
         </if>
-        <if test="examStatus != null and examStatus != '' ">
+        <if test="examStatus != null ">
             and us.exam_status = #{examStatus}
         </if>
         <if test="majorId != null and majorId != '' ">