Merge branch 'dev'

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -500,4 +500,11 @@ public class ScheduleController extends BaseController {
         iScheduleService.classExpirationReminder();
         return AjaxResult.success();
     }
+
+    @ApiOperation("学时未推送后台提示")
+    @GetMapping("/period/push/reminder")
+    public AjaxResult periodPushReminder(){
+        iScheduleService.periodPushReminder();
+        return AjaxResult.success();
+    }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -133,6 +133,7 @@ public class UserController extends BaseController {
             SysTenant tenant = sysTenantService.getById(Long.valueOf(tenantId));
             vo.setEduPhone(tenant.getEduPhone());
             vo.setSlabSign(tenant.getSlabSign());
+            vo.setStudentRestudy(tenant.getStudentRestudy());
         }
 
         bo.setUserId(loginUser.getUser().getUserId());

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

@@ -473,7 +473,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             goodsVoList.forEach(item -> {
                 List<ClassGradeGoods> gradeGoods = iClassGradeGoodsService
                         .list(new LambdaQueryWrapper<ClassGradeGoods>()
-                        .eq(ClassGradeGoods::getGoodsId, item.getGoodsId()));
+                        .eq(ClassGradeGoods::getGoodsId, item.getGoodsId())
+                        .orderByDesc(ClassGradeGoods::getCreateTime)
+                        );
                 if (CollectionUtils.isNotEmpty(gradeGoods)){
                     item.setGradeNum(Long.valueOf(gradeGoods.size()));
                     gradeGoods.forEach(gradeGoodsItem -> {
@@ -484,6 +486,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                         if (ObjectUtils.isNotNull(grade.getClassStartTime()) && grade.getClassEndTime() < DateUtils.getNowTime()){
                             return;
                         }
+                        if (ObjectUtils.isNotNull(item.getGradeId()) && ObjectUtils.isNotNull(item.getGradeName())){
+                            return;
+                        }
                         if (ObjectUtils.isNotNull(grade.getSevenCode())){
                             //七大员继教班级,计算班级人数
                             Integer classGradeNum = iOrderService.getClassGradeNum(grade.getSevenCode());

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

@@ -161,4 +161,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     List<ClassNoPassExportVo> exportNoPassRecord();
 
     List<ClassNoPassExportVo> exportRestartRecord();
+
+    List<ClassGradeUser> getPeriodNotPush();
+
 }

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

@@ -178,4 +178,6 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassNoPassExportVo> exportRestartRecord();
 
+	List<ClassGradeUser> getPeriodNotPush();
+
 }

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

@@ -1177,6 +1177,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return baseMapper.exportRestartRecord();
     }
 
+    @Override
+    public List<ClassGradeUser> getPeriodNotPush() {
+        return baseMapper.getPeriodNotPush();
+    }
+
     @Override
     public ClassPeriodStudentVo DecryptOfficialInfo(ClassGradeDecryptQueryBo bo) {
         String pars;

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/IScheduleService.java

@@ -128,4 +128,5 @@ public interface IScheduleService extends IService<PolyvVideo> {
 
     void classExpirationReminder();
 
+    void periodPushReminder();
 }

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

@@ -2265,6 +2265,16 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         }
     }
 
+    @Override
+    public void periodPushReminder() {
+        //学时未推送提示
+        //获取所有审核通过学时未推送且班级已过期的学员
+        List<ClassGradeUser> list = iClassGradeUserService.getPeriodNotPush();
+        if (CollectionUtils.isEmpty(list)){
+            return;
+        }
+    }
+
 
     private String getWeeks(Long time){
         Calendar calendar = Calendar.getInstance();

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -121,4 +121,6 @@ private static final long serialVersionUID=1L;
     private Integer sevenPayment;
     /** 平板禁止观看标签：1是 0否 */
     private Integer slabSign;
+    /** 学员重学按钮: 1不显示 0显示*/
+    private Integer studentRestudy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -319,6 +319,8 @@ public class UserVo {
 	private String seatNumber;
 	@ApiModelProperty("平板禁止观看标签：1是 0否")
 	private Integer slabSign;
+	@ApiModelProperty("学员重学按钮: 1不显示 0显示")
+	private Integer studentRestudy;
 	public void setNull(){
 		this.setOpenId(null);
 /*		this.setIdCardImg1(null);

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

@@ -2712,6 +2712,19 @@
             AND g.seven_push_reason = #{sevenPushReason}
         </if>
     </select>
+    <select id="getPeriodNotPush" resultType="com.zhongzheng.modules.grade.domain.ClassGradeUser">
+        SELECT
+        cgu.*
+        FROM
+        class_grade_user cgu
+        LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
+        WHERE
+        cgu.`status` = 1
+        AND cgu.period_status = 1
+        AND cgu.period_plush = 0
+        AND change_grade = 0
+        AND cg.class_end_time &lt; UNIX_TIMESTAMP(CURRENT_TIMESTAMP ())
+    </select>
 
     <update id="updateListUserNoTenant" parameterType="map" >
         UPDATE class_grade_user SET seven_push_check = 0 WHERE seven_push_check > 2 and