fix 订单

run-admin-prod.sh

@@ -62,36 +62,3 @@ docker run \
 -d ${group_admin_name_two}/${app_admin_name_two}:${app_admin_version_two}
 echo '----start container admin----'
 
-
-echo "开始等待20秒..."
-sleep 5
-echo "等待后继续"
-
-# 定义应用组名
-group_admin_name_three='zhongzheng_three'
-# 定义应用名称
-app_admin_name_three='zhongzheng-admin_three'
-# 定义应用版本
-app_admin_version_three='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active_three='prod'
-echo '----copy jar admin----'
-docker stop ${app_admin_name_three}
-echo '----stop container admin----'
-docker rm ${app_admin_name_three}
-echo '----rm container admin----'
-docker rmi ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three}
-echo '----rm image admin----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-admin -t ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three} .
-echo '----build image admin----'
-docker run \
--p 10001:9099 \
---name ${app_admin_name_three} \
---restart=always \
--e 'spring.profiles.active'=${profile_active_three} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/${app_admin_name_three}/logs:/var/logs \
--d ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three}
-echo '----start container admin----'

run-admin.sh

@@ -64,37 +64,3 @@ docker run \
 -d ${group_admin_name_two}/${app_admin_name_two}:${app_admin_version_two}
 echo '----start container admin----'
 
-
-echo "开始等待20秒..."
-sleep 5
-echo "等待后继续"
-
-# 定义应用组名
-group_admin_name_three='zhongzheng_three'
-# 定义应用名称
-app_admin_name_three='zhongzheng-admin_three'
-# 定义应用版本
-app_admin_version_three='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active_three='dev'
-echo '----copy jar admin----'
-docker stop ${app_admin_name_three}
-echo '----stop container admin----'
-docker rm ${app_admin_name_three}
-echo '----rm container admin----'
-docker rmi ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three}
-echo '----rm image admin----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-admin -t ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three} .
-echo '----build image admin----'
-docker run \
--p 10001:9099 \
---name ${app_admin_name_three} \
---restart=always \
---link mysql:db \
--e 'spring.profiles.active'=${profile_active_three} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/${app_admin_name_three}/logs:/var/logs \
--d ${group_admin_name_three}/${app_admin_name_three}:${app_admin_version_three}
-echo '----start container admin----'

run-prod.sh

@@ -58,37 +58,3 @@ docker run -p 8090:8088 --name ${app_name_two} \
 -v /mydata/app/${app_name_two}_two/logs:/var/logs \
 -d ${group_name_two}/${app_name_two}:${app_version_two}
 echo '----start container----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 20
-echo "等待后继续"
-
-
-#!/usr/bin/env bash
-# 定义应用组名
-group_name_three='zhongzheng_three'
-# 定义应用名称
-app_name_three='zhongzheng-api_three'
-# 定义应用版本
-app_version_three='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active_three='prod'
-echo '----copy jar----'
-docker stop ${app_name_three}
-echo '----stop container----'
-docker rm ${app_name_three}
-echo '----rm container----'
-docker rmi ${group_name_three}/${app_name_three}:${app_version_three}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name_three}/${app_name_three}:${app_version_three} .
-echo '----build image----'
-docker run -p 8091:8088 --name ${app_name_three} \
---restart=always \
--e 'spring.profiles.active'=${profile_active_three} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/${app_name_three}/logs:/var/logs \
--d ${group_name_three}/${app_name_three}:${app_version_three}
-echo '----start container----'

run.sh

@@ -60,38 +60,3 @@ docker run -p 8090:8088 --name ${app_name_two} \
 -v /mydata/app/${app_name_two}_two/logs:/var/logs \
 -d ${group_name_two}/${app_name_two}:${app_version_two}
 echo '----start container----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
-
-#!/usr/bin/env bash
-# 定义应用组名
-group_name_three='zhongzheng_three'
-# 定义应用名称
-app_name_three='zhongzheng-api_three'
-# 定义应用版本
-app_version_three='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active_three='dev'
-echo '----copy jar----'
-docker stop ${app_name_three}
-echo '----stop container----'
-docker rm ${app_name_three}
-echo '----rm container----'
-docker rmi ${group_name_three}/${app_name_three}:${app_version_three}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name_three}/${app_name_three}:${app_version_three} .
-echo '----build image----'
-docker run -p 8091:8088 --name ${app_name_three} \
---restart=always \
---link mysql:db \
--e 'spring.profiles.active'=${profile_active_three} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/${app_name_three}/logs:/var/logs \
--d ${group_name_three}/${app_name_three}:${app_version_three}
-echo '----start container----'

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

@@ -50,8 +50,8 @@ public class ActivityGradeController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
         startPage();
-        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
-        return getDataTable(list);
+        TableDataInfo<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        return list;
     }
 
     /**

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

@@ -36,12 +36,13 @@ public class ActivityGradeController extends BaseController {
     /**
      * 查询等级积分列表
      */
-    @ApiOperation("查询等级列表")
+    @ApiOperation("查询等级管理列表")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
     @GetMapping("/list")
     public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
         startPage();
-        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
-        return getDataTable(list);
+        TableDataInfo<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        return list;
     }
 
 

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

@@ -25,10 +25,10 @@ public class ActivityTaskAddBo {
             "4视频学习 5模拟考试")
     private Integer taskType;
     /** 奖励积分 */
-    @ApiModelProperty("奖励积分")
+    @ApiModelProperty("奖励积分或初始积分")
     private Integer startIntegral;
     /** 积分上限 */
-    @ApiModelProperty("积分上限")
+    @ApiModelProperty("签到积分上限")
     private Integer endIntegral;
     /** 备注 */
     @ApiModelProperty("备注")
@@ -37,13 +37,13 @@ public class ActivityTaskAddBo {
     @ApiModelProperty("说明")
     private String description;
     /** 累加积分 */
-    @ApiModelProperty("累加积分")
+    @ApiModelProperty("增加加积分")
     private Integer accIntegral;
     /** 最短视频时间分钟单位 */
-    @ApiModelProperty("最短视频时间分钟单位")
+    @ApiModelProperty("最短时长")
     private Integer longTime;
     /** 每天奖励次数 */
-    @ApiModelProperty("每天奖励次数")
+    @ApiModelProperty("每日分享或模拟考试奖励次数")
     private Integer countDay;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
@@ -59,4 +59,9 @@ public class ActivityTaskAddBo {
     @Excel(name = "分数范围 适用与考试积分获得")
     @ApiModelProperty("分数范围 适用与考试积分获得")
     private List<ActivityTaskTimeAddBo> activityTaskTimeAddBo;
+
+    /** 最低分数 */
+    @Excel(name = "最低分数")
+    @ApiModelProperty("最低分数")
+    private Integer minNum;
 }

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

@@ -30,11 +30,11 @@ public class ActivityTaskEditBo {
     private Integer taskType;
 
     /** 奖励积分 */
-    @ApiModelProperty("奖励积分")
+    @ApiModelProperty("奖励积分或初始积分")
     private Integer startIntegral;
 
     /** 积分上限 */
-    @ApiModelProperty("积分上限")
+    @ApiModelProperty("签到积分上限")
     private Integer endIntegral;
 
     /** 备注 */
@@ -46,15 +46,15 @@ public class ActivityTaskEditBo {
     private String description;
 
     /** 累加积分 */
-    @ApiModelProperty("累加积分")
+    @ApiModelProperty("增加加积分")
     private Integer accIntegral;
 
     /** 最短视频时间分钟单位 */
-    @ApiModelProperty("最短视频时间分钟单位")
+    @ApiModelProperty("最短时长")
     private Integer longTime;
 
     /** 每天奖励次数 */
-    @ApiModelProperty("每天奖励次数")
+    @ApiModelProperty("每日分享或模拟考试奖励次数")
     private Integer countDay;
 
     /** 修改时间 */
@@ -69,4 +69,9 @@ public class ActivityTaskEditBo {
     @Excel(name = "分数范围 适用与考试积分获得")
     @ApiModelProperty("分数范围 适用与考试积分获得")
     private List<ActivityTaskTimeEditBo> activityTaskTimeEditBoList;
+
+    /** 最低分数 */
+    @Excel(name = "最低分数")
+    @ApiModelProperty("最低分数")
+    private Integer minNum;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,10 +42,10 @@ public class ActivityTaskQueryBo extends BaseEntity {
 			"4视频学习 5模拟考试")
 	private Integer taskType;
 	/** 奖励积分 */
-	@ApiModelProperty("奖励积分")
+	@ApiModelProperty("奖励积分或初始积分")
 	private Integer startIntegral;
 	/** 积分上限 */
-	@ApiModelProperty("积分上限")
+	@ApiModelProperty("签到积分上限")
 	private Integer endIntegral;
 	/** 备注 */
 	@ApiModelProperty("备注")
@@ -53,13 +54,13 @@ public class ActivityTaskQueryBo extends BaseEntity {
 	@ApiModelProperty("说明")
 	private String description;
 	/** 累加积分 */
-	@ApiModelProperty("累加积分")
+	@ApiModelProperty("增加加积分")
 	private Integer accIntegral;
 	/** 最短视频时间分钟单位 */
-	@ApiModelProperty("最短视频时间分钟单位")
+	@ApiModelProperty("最短时长")
 	private Integer longTime;
 	/** 每天奖励次数 */
-	@ApiModelProperty("每天奖励次数")
+	@ApiModelProperty("每日分享或模拟考试奖励次数")
 	private Integer countDay;
 	/** 0 停用 1启用 */
 	@ApiModelProperty("0 停用 1启用")
@@ -68,4 +69,8 @@ public class ActivityTaskQueryBo extends BaseEntity {
 	@ApiModelProperty("0 停用 1启用")
 	private Long userId;
 
+	/** 最低分数 */
+	@ApiModelProperty("最低分数")
+	private Integer minNum;
+
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -31,4 +32,8 @@ private static final long serialVersionUID=1L;
     /** 关联课程id */
     private Long courseId;
 
+
+    /** 所属类型 */
+    private Integer status;
+
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -50,7 +51,7 @@ private static final long serialVersionUID=1L;
     /** 最短视频时间分钟单位 */
     private Integer longTime;
 
-    /** 每天奖励次数 */
+    /** 每日分享或模拟考试奖励次数 */
     private Integer countDay;
 
     /** 创建时间 */
@@ -64,4 +65,7 @@ private static final long serialVersionUID=1L;
     /** 0 停用 1启用 */
     private Integer status;
 
+    /** 最低分数 */
+    private Integer minNum;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeCouresMapper.java

@@ -17,5 +17,5 @@ public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityG
      * @param setCourseId 课程绑定
      *
      */
-    void insertCouse(ActivityGradePrivilegeCoures setCourseId);
+    int insertCouse(ActivityGradePrivilegeCoures setCourseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeMapper.java

@@ -21,4 +21,6 @@ public interface ActivityGradePrivilegeMapper extends BaseMapper<ActivityGradePr
      *
      */
     List<ActivityGradePrivilegeVo> selectGradePriList(Long id);
+
+    void deleteByGrade(Long id);
 }

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

@@ -49,4 +49,6 @@ public interface IActivityGradePrivilegeService extends IService<ActivityGradePr
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void removeByGrade(Long id);
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
@@ -27,7 +28,7 @@ public interface IActivityGradeService extends IService<ActivityGrade> {
 	/**
 	 * 查询列表
 	 */
-	List<ActivityGradeVo> queryList(ActivityGradeQueryBo bo);
+	TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入等级积分

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

@@ -14,6 +14,7 @@ import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
 import com.zhongzheng.modules.activity.mapper.ActivityAdvertisingMapper;
 import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
 import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,6 +32,9 @@ import java.util.stream.Collectors;
 @Service
 public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
 
+    @Autowired
+    private IActivityAdvertisingService activityAdvertisingService;
+
     @Override
     public ActivityAdvertisingVo queryById(Long id){
         ActivityAdvertising db = this.baseMapper.selectById(id);
@@ -83,7 +87,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         add.setStatus(1);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add)?add.getId():0;
+        return activityAdvertisingService.save(add)?add.getId():0;
     }
 
     @Override
@@ -93,7 +97,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         ActivityAdvertisingVo activityAdvertisingVo = this.queryById(update.getId());
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        this.updateById(update);
+        activityAdvertisingService.updateById(update);
         return activityAdvertisingVo;
     }
 
@@ -111,7 +115,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityAdvertising> activityAdvertisingList = new ArrayList<>();
         ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return this.updateBatchById(activityAdvertisingList);
+        return activityAdvertisingService.updateBatchById(activityAdvertisingList);
     }
 
     @Override

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

@@ -49,6 +49,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Autowired
     private IActivityConfigurationCourseService activityConfigurationCourseService;
 
+    @Autowired
+    private  IActivityConfigurationService iActivityConfigurationService;
+
     @Override
     public ActivityConfigurationVo queryById(Long id){
         ActivityConfigurationVo activityConfigurationVo = baseMapper.selectConfigures(id);
@@ -132,7 +135,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         if (bo.getCoursesId() != null){
             updateConfigCourse(bo);
         }
-        return this.updateById(update);
+        return iActivityConfigurationService.updateById(update);
     }
 
     private void updateConfigCourse(ActivityConfigurationEditBo bo) {
@@ -158,7 +161,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityConfiguration> activityConfigurations = new ArrayList<>();
         ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return this.updateBatchById(activityConfigurations);
+        return iActivityConfigurationService.updateBatchById(activityConfigurations);
     }
 
     @Override

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

@@ -96,4 +96,9 @@ public class ActivityGradePrivilegeServiceImpl extends ServiceImpl<ActivityGrade
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void removeByGrade(Long id) {
+        baseMapper.deleteByGrade(id);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.*;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
@@ -54,6 +55,9 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private  IActivityGradeService iActivityGradeService;
+
     @Override
     public ActivityGradeVo queryById(Long id){
         ActivityGrade db = this.baseMapper.selectById(id);
@@ -63,7 +67,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     }
 
     @Override
-    public List<ActivityGradeVo> queryList(ActivityGradeQueryBo bo) {
+    public TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo) {
         LambdaQueryWrapper<ActivityGrade> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getGrade() != null, ActivityGrade::getGrade, bo.getGrade());
         lqw.like(StrUtil.isNotBlank(bo.getGradeName()), ActivityGrade::getGradeName, bo.getGradeName());
@@ -74,11 +78,12 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         List<ActivityGrade> list = this.list(lqw);
         List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
         List<ActivityGradeVo> activityGradeVos1 = entity2Vo(activityGradeVos);
-        for (ActivityGradeVo activityGradeVo : activityGradeVos1) {
-            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
-            activityGradeVo.setUserNum(num);
-        }
-        return activityGradeVos1;
+        TableDataInfo<ActivityGradeVo> listData = new TableDataInfo<>();
+        listData.setCode(200);
+        listData.setMsg("查询成功");
+        listData.setRows(activityGradeVos1);
+        listData.setTotal(baseMapper.selectCount(lqw));
+        return listData;
     }
 
     /**
@@ -96,7 +101,15 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
 
     private List<ActivityGradeVo> selectGradeCourse(List<ActivityGrade> list) {
         List<ActivityGradeVo> activityGradeVos = entity2GradeVo(list);
-        activityGradeVos.stream().forEach(a -> a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId())));
+        for (ActivityGradeVo activityGradeVo : activityGradeVos) {
+            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
+            activityGradeVo.setUserNum(num);
+        }
+        activityGradeVos.stream().forEach(a -> {
+            a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId()));
+
+        });
+
         return activityGradeVos;
     }
 
@@ -120,6 +133,14 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         return voList;
     }
 
+    public static void main(String[] args) {
+        String str = "[1,2]";
+        String substring = str.substring(1, 2);
+        String substring1 = str.substring(3, 4);
+        System.out.println("截取最后一个字符串生成的新字符串为: " + substring);//abcdef
+        System.out.println("截取最后一个字符串生成的新字符串为: " + substring1);//abcdef
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ActivityGradeAddBo bo) {
@@ -127,16 +148,25 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = this.save(add);
+        boolean save = iActivityGradeService.save(add);
         //添加特权类型
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeAddBos())) {
             bo.getActivityGradePrivilegeAddBos().stream().forEach(p ->{
                 ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
                 activityGradePrivilege.setGradeId(add.getId());
                 activityGradePrivilegeService.save(activityGradePrivilege);
-                Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                        .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
-                                .setCourseId(Convert.toLong(c))));
+                Arrays.stream(p.getCourseIds()).forEach(c -> {
+                    ActivityGradePrivilegeCoures activityGradePrivilegeCoures = new ActivityGradePrivilegeCoures();
+                    activityGradePrivilegeCoures.setPrivilegeId(activityGradePrivilege.getId());
+                    if ("2".equals(p.getPriType())){
+                        activityGradePrivilegeCoures.setStatus(2);
+                    }else {
+                        activityGradePrivilegeCoures.setStatus(1);
+                    }
+                    activityGradePrivilegeCoures.setCourseId(Convert.toLong(c));
+                    activityGradePrivilegeCouresMapper.insertCouse(activityGradePrivilegeCoures);
+
+                });
             });
         }
         //添加特权绑定的
@@ -150,34 +180,26 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         update.setUpdateTime(DateUtils.getNowTime());
         validEntityBeforeSave(update);
         //修改特权类型
+        activityGradePrivilegeService.removeByGrade(bo.getId());
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {
-            updateGradePrivilege(bo.getActivityGradePrivilegeEditBos());
+            updateGradePrivilege(bo);
         }
-        return this.updateById(update);
+        return iActivityGradeService.updateById(update);
     }
 
-    private void updateGradePrivilege(List<ActivityGradePrivilegeEditBo> activityGradePrivilegeEditBos) {
-        activityGradePrivilegeEditBos.stream().forEach(p ->{
-                //修改未删除
-                if (p.getId() != null && p.getStatus() == 1) {
-                    activityGradePrivilegeService.updateByEditBo(p);
-                    activityGradePrivilegeCouresService.removeById(p.getId());
-                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                            .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(p.getId())
-                                    .setCourseId(Convert.toLong(c))));
-                  //  增加
-                }else if(p.getId() == null){
+    private void updateGradePrivilege(ActivityGradeEditBo bo) {
+
+        bo.getActivityGradePrivilegeEditBos().stream().forEach(p ->{
+                //修改
                     ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
+                    activityGradePrivilege.setGradeId(bo.getId());
+                    activityGradePrivilege.setStatus(1);
                     activityGradePrivilegeService.save(activityGradePrivilege);
-                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                            .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
-                                    .setCourseId(Convert.toLong(c))));
-                    //删除
-                }else {
-                    ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
-                    activityGradePrivilegeService.removeById(activityGradePrivilege.getId());
-                }
-
+                    if (p.getCourseIds() != null ) {
+                        Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
+                                .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                                        .setCourseId(Convert.toLong(c))));
+                    }
             });
     }
 
@@ -195,7 +217,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityGrade> activityGradeArrayList = new ArrayList<>();
         ids.stream().forEach(id -> activityGradeArrayList.add(new ActivityGrade().setId(id)));
-        return this.updateBatchById(activityGradeArrayList);
+        return iActivityGradeService.updateBatchById(activityGradeArrayList);
     }
 
     @Override

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

@@ -44,6 +44,9 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     @Autowired
     private IActivityTaskUserService activityTaskUserService;
 
+    @Autowired
+    private IActivityTaskService iActivityTaskService;
+
     @Override
     public ActivityTaskVo queryById(Long id){
         ActivityTask db = this.baseMapper.selectById(id);
@@ -127,7 +130,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = this.save(add);
+        boolean save = iActivityTaskService.save(add);
         if (bo.getTaskType() != null && bo.getTaskType() == 5){
             bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(add.getId())));
         }
@@ -145,7 +148,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
             activityTaskTimeService.removeById(bo.getId());
             bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(bo.getId())));
         }
-        return this.updateById(update);
+        return iActivityTaskService.updateById(update);
     }
 
     /**
@@ -162,7 +165,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return this.removeByIds(ids);
+        return iActivityTaskService.removeByIds(ids);
     }
 
     @Override

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

@@ -49,7 +49,7 @@ public class ActivityGradePrivilegeVo {
 
 	@Excel(name = "关联优惠课程")
 	@ApiModelProperty("关联优惠课程")
-	private List<CourseVo> courseVo;
+	private List<Long> courseVo;
 
 	/** 0删除 1使用 */
 	@ApiModelProperty("0删除 1使用")

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

@@ -32,12 +32,12 @@ public class ActivityTaskVo {
 			"4视频学习 5模拟考试")
 	private Integer taskType;
 	/** 奖励积分 */
-	@Excel(name = "奖励积分")
-	@ApiModelProperty("奖励积分")
+	@Excel(name = "奖励积分或初始积分")
+	@ApiModelProperty("奖励积分或初始积分")
 	private Integer startIntegral;
 	/** 积分上限 */
-	@Excel(name = "积分上限")
-	@ApiModelProperty("积分上限")
+	@Excel(name = "签到积分上限")
+	@ApiModelProperty("签到积分上限")
 	private Integer endIntegral;
 	/** 备注 */
 	@Excel(name = "备注")
@@ -48,16 +48,16 @@ public class ActivityTaskVo {
 	@ApiModelProperty("说明")
 	private String description;
 	/** 累加积分 */
-	@Excel(name = "累加积分")
-	@ApiModelProperty("累加积分")
+	@Excel(name = "增加加积分")
+	@ApiModelProperty("增加加积分")
 	private Integer accIntegral;
 	/** 最短视频时间分钟单位 */
-	@Excel(name = "最短视频时间分钟单位")
-	@ApiModelProperty("最短视频时间分钟单位")
+	@Excel(name = "最短时长")
+	@ApiModelProperty("最短时长")
 	private Integer longTime;
 	/** 每天奖励次数 */
-	@Excel(name = "每天奖励次数")
-	@ApiModelProperty("每天奖励次数")
+	@Excel(name = "每日分享或模拟考试奖励次数")
+	@ApiModelProperty("每日分享或模拟考试奖励次数")
 	private Integer countDay;
 	/** 0 停用 1启用 */
 	@Excel(name = "0 停用 1启用")
@@ -73,4 +73,9 @@ public class ActivityTaskVo {
 	@ApiModelProperty("分数范围 适用与考试积分获得")
 	private List<ActivityTaskTimeVo> activityTaskTimeVo;
 
+
+	/** 最低分数 */
+	@Excel(name = "最低分数")
+	@ApiModelProperty("最低分数")
+	private Integer minNum;
 }

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

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.func.VoidFunc0;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.exam.bo.ExamArrangementTimeAddBo;
+import com.zhongzheng.modules.exam.bo.*;
 import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
 import com.zhongzheng.modules.exam.service.IExamArrangementStudentService;
 import com.zhongzheng.modules.exam.service.IExamArrangementTimeService;
@@ -19,9 +19,6 @@ 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 com.zhongzheng.modules.exam.bo.ExamArrangementAddBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
 import com.zhongzheng.modules.exam.domain.ExamArrangement;
 import com.zhongzheng.modules.exam.mapper.ExamArrangementMapper;
 import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
@@ -84,7 +81,14 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
     @Override
     public List<ExamArrangementVo> queryList(ExamArrangementQueryBo bo) {
         List<ExamArrangementVo> examArrangementVos1 = baseMapper.selectExamgement(bo);
+
         List<ExamArrangementVo> examArrangementVos = entity2Vo(examArrangementVos1);
+        examArrangementVos.stream().forEach(e -> {
+                    ExamArrangementTimeQueryBo examArrangementTimeQueryBo = new ExamArrangementTimeQueryBo();
+                    examArrangementTimeQueryBo.setArrangement_id(e.getId());
+                    e.setExamArrangementTimeVo(examArrangementTimeService.queryList(examArrangementTimeQueryBo));
+                }
+        );
         return examArrangementVos;
     }
 

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

@@ -9,13 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
     </resultMap>
 
-    <insert id="insertCouse" parameterType="map">
+    <insert id="insertCouse" parameterType="map" >
         insert into activity_grade_privilege_coures (
             privilege_id,
-            course_id
+            course_id,
+            status
         )values(
                    #{privilegeId},
-                   #{courseId}
+                   #{courseId},
+                   #{status}
                )
     </insert>
 </mapper>

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

@@ -22,23 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTimeSum" column="end_time_sum"/>
         <result property="quantity" column="quantity"/>
         <result property="status" column="status"/>
-        <collection property="courseVo" javaType="java.util.List" resultMap="CourseResult"/>
+        <collection property="courseVo" ofType="Long">
+            <constructor>
+                <arg column="eid" />
+            </constructor>
+        </collection>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.domain.Course" id="CourseResult">
-        <result property="courseId" column="course_id"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="price" column="price"/>
-        <result property="duration" column="duration"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="coverUrl" column="cover_url"/>
-        <result property="introduction" column="introduction"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="status" column="status"/>
-        <result property="teacherIds" column="teacher_ids"/>
-        <result property="courseName" column="course_name"/>
+        <result property="courseId" column="eid"/>
     </resultMap>
 
 
@@ -46,11 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGradePriList" parameterType="Long" resultMap="ActivityGradePrivilegeVoResult">
         SELECT
             c.*,
-            e.*
+            e.course_id as eid
         FROM
             activity_grade_privilege c
                 LEFT JOIN activity_grade_privilege_coures f ON c.id = f.privilege_id
                 LEFT JOIN course e ON f.course_id = e.course_id
         WHERE c.grade_id = #{id,jdbcType=INTEGER} and c.status != 0
     </select>
+
+
+    <update id="deleteByGrade" parameterType="Long" >
+        UPDATE activity_grade_privilege SET `status` =0 where grade_id=#{id}
+    </update>
 </mapper>

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

@@ -65,8 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectExamgement" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="ExamArrangementResultVo">
         SELECT
-            s.*,
-            e.*
+            s.*
         FROM
             exam_arrangement s
                 LEFT JOIN exam_arrangement_time e ON e.arrangement_id = s.id

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

@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSubList" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="UserResult">
         SELECT
         u.user_id,
-        u.user_accout,
+        u.user_account,
         u.nickname,
         u.realname,
         u.sex,