通知列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformRemindController.java

@@ -3,6 +3,8 @@ package com.zhongzheng.controller.inform;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.modules.course.vo.CourseUserEducationTypeVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,4 +89,17 @@ public class InformRemindController extends BaseController {
         return toAjax(iInformRemindService.updateByEditBo(bo) ? 1 : 0);
     }
 
+
+    /**
+     * 查询业务层次下的学员
+     */
+    @ApiOperation("查询业务层次")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
+    @GetMapping("/listGradeService")
+    public TableDataInfo<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo) {
+        startPage();
+        List<CourseUserEducationTypeVo> list = iInformRemindService.listGradeService(bo);
+        return getDataTable(list);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -121,4 +121,17 @@ public class GoodsAddBo {
 
     private Long handoutsId;
 
+    /** 学时 */
+    @ApiModelProperty("学时")
+    private Long period;
+    /** 补考或前培开始时间 */
+    @ApiModelProperty("补考或前培开始时间")
+    private Long makeStartTime;
+    /** 补考或前培结束时间 */
+    @ApiModelProperty("补考或前培结束时间")
+    private Long makeEndTime;
+    /** 学习次数 */
+    @ApiModelProperty("学习次数")
+    private Long studyCount;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -150,5 +150,18 @@ public class GoodsEditBo {
     @ApiModelProperty("讲义id")
     private Long handoutsId;
 
+    /** 学时 */
+    @ApiModelProperty("学时")
+    private Long period;
+    /** 补考或前培开始时间 */
+    @ApiModelProperty("补考或前培开始时间")
+    private Long makeStartTime;
+    /** 补考或前培结束时间 */
+    @ApiModelProperty("补考或前培结束时间")
+    private Long makeEndTime;
+    /** 学习次数 */
+    @ApiModelProperty("学习次数")
+    private Long studyCount;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -121,4 +121,17 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 标准价格详情json */
 	@ApiModelProperty("标准价格详情json")
 	private String standPriceJson;
+
+	/** 学时 */
+	@ApiModelProperty("学时")
+	private Long period;
+	/** 补考或前培开始时间 */
+	@ApiModelProperty("补考或前培开始时间")
+	private Long makeStartTime;
+	/** 补考或前培结束时间 */
+	@ApiModelProperty("补考或前培结束时间")
+	private Long makeEndTime;
+	/** 学习次数 */
+	@ApiModelProperty("学习次数")
+	private Long studyCount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -100,4 +100,12 @@ private static final long serialVersionUID=1L;
     private String goodsExamConfig;
 
     private Long handoutsId;
+    /** 学时 */
+    private Long period;
+    /** 补考或前培开始时间 */
+    private Long makeStartTime;
+    /** 补考或前培结束时间 */
+    private Long makeEndTime;
+    /** 学习次数 */
+    private Long studyCount;
 }

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

@@ -189,4 +189,21 @@ public class GoodsVo {
 	/** 模板类型置 */
 	@ApiModelProperty("模板类型置")
 	private String templateType;
+
+	/** 学时 */
+	@Excel(name = "学时")
+	@ApiModelProperty("学时")
+	private Long period;
+	/** 补考或前培开始时间 */
+	@Excel(name = "补考或前培开始时间")
+	@ApiModelProperty("补考或前培开始时间")
+	private Long makeStartTime;
+	/** 补考或前培结束时间 */
+	@Excel(name = "补考或前培结束时间")
+	@ApiModelProperty("补考或前培结束时间")
+	private Long makeEndTime;
+	/** 学习次数 */
+	@Excel(name = "学习次数")
+	@ApiModelProperty("学习次数")
+	private Long studyCount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformRemindService.java

@@ -1,5 +1,7 @@
 package com.zhongzheng.modules.inform.service;
 
+import com.zhongzheng.modules.course.vo.CourseUserEducationTypeVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.inform.domain.InformRemind;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
@@ -49,4 +51,6 @@ public interface IInformRemindService extends IService<InformRemind> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo);
 }

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

@@ -1,8 +1,26 @@
 package com.zhongzheng.modules.inform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
+import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
+import com.zhongzheng.modules.course.vo.*;
+import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
+import com.zhongzheng.modules.grade.service.IClassGradeSysService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
+import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
+import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.service.IUserUpdateService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +48,34 @@ import java.util.stream.Collectors;
 @Service
 public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, InformRemind> implements IInformRemindService {
 
+
+    @Autowired
+    private IGoodsService iGoodsService;
+
+    @Autowired
+    private ICourseEducationTypeService courseEducationTypeService;
+
+    @Autowired
+    private ICourseProjectTypeService courseProjectTypeService;
+
+    @Autowired
+    private ICourseBusinessService courseBusinessService;
+
+    @Autowired
+    private IClassGradeSysService classGradeSysService;
+
+    @Autowired
+    private IClassGradeGoodsService classGradeGoodsService;
+
+    @Autowired
+    private IUserStudyRecordService iUserStudyRecordService;
+
+    @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+
+    @Autowired
+    private IUserUpdateService iUserUpdateService;
+
     @Override
     public InformRemindVo queryById(Long id){
         InformRemind db = this.baseMapper.selectById(id);
@@ -100,4 +146,49 @@ public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, Inf
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo) {
+        CourseEducationTypeQueryBo courseEducationTypeQueryBo = new CourseEducationTypeQueryBo();
+        courseEducationTypeQueryBo.setStatus(bo.getStatus());
+        List<CourseUserEducationTypeVo> courseUserEducationTypeVos = entity2EducationVo(courseEducationTypeService.queryList(courseEducationTypeQueryBo));
+        for (CourseUserEducationTypeVo courseUserEducationTypeVo : courseUserEducationTypeVos) {
+            CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+            courseProjectTypeQueryBo.setStatus(bo.getStatus());
+            courseProjectTypeQueryBo.setEducationId(Convert.toInt(courseUserEducationTypeVo.getId()));
+            List<CourseUserProjectTypeVo> courseUserProjectTypeVos = entity2ServiceProjectVo(courseProjectTypeService.queryList(courseProjectTypeQueryBo));
+            if (CollectionUtils.isNotEmpty(courseUserProjectTypeVos)) {
+                for (CourseUserProjectTypeVo courseUserProjectTypeVo : courseUserProjectTypeVos) {
+                    CourseBusinessQueryBo courseBusinessQueryBo = new CourseBusinessQueryBo();
+                    courseBusinessQueryBo.setStatus(bo.getStatus());
+                    courseBusinessQueryBo.setProjectId(Convert.toInt(courseUserProjectTypeVo.getId()));
+                    List<CourseUserBusinessVo> courseUserBusinessVos = entity2ServiceBusinessVo(courseBusinessService.queryList(courseBusinessQueryBo));
+                    courseUserProjectTypeVo.setCourseUserBusiness(courseUserBusinessVos);
+                }
+            }
+            courseUserEducationTypeVo.setCourseUserProjectTypeVo(courseUserProjectTypeVos);
+        }
+        return courseUserEducationTypeVos;
+    }
+
+    private List<CourseUserEducationTypeVo> entity2EducationVo(Collection<CourseEducationTypeVo> collection) {
+        List<CourseUserEducationTypeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseUserEducationTypeVo.class))
+                .collect(Collectors.toList());
+        return voList;
+    }
+
+    private List<CourseUserProjectTypeVo> entity2ServiceProjectVo(Collection<CourseProjectTypeVo> collection) {
+        List<CourseUserProjectTypeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseUserProjectTypeVo.class))
+                .collect(Collectors.toList());
+        return voList;
+    }
+
+    private List<CourseUserBusinessVo> entity2ServiceBusinessVo(Collection<CourseBusinessVo> collection) {
+        List<CourseUserBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseUserBusinessVo.class))
+                .collect(Collectors.toList());
+        return voList;
+    }
 }