等级积分修改

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityGradeController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  * @author change
  * @date 2021-05-19
  */
-@Api(value = "等级积分控制器", tags = {"等级积分管理"})
+@Api(value = "等级控制器", tags = {"等级管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/grade")
@@ -45,7 +45,7 @@ public class ActivityGradeController extends BaseController {
     /**
      * 查询等级积分列表
      */
-    @ApiOperation("查询等级积分列表")
+    @ApiOperation("查询等级管理列表")
     @PreAuthorize("@ss.hasPermi('system:grade:list')")
     @GetMapping("/list")
     public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
@@ -70,7 +70,7 @@ public class ActivityGradeController extends BaseController {
     /**
      * 获取等级积分详细信息
      */
-    @ApiOperation("获取等级积分详细信息")
+    @ApiOperation("获取等级管理详细信息")
     @PreAuthorize("@ss.hasPermi('system:grade:query')")
     @GetMapping("/{id}")
     public AjaxResult<ActivityGradeVo> getInfo(@PathVariable("id" ) Long id) {

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
  * @author change
  * @date 2021-05-19
  */
-@Api(value = "考试安排，包含考试指引控制器", tags = {"考试安排，包含考试指引管理"})
+@Api(value = "考试安排，学员计划，考试指南", tags = {"考试安排，学员计划，考试指南"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/modules.exam/arrangement")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeAddBo.java

@@ -26,15 +26,13 @@ public class ActivityGradePrivilegeAddBo {
     /** 关联积分表id */
     @ApiModelProperty("关联积分表id")
     private Long gradeId;
-    /** 特权类型 */
-    @ApiModelProperty("特权类型")
+    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
+    @ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
     private String priType;
-    /** 优惠券金额 */
-    @ApiModelProperty("优惠券金额")
+    /** 优惠券金额或折扣 */
+    @ApiModelProperty("优惠券金额或折扣")
     private Long couponPrice;
-    /** 折扣 */
-    @ApiModelProperty("折扣")
-    private Integer discount;
+
     /** 有效期几个月 */
     @ApiModelProperty("有效期几个月")
     private Integer endTimeSum;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeEditBo.java

@@ -26,17 +26,14 @@ public class ActivityGradePrivilegeEditBo {
     @ApiModelProperty("关联积分表id")
     private Long gradeId;
 
-    /** 特权类型 */
-    @ApiModelProperty("特权类型")
+    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
+    @ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
     private String priType;
 
     /** 优惠券金额 */
-    @ApiModelProperty("优惠券金额")
+    @ApiModelProperty("优惠券金额或折扣")
     private Long couponPrice;
 
-    /** 折扣 */
-    @ApiModelProperty("折扣")
-    private Integer discount;
 
     /** 有效期几个月 */
     @ApiModelProperty("有效期几个月")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeQueryBo.java

@@ -39,15 +39,12 @@ public class ActivityGradePrivilegeQueryBo extends BaseEntity {
 	/** 关联积分表id */
 	@ApiModelProperty("关联积分表id")
 	private Long gradeId;
-	/** 特权类型 */
-	@ApiModelProperty("特权类型")
+	/** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
+	@ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
 	private String priType;
 	/** 优惠券金额 */
-	@ApiModelProperty("优惠券金额")
+	@ApiModelProperty("优惠券金额或折扣")
 	private Long couponPrice;
-	/** 折扣 */
-	@ApiModelProperty("折扣")
-	private Integer discount;
 	/** 有效期几个月 */
 	@ApiModelProperty("有效期几个月")
 	private Integer endTimeSum;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilege.java

@@ -32,10 +32,10 @@ private static final long serialVersionUID=1L;
     /** 关联积分表id */
     private Long gradeId;
 
-    /** 特权类型 */
+    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
     private String priType;
 
-    /** 优惠券金额 */
+    /** 优惠券金额或折扣 */
     private Long couponPrice;
 
     /** 折扣 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -74,6 +74,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         //新增活动
         ActivityConfiguration activityConfiguration = BeanUtil.toBean(bo, ActivityConfiguration.class);
         activityConfiguration.setCreateTime(DateUtils.getNowTime());
+        activityConfiguration.setUpdateTime(DateUtils.getNowTime());
         int insert = baseMapper.insert(activityConfiguration);
         if (bo.getCoursesId() != null) {
             //绑定课程
@@ -95,6 +96,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ActivityConfigurationEditBo bo) {
         ActivityConfiguration update = BeanUtil.toBean(bo, ActivityConfiguration.class);
+        update.setUpdateTime(DateUtils.getNowTime());
         //修改绑定课程
         if (bo.getCoursesId() != null){
             updateConfigCourse(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradePrivilegeServiceImpl.java

@@ -41,7 +41,6 @@ public class ActivityGradePrivilegeServiceImpl extends ServiceImpl<ActivityGrade
         lqw.eq(bo.getGradeId() != null, ActivityGradePrivilege::getGradeId, bo.getGradeId());
         lqw.eq(StrUtil.isNotBlank(bo.getPriType()), ActivityGradePrivilege::getPriType, bo.getPriType());
         lqw.eq(bo.getCouponPrice() != null, ActivityGradePrivilege::getCouponPrice, bo.getCouponPrice());
-        lqw.eq(bo.getDiscount() != null, ActivityGradePrivilege::getDiscount, bo.getDiscount());
         lqw.eq(bo.getEndTimeSum() != null, ActivityGradePrivilege::getEndTimeSum, bo.getEndTimeSum());
         lqw.eq(bo.getQuantity() != null, ActivityGradePrivilege::getQuantity, bo.getQuantity());
         return entity2Vo(this.list(lqw));

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -140,6 +140,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ActivityGradeEditBo bo) {
         ActivityGrade update = BeanUtil.toBean(bo, ActivityGrade.class);
+        update.setUpdateTime(DateUtils.getNowTime());
         validEntityBeforeSave(update);
         //修改特权类型
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
 import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
 import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
@@ -119,6 +120,8 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     public Boolean insertByAddBo(ActivityTaskAddBo bo) {
         ActivityTask add = BeanUtil.toBean(bo, ActivityTask.class);
         validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
         boolean save = this.save(add);
         if (bo.getTaskType() != null && bo.getTaskType() == 5){
             bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(add.getId())));
@@ -130,6 +133,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ActivityTaskEditBo bo) {
         ActivityTask update = BeanUtil.toBean(bo, ActivityTask.class);
+        update.setUpdateTime(DateUtils.getNowTime());
         validEntityBeforeSave(update);
         //活动为考试时有分数区域得到等级分数
         if (bo.getTaskType() != null && bo.getTaskType() == 5){

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradePrivilegeVo.java

@@ -30,18 +30,14 @@ public class ActivityGradePrivilegeVo {
 	@Excel(name = "关联积分表id")
 	@ApiModelProperty("关联积分表id")
 	private Long gradeId;
-	/** 特权类型 */
-	@Excel(name = "特权类型")
+	/** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
+	@Excel(name = "特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
 	@ApiModelProperty("特权类型")
 	private String priType;
 	/** 优惠券金额 */
-	@Excel(name = "优惠券金额")
-	@ApiModelProperty("优惠券金额")
+	@Excel(name = "优惠券金额或折扣")
+	@ApiModelProperty("优惠券金额或折扣")
 	private Long couponPrice;
-	/** 折扣 */
-	@Excel(name = "折扣")
-	@ApiModelProperty("折扣")
-	private Integer discount;
 	/** 有效期几个月 */
 	@Excel(name = "有效期几个月")
 	@ApiModelProperty("有效期几个月")

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementGuideServiceImpl.java

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.exam.domain.ExamArrangementGuide;
 import com.zhongzheng.modules.exam.mapper.ExamArrangementGuideMapper;
 import com.zhongzheng.modules.exam.vo.ExamArrangementGuideVo;
 import com.zhongzheng.modules.exam.service.IExamArrangementGuideService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -69,6 +70,7 @@ public class ExamArrangementGuideServiceImpl extends ServiceImpl<ExamArrangement
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ExamArrangementGuideAddBo bo) {
         ExamArrangementGuide add = BeanUtil.toBean(bo, ExamArrangementGuide.class);
         validEntityBeforeSave(add);
@@ -78,6 +80,7 @@ public class ExamArrangementGuideServiceImpl extends ServiceImpl<ExamArrangement
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ExamArrangementGuideEditBo bo) {
         ExamArrangementGuide update = BeanUtil.toBean(bo, ExamArrangementGuide.class);
         validEntityBeforeSave(update);
@@ -92,6 +95,11 @@ public class ExamArrangementGuideServiceImpl extends ServiceImpl<ExamArrangement
      */
     private void validEntityBeforeSave(ExamArrangementGuide entity){
         //TODO 做一些数据校验,如唯一约束
+        LambdaQueryWrapper<ExamArrangementGuide> lqw = Wrappers.lambdaQuery();
+        lqw.eq(entity.getExamTypeId() != null, ExamArrangementGuide::getExamTypeId, entity.getExamTypeId());
+        if (this.list(lqw).size() > 0){
+            throw new RuntimeException("关联考试类型重复，已有此考试类型");
+        }
     }
 
     @Override

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -31,8 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime" column="end_time"/>
         <result property="price" column="price"/>
         <result property="quantity" column="quantity"/>
-        <result property="validityTime" column="validity_time"/>
-        <result property="discount" column="discount"/>
         <result property="liveContent" column="live_content"/>
         <result property="liveAdress" column="live_adress"/>
         <result property="createTime" column="create_time"/>
@@ -121,55 +119,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN activity_configuration_course f ON c.id = f.configuration_id
         LEFT JOIN course s ON f.configuration_id = s.course_id
         WHERE 1=1
-        <if test="id != null" >
-            and c.id = #{id,jdbcType=INTEGER}
-        </if>
-        <if test="activityName != null" >
-            and c.activity_name = #{activityName,jdbcType=VARCHAR}
-        </if>
-        <if test="activityType != null" >
-            and c.activity_type = #{activityType,jdbcType=VARCHAR}
-        </if>
-        <if test="description != null" >
-            and c.description = #{description,jdbcType=VARCHAR}
-        </if>
-        <if test="startTime != null" >
-            and c.start_time = #{startTime,jdbcType=INTEGER}
-        </if>
-        <if test="endTime != null" >
-            and c.end_time = #{endTime,jdbcType=INTEGER}
-        </if>
-        <if test="price != null" >
-            and c.price = #{price,jdbcType=DECIMAL}
-        </if>
-        <if test="quantity != null" >
-            and c.quantity = #{quantity,jdbcType=INTEGER}
-        </if>
-        <if test="validityTime != null" >
-            and c.validity_time = #{validityTime,jdbcType=INTEGER}
-        </if>
-        <if test="discount != null" >
-            and c.discount = #{discount,jdbcType=VARCHAR}
-        </if>
-        <if test="liveContent != null" >
-            and c.live_content = #{liveContent,jdbcType=VARCHAR}
-        </if>
-        <if test="liveAdress != null" >
-            and c.live_adress = #{liveAdress,jdbcType=VARCHAR}
-        </if>
-        <if test="createTime != null" >
-            and c.create_time = #{createTime,jdbcType=INTEGER}
-        </if>
-        <if test="updateTime != null" >
-            and c.update_time = #{updateTime,jdbcType=INTEGER}
-        </if>
-        <choose>
-            <when test="status !=null and status != ''">
-                and c.status = #{status,jdbcType=TINYINT}
-            </when>
-            <otherwise>
-                and c.status != 0
-            </otherwise>
-        </choose>
+        and c.id = #{id,jdbcType=INTEGER}
     </select>
 </mapper>