fix 学时审核

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileController.java

@@ -97,7 +97,7 @@ public class UserProfileController extends BaseController {
      */
     @ApiOperation("审核资料")
     @PreAuthorize("@ss.hasPermi('system:profile:edit')")
-    @Log(title = "填写资料审核", businessType = BusinessType.UPDATE)
+    @Log(title = "审核资料", businessType = BusinessType.UPDATE)
     @PostMapping()
     public AjaxResult<Void> edit(@RequestBody UserProfileEditBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseBusinessController.java

@@ -132,4 +132,26 @@ public class CourseBusinessController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iCourseBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }*/
+
+    /**
+     * 修改业务层次学习顺序
+     */
+    @ApiOperation("更改审核资料模板用户ID")
+    @PreAuthorize("@ss.hasPermi('course:business:edit')")
+    @Log(title = "更改审核资料模板用户ID", businessType = BusinessType.UPDATE)
+    @PostMapping("/editProfileTpUserIds")
+    public AjaxResult<Void> editProfileTpUserIds(@RequestBody CourseBusinessEditBo bo) {
+        return toAjax(iCourseBusinessService.editProfileTpUserIds(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改业务层次学习顺序
+     */
+    @ApiOperation("更改学时审核用户ID")
+    @PreAuthorize("@ss.hasPermi('course:business:edit')")
+    @Log(title = "更改学时审核用户ID", businessType = BusinessType.UPDATE)
+    @PostMapping("/editPeriodUserIds")
+    public AjaxResult<Void> editPeriodUserIds(@RequestBody CourseBusinessEditBo bo) {
+        return toAjax(iCourseBusinessService.editPeriodUserIds(bo) ? 1 : 0);
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -25,6 +25,7 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
 import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.exam.domain.ExamConfig;
 import com.zhongzheng.modules.system.service.ISysPostService;
 import com.zhongzheng.modules.system.service.ISysRoleService;
@@ -271,4 +272,17 @@ public class SysUserController extends BaseController
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));
     }
+
+    /**
+     * 业务层次获取用户列表
+     */
+    @ApiOperation("业务层次获取用户列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/businessPeopleList")
+    public TableDataInfo queryBusinessPeopleList(CourseBusinessQueryBo bo)
+    {
+        startPage();
+        List<SysUser> list = userService.queryBusinessPeopleList(bo);
+        return getDataTable(list);
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.UserStatus;
 import com.zhongzheng.common.exception.BaseException;
@@ -25,6 +26,7 @@ import com.zhongzheng.modules.collect.domain.CollectNote;
 import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
 import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.mapper.CollectNoteMapper;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.MajorCategory;
 import com.zhongzheng.modules.course.service.ICourseService;
@@ -726,6 +728,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
 
+
+
     /**
      * 获取当前月第一天
      * @param month

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -364,11 +364,13 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         UserProfile update = BeanUtil.toBean(bo,UserProfile.class);
         UserProfileVo userProfileVo1 = this.queryById(bo.getId());
         //查询此人审核资料是否有权限
-       /* if (baseMapper.selectCountProfile(loginUser.getUser().getUserId(),userProfileVo1.getGoodsId()) < 1){
-            throw new IllegalArgumentException("您没有审核权限");
-        }*/
+        if(!loginUser.getUser().isAdmin()){
+            if (baseMapper.selectCountProfile(loginUser.getUser().getUserId(),userProfileVo1.getGoodsId()) < 1){
+                throw new IllegalArgumentException("您没有审核权限");
+            }
+        }
         update.setId(bo.getId());
-        update.setCreateByName("SAAS-"+ SecurityUtils.getUsername());
+        update.setCreateByName("SAAS-" + SecurityUtils.getUsername());
         update.setUpdateTime(DateUtils.getNowTime());
         update.setAuditTime(DateUtils.getNowTime());
         update.setChangeStatus(1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessAddBo.java

@@ -54,4 +54,13 @@ public class CourseBusinessAddBo {
     /** 1限制视频商品做卷顺序 0不限制 */
     @ApiModelProperty("1限制视频商品做卷顺序 0不限制")
     private Integer goodsLearningOrder;
+    /** 审核资料模板用户ID拼接 */
+    @ApiModelProperty("审核资料模板用户ID拼接")
+    private String profileTpUserIds;
+    /** 学时审核用户ID拼接 */
+    @ApiModelProperty("学时审核用户ID拼接")
+    private String periodUserIds;
+    /** 学时确认审核用户ID拼接 */
+    @ApiModelProperty("学时确认审核用户ID拼接")
+    private String periodConfirmUserIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -64,4 +64,15 @@ public class CourseBusinessEditBo {
     /** 1限制视频商品做卷顺序 0不限制 */
     @ApiModelProperty("1限制视频商品做卷顺序 0不限制")
     private Integer goodsLearningOrder;
+
+    /** 审核资料模板用户ID拼接 */
+    @ApiModelProperty("审核资料模板用户ID拼接")
+    private String profileTpUserIds;
+
+    /** 学时审核用户ID拼接 */
+    @ApiModelProperty("学时审核用户ID拼接")
+    private String periodUserIds;
+    /** 学时确认审核用户ID拼接 */
+    @ApiModelProperty("学时确认审核用户ID拼接")
+    private String periodConfirmUserIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessQueryBo.java

@@ -42,7 +42,7 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	private String encoder;
 
 	/** 业务ID */
-	@ApiModelProperty("考期Id")
+	@ApiModelProperty("业务ID")
 	private Long id;
 
 	/** 项目名称 */
@@ -65,4 +65,14 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	@Excel(name = "模板选用")
 	@ApiModelProperty("模板选用")
 	private Integer templateStatus;
+	/** 审核资料模板用户ID拼接 */
+	@ApiModelProperty("审核资料模板用户ID拼接")
+	private String profileTpUserIds;
+	/** 学时审核用户ID拼接 */
+	@ApiModelProperty("学时审核用户ID拼接")
+	private String periodUserIds;
+	/** 学时确认审核用户ID拼接 */
+	@ApiModelProperty("学时确认审核用户ID拼接")
+	private String periodConfirmUserIds;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -51,5 +51,11 @@ private static final long serialVersionUID=1L;
     /** 1限制章下做卷顺序 0不限制 2限制整个目录顺序 */
     private Integer goodsLearningOrder;
 
+    /** 审核资料模板用户ID拼接 */
+    private String profileTpUserIds;
 
+    /** 学时审核用户ID拼接 */
+    private String periodUserIds;
+    /** 学时确认审核用户ID拼接 */
+    private String periodConfirmUserIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseBusinessMapper.java

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 业务层次Mapper接口
@@ -16,4 +18,6 @@ import java.util.Collection;
 public interface CourseBusinessMapper extends BaseMapper<CourseBusiness> {
 
     Collection<CourseBusinessVo> queryList(CourseBusinessQueryBo bo);
+
+
 }

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

@@ -53,4 +53,8 @@ public interface ICourseBusinessService extends IService<CourseBusiness> {
 	boolean editModel(CourseBusinessEditBo bo);
 
 	boolean editLearningOrder(CourseBusinessEditBo bo);
+
+	boolean editProfileTpUserIds(CourseBusinessEditBo bo);
+
+	boolean editPeriodUserIds(CourseBusinessEditBo bo);
 }

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

@@ -162,4 +162,26 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
         }
         return true;
     }
+
+    @Override
+    public boolean editProfileTpUserIds(CourseBusinessEditBo bo) {
+        LambdaUpdateWrapper<CourseBusiness> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(CourseBusiness::getId, bo.getId());
+        objectLambdaUpdateWrapper.set(CourseBusiness::getProfileTpUserIds, bo.getProfileTpUserIds());
+        objectLambdaUpdateWrapper.set(CourseBusiness::getUpdateTime,DateUtils.getNowTime());
+        this.update(null, objectLambdaUpdateWrapper);
+        return true;
+    }
+
+    @Override
+    public boolean editPeriodUserIds(CourseBusinessEditBo bo) {
+        LambdaUpdateWrapper<CourseBusiness> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(CourseBusiness::getId, bo.getId());
+        objectLambdaUpdateWrapper.set(CourseBusiness::getPeriodUserIds, bo.getPeriodUserIds());
+        objectLambdaUpdateWrapper.set(CourseBusiness::getPeriodConfirmUserIds, bo.getPeriodConfirmUserIds());
+        objectLambdaUpdateWrapper.set(CourseBusiness::getUpdateTime,DateUtils.getNowTime());
+        this.update(null, objectLambdaUpdateWrapper);
+        return true;
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -92,4 +92,16 @@ public class CourseBusinessVo {
 	@Excel(name = "1限制章下做卷顺序 0不限制 2限制整个目录顺序")
 	@ApiModelProperty("1限制章下做卷顺序 0不限制 2限制整个目录顺序")
 	private Integer goodsLearningOrder;
+	/** 审核资料模板用户ID拼接 */
+	@Excel(name = "审核资料模板用户ID拼接")
+	@ApiModelProperty("审核资料模板用户ID拼接")
+	private String profileTpUserIds;
+	/** 学时审核用户ID拼接 */
+	@Excel(name = "学时审核用户ID拼接")
+	@ApiModelProperty("学时审核用户ID拼接")
+	private String periodUserIds;
+	/** 学时确认审核用户ID拼接 */
+	@Excel(name = "学时确认审核用户ID拼接")
+	@ApiModelProperty("学时确认审核用户ID拼接")
+	private String periodConfirmUserIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodEditBo.java

@@ -69,5 +69,7 @@ public class UserPeriodEditBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
+    /** 审核原因 */
+    private String auditReason;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodStatusAddBo.java

@@ -46,4 +46,7 @@ public class UserPeriodStatusAddBo {
     /** 审核用户名 */
     @ApiModelProperty("审核用户名")
     private String auditUserName;
+    /** 审核原因 */
+    @ApiModelProperty("审核原因")
+    private String auditReason;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodStatusEditBo.java

@@ -55,4 +55,7 @@ public class UserPeriodStatusEditBo {
     @ApiModelProperty("审核用户名")
     private String auditUserName;
 
+    /** 审核原因 */
+    @ApiModelProperty("审核原因")
+    private String auditReason;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodStatusQueryBo.java

@@ -55,4 +55,7 @@ public class UserPeriodStatusQueryBo extends BaseEntity {
 	/** 分数 */
 	@ApiModelProperty("分数")
 	private Long performance;
+	/** 审核原因 */
+	@ApiModelProperty("审核原因")
+	private String auditReason;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/UserPeriodStatus.java

@@ -49,4 +49,6 @@ private static final long serialVersionUID=1L;
     private Long performance;
     /** 审核用户名 */
     private String auditUserName;
+    /** 审核原因 */
+    private String auditReason;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/UserPeriodMapper.java

@@ -4,6 +4,7 @@ import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +16,6 @@ import java.util.List;
  */
 public interface UserPeriodMapper extends BaseMapper<UserPeriod> {
     Long checkGoodsChange(UserPeriodQueryBo bo);
+
+    Long selectCountPeriod(@Param("userId") Long userId, @Param("id") Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/UserPeriodStatusMapper.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.grade.bo.UserPeriodStatusQueryBo;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +18,5 @@ import java.util.List;
 public interface UserPeriodStatusMapper extends BaseMapper<UserPeriodStatus> {
 
     List<UserPeriodStatusVo> selectPeriodStatus(UserPeriodQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -328,8 +328,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         ClassPeriodUserVo classPeriodUserVos = classPeriodUserVos1.get(0);
         classPeriodUserVos.setPending(classPeriodStudentVo.getSecAllNum()-classPeriodUserVos.getPass()-classPeriodUserVos.getCheat());
         classPeriodUserVos.setExamPending(classPeriodUserVos.getExamNum()-classPeriodUserVos.getExamPass()-classPeriodUserVos.getExamCheat());
-        //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
-        Integer gradePeriodStatus = 0; //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核
+        //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过 3审核中
+        Integer gradePeriodStatus = 0; //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核 3审核中
         if(Validator.isEmpty(classPeriodStudentVo.getSecAllNum())||classPeriodStudentVo.getSecAllNum()==0){
             //空课程
             classPeriodStudentVo.setAllStatus(-1);
@@ -348,7 +348,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     gradePeriodStatus = 0;
                 }else {
                     classPeriodStudentVo.setAllStatus(2);
-                    gradePeriodStatus = 1;
+                    gradePeriodStatus = 3;
                 }
             }else {
                 classPeriodStudentVo.setAllStatus(-1);
@@ -876,53 +876,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             classPeriodUserVos.setExamPending(classPeriodUserVos.getExamNum()-classPeriodUserVos.getExamPass()-classPeriodUserVos.getExamCheat());
             //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
             Integer gradePeriodStatus = 0; //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核
-            /*if(Validator.isEmpty(classPeriodStudentVo.getSecAllNum())||classPeriodStudentVo.getSecAllNum()==0){
-                //空课程
-                classPeriodStudentVo.setAllStatus(-1);
-                gradePeriodStatus = -1;
-            }else{
-                if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
-                    if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
-                        classPeriodStudentVo.setAllStatus(0);
-                        gradePeriodStatus = 2;
-                    }else if (classPeriodUserVos.getCheat() != 0 || classPeriodUserVos.getExamCheat() != 0){
-                        classPeriodStudentVo.setAllStatus(1);
-                        gradePeriodStatus = 0;
-                    }else {
-                        classPeriodStudentVo.setAllStatus(2);
-                        gradePeriodStatus = 1;
-                    }
-                }else {
-                    classPeriodStudentVo.setAllStatus(-1);
-                    gradePeriodStatus = -1;
-                }
-            }*/
+
             classPeriodStudentVo.setAllStatus(changePeriodStatus(classPeriodStudentVo.getPeriodStatus()));
 
-            //更新班级学时状态l
-            /*if(!gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
-                LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
-                classGradeUser.eq(ClassGradeUser::getUserId, classPeriodStudentVo.getUserId());
-                classGradeUser.eq(ClassGradeUser::getGradeId, classPeriodStudentVo.getGradeId());
-                ClassGradeUser classGradeUser1 = new ClassGradeUser();
-                classGradeUser1.setPeriodStatus(gradePeriodStatus);
-                if(gradePeriodStatus==2){
-                    classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
-                }
-                classGradeUser1.setUpdateTime(DateUtils.getNowTime());
-                iClassGradeUserService.update(classGradeUser1, classGradeUser);
-            }*/
-           /* if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
-                if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
-                    classPeriodStudentVo.setAllStatus(0);
-                }else if (classPeriodUserVos.getCheat() != 0 || classPeriodUserVos.getExamCheat() != 0){
-                    classPeriodStudentVo.setAllStatus(1);
-                }else {
-                    classPeriodStudentVo.setAllStatus(2);
-                }
-            }else {
-                classPeriodStudentVo.setAllStatus(-1);
-            }*/
             classPeriodStudentVo.setWaitRebuildNum(classPeriodUserVos.getCheat()+classPeriodUserVos.getExamCheat());
             if (!CollectionUtils.isEmpty(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()))) {
                 //查找开始学习时间
@@ -958,8 +914,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
     private Integer changePeriodStatus(Long gradePeriodStatus){
-        //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
-        //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核
+        //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过 3审核中
+        //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核 3审核中
         if(gradePeriodStatus==0){
             return 1;
         }
@@ -972,6 +928,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         else if(gradePeriodStatus==-1){
             return -1;
         }
+        else if(gradePeriodStatus==3){
+            return 3;
+        }
         return -100;
     }
 
@@ -1224,7 +1183,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }else {
                 classPeriodUserVo.setAllStatus(-1);
             }
-        //    classPeriodUserVo.setAllStatus(changePeriodStatus(new Long(classPeriodUserVo.getPeriodStatus())));
+            //使用班级学时状态
+            classPeriodUserVo.setAllStatus(changePeriodStatus(classPeriodUserVo.getPeriodStatus()));
         }
         return classPeriodUserVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
@@ -149,6 +150,13 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(UserPeriodEditBo bo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //查询此人学时审核是否有权限
+        if(!loginUser.getUser().isAdmin()){
+            if (baseMapper.selectCountPeriod(loginUser.getUser().getUserId(),bo.getId()) < 1){
+                throw new IllegalArgumentException("您没有审核权限");
+            }
+        }
         //更改审核状态
         UserPeriodStatus userUp = new UserPeriodStatus();
         userUp.setPeriodStatus(1);
@@ -157,6 +165,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         userUp.setUpdateTime(DateUtils.getNowTime());
         userUp.setAuditTime(DateUtils.getNowTime());
         userUp.setAuditUserName(SecurityUtils.getUsername());
+        userUp.setAuditReason(bo.getAuditReason());
         userPeriodStatusService.updateById(userUp);
 
         UserPeriodStatusVo userPeriodStatus = userPeriodStatusService.queryById(bo.getId());
@@ -167,7 +176,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUserQueryBo.setGradeId(userPeriodVo.getGradeId());
         classGradeUserQueryBo.setGoodsId(userPeriodVo.getGoodsId());
         Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(classGradeUserQueryBo);
-        if(gradePeriodStatus==1){
+       /* if(gradePeriodStatus==1){
             //生成证书
             iCertificateTpService.makeCertificatePhoto(classGradeUserQueryBo);
         }
@@ -176,7 +185,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             bo.setStatus(gradePeriodStatus);
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
-        }
+        }*/
 
 
         //判断是否已全部审核结束
@@ -282,6 +291,13 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
 
     @Override
     public boolean editPeriodAll(UserPeriodEditBo bo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //查询此人学时审核是否有权限
+        if(!loginUser.getUser().isAdmin()){
+            if (baseMapper.selectCountPeriod(loginUser.getUser().getUserId(),bo.getId()) < 1){
+                throw new IllegalArgumentException("您没有审核权限");
+            }
+        }
         //查询所有审核记录
         LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getUserId() != null, UserPeriod::getUserId, bo.getUserId());
@@ -295,6 +311,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodStatus.setStatus(bo.getStatus());
             userPeriodStatus.setUpdateTime(DateUtils.getNowTime());
             userPeriodStatus.setAuditTime(DateUtils.getNowTime());
+            userPeriodStatus.setAuditReason(bo.getAuditReason());
             userPeriodStatus.setAuditUserName(SecurityUtils.getUsername());
             LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
             userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
@@ -308,7 +325,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUserQueryBo.setGradeId(bo.getGradeId());
         classGradeUserQueryBo.setGoodsId(bo.getGoodsId());
         Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(classGradeUserQueryBo);
-        if(gradePeriodStatus==1){
+       /* if(gradePeriodStatus==1){
             periodPass(classGradeUserQueryBo);
         }
         //发送消息
@@ -316,7 +333,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             bo.setStatus(gradePeriodStatus);
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
-        }
+        }*/
 
         return true;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -116,8 +116,8 @@ public class ClassPeriodUserVo {
 	@ApiModelProperty("审核资料")
 	private String keyValue;
 
-	@ApiModelProperty("学时状态")
-	private Integer periodStatus;
+	@ApiModelProperty("班级学时状态")
+	private Long periodStatus;
 
 	@ApiModelProperty("节时长(秒)")
 	private Long studyStartTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 
 import java.util.List;
 
@@ -19,6 +20,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    List<SysUser> queryBusinessPeopleList(CourseBusinessQueryBo bo);
+
     /**
      * 通过用户名查询用户
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysUserService.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 
 import java.util.List;
 
@@ -19,6 +20,8 @@ public interface ISysUserService extends IService<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    List<SysUser> queryBusinessPeopleList(CourseBusinessQueryBo bo);
+
     /**
      * 通过用户名查询用户
      *

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

@@ -11,6 +11,7 @@ import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.exam.domain.ExamBefore;
 import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.system.domain.SysUserPost;
@@ -82,6 +83,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUsers;
     }
 
+    @Override
+    public List<SysUser> queryBusinessPeopleList(CourseBusinessQueryBo bo) {
+        return baseMapper.queryBusinessPeopleList(bo);
+    }
+
     /**
      * 通过用户名查询用户
      *

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

@@ -1,5 +1,7 @@
 package com.zhongzheng.modules.user.service;
 
+import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.vo.RanKingUser;
@@ -99,4 +101,6 @@ public interface IUserService extends IService<User> {
 	Long informSum(Long userId);
 
 	Long orderSum(Long userId);
+
+
 }

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -207,11 +207,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             COUNT(1)
         FROM
-            profile_tp p
+            profile_tp p  JOIN profile_tp_business tb on p.profile_tp_id = tb.profile_tp_id JOIN course_business b on tb.business_id = b.id
         WHERE
             1 = 1
           AND FIND_IN_SET(#{goodsId},p.goods_ids)
-          and FIND_IN_SET(#{userId},p.user_ids)
+          and FIND_IN_SET(#{userId},b.profile_tp_user_ids)
     </select>
 
     <select id="selectGrade" parameterType="map" resultType="Long">

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

@@ -14,6 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="goodsLearningOrder" column="goods_learning_order"/>
+        <result property="profileTpUserIds" column="profile_tp_user_ids"/>
+        <result property="periodUserIds" column="period_user_ids"/>
+        <result property="periodConfirmUserIds" column="period_confirm_user_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseBusinessVo" id="CourseBusinessVoResult">
@@ -29,8 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="templateStatus" column="template_status"/>
         <result property="templateName" column="template_name"/>
         <result property="goodsLearningOrder" column="goods_learning_order"/>
+        <result property="profileTpUserIds" column="profile_tp_user_ids"/>
+        <result property="periodUserIds" column="period_user_ids"/>
+        <result property="periodConfirmUserIds" column="period_confirm_user_ids"/>
     </resultMap>
 
+
+
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="CourseBusinessVoResult">
         SELECT
             b.*,
@@ -70,4 +78,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by b.create_time desc
     </select>
 
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodMapper.xml

@@ -53,4 +53,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and up.exam_id = #{examId}
         </if>
     </select>
+
+    <select id="selectCountPeriodStatus" parameterType="map" resultType="Long">
+        SELECT
+            COUNT(1)
+        FROM
+            user_period_status ups  JOIN user_period up on ups.period_id = up.id JOIN goods g on goods_id = up.goods_id JOIN course_business b on g.business_id = b.id
+        WHERE
+            1 = 1
+          AND ups.id = #{id}
+          and FIND_IN_SET(#{userId},b.period_user_ids)
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="auditUserName" column="audit_user_name"/>
         <result property="auditTime" column="audit_time"/>
+        <result property="auditReason" column="audit_reason"/>
     </resultMap>
 
 
@@ -79,4 +80,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY
             ups.create_time asc
     </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -147,5 +147,15 @@
         where u.user_id = #{userId}
     </select>
 
+    <select id="queryBusinessPeopleList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="SysUserResult">
+        SELECT
+            u.*
+        FROM
+            sys_role_business b
+                JOIN sys_user_role r ON b.role_id = r.role_id
+                AND b.business_id = #{id}
+                JOIN sys_user u ON r.user_id = u.user_id
+        where u.`status` = 1
 
+    </select>
 </mapper>