Merge branch 'dev'

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -948,5 +948,4 @@ public class CommonController extends BaseController {
        List<ClassBusinessVo> list = iClassGradeService.getBusinessClassList(query);
         return getDataTable(list);
     }
-
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -329,6 +329,29 @@ public class ClassGradeController extends BaseController {
         return util.exportExcel(list,"学员学时学习记录列表");
     }
 
+    /**
+     * 导出审核不通过记录
+     */
+    @ApiOperation("导出审核不通过记录")
+    @GetMapping("/export/noPass/record")
+    public AjaxResult<ClassNoPassExportVo> exportNoPassRecord() {
+        List<ClassNoPassExportVo> list = iClassGradeUserService.exportNoPassRecord();
+        ExcelUtil<ClassNoPassExportVo> util = new ExcelUtil<>(ClassNoPassExportVo.class);
+        return util.exportExcel(list,"学时不通过记录");
+    }
+
+    /**
+     * 导出审核不通过重学记录
+     */
+    @ApiOperation("导出审核不通过重学记录")
+    @GetMapping("/export/restart/record")
+    public AjaxResult<ClassNoPassExportVo> exportRestartRecord() {
+        List<ClassNoPassExportVo> list = iClassGradeUserService.exportRestartRecord();
+        ExcelUtil<ClassNoPassExportVo> util = new ExcelUtil<>(ClassNoPassExportVo.class);
+
+        return util.exportExcel(list,"学时不通过重学记录");
+    }
+
     /**
      * 班级管理列表
      */

zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -33,33 +33,40 @@ public class EncryptHandler  implements TypeHandler<String> {
 
 
     public static String decrypt(String value) {
+//        if (null == value) {
+//            return null;
+//        }
+//        if (value.length()<=20 ) {
+//            return value;
+//        }
+//        String s = SecureUtil.aes(KEYS).decryptStr(value);
+//        String authorizationToken = ServletUtils.getRequest().getHeader("AuthorizationToken");
+//        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(authorizationToken)){
+//            Boolean phoneConceal = false;
+//            try (InputStream inputStream = EncryptHandler.class.getClassLoader().getResourceAsStream("application.yml")) {
+//                Properties properties = new Properties();
+//                properties.load(inputStream);
+//                String property = properties.getProperty("conceal");
+//                phoneConceal = Boolean.valueOf(property);
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//            if (phoneConceal){
+//                //开启手机号码加密
+//                LoginUser loginUser = SecurityUtils.getLoginUser();
+//                if (s.length() <= 11 &&
+//                        (ObjectUtils.isNull(loginUser.getPhoneConcealSign()) || loginUser.getPhoneConcealSign() != 1)){
+//                    return TelPhoneUtils.hideTelPhone(s);
+//                }
+//            }
+//        }
+//        return SecureUtil.aes(KEYS).decryptStr(value);
         if (null == value) {
             return null;
         }
         if (value.length()<=20 ) {
             return value;
         }
-        String s = SecureUtil.aes(KEYS).decryptStr(value);
-        String authorizationToken = ServletUtils.getRequest().getHeader("AuthorizationToken");
-        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(authorizationToken)){
-            Boolean phoneConceal = false;
-            try (InputStream inputStream = EncryptHandler.class.getClassLoader().getResourceAsStream("application.yml")) {
-                Properties properties = new Properties();
-                properties.load(inputStream);
-                String property = properties.getProperty("conceal");
-                phoneConceal = Boolean.valueOf(property);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            if (phoneConceal){
-                //开启手机号码加密
-                LoginUser loginUser = SecurityUtils.getLoginUser();
-                if (s.length() <= 11 &&
-                        (ObjectUtils.isNull(loginUser.getPhoneConcealSign()) || loginUser.getPhoneConcealSign() != 1)){
-                    return TelPhoneUtils.hideTelPhone(s);
-                }
-            }
-        }
         return SecureUtil.aes(KEYS).decryptStr(value);
     }
 

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

@@ -85,4 +85,6 @@ public class CourseBusinessAddBo {
     private Integer periodNumber;
     @ApiModelProperty("学时审核标签：1开启 2关闭")
     private Integer periodCheckSign;
+    @ApiModelProperty("学习提示标签：1开启 0关闭")
+    private Integer reminderSign;
 }

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

@@ -96,4 +96,6 @@ public class CourseBusinessEditBo {
     private Integer periodNumber;
     @ApiModelProperty("学时审核标签：1开启 2关闭")
     private Integer periodCheckSign;
+    @ApiModelProperty("学习提示标签：1开启 0关闭")
+    private Integer reminderSign;
 }

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

@@ -74,6 +74,8 @@ private static final long serialVersionUID=1L;
     private Integer periodNumber;
     /** 学时审核标签：1开启 2关闭 */
     private Integer periodCheckSign;
+    /** 学习提示标签：1开启 0关闭 */
+    private Integer reminderSign;
     private Long tenantId;
 
     @TableField(exist = false)

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

@@ -132,4 +132,6 @@ public class CourseBusinessVo {
 	private Long topicId;
 	@ApiModelProperty("学时审核标签：1开启 2关闭")
 	private Integer periodCheckSign;
+	@ApiModelProperty("学习提示标签：1开启 0关闭")
+	private Integer reminderSign;
 }

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

@@ -419,5 +419,7 @@ public class GoodsVo {
 	private String makeGoodsIds;
 
 	private List<MakeGoodsVo> makeGoodsVoList;
+	@ApiModelProperty("学习提示标签：1开启 0关闭")
+	private Integer reminderSign;
 
 }

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

@@ -157,4 +157,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     Long getProIdByTenant(@Param("tenantId") Long tenantId,@Param("proName") String proName,@Param("eduId") Long eduId);
 
     Long listUserPeriodTotal(Integer periodStatus);
+
+    List<ClassNoPassExportVo> exportNoPassRecord();
+
+    List<ClassNoPassExportVo> exportRestartRecord();
 }

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

@@ -174,4 +174,8 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	UserPeriodTotalVo listUserPeriodTotal(ClassGradeUserQueryBo bo);
 
+	List<ClassNoPassExportVo> exportNoPassRecord();
+
+	List<ClassNoPassExportVo> exportRestartRecord();
+
 }

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

@@ -1159,6 +1159,16 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return totalVo;
     }
 
+    @Override
+    public List<ClassNoPassExportVo> exportNoPassRecord() {
+        return baseMapper.exportNoPassRecord();
+    }
+
+    @Override
+    public List<ClassNoPassExportVo> exportRestartRecord() {
+        return baseMapper.exportRestartRecord();
+    }
+
     @Override
     public ClassPeriodStudentVo DecryptOfficialInfo(ClassGradeDecryptQueryBo bo) {
         String pars;
@@ -1468,7 +1478,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(userVo.getClassStatus()) || userVo.getClassStatus() != 1) {
             return "未开班";
         }
-        if (Validator.isNotEmpty(userVo.getPeriodPlush())&&userVo.getPeriodPlush()==1) {
+        if (Validator.isNotEmpty(userVo.getPeriodPlush())&&userVo.getPeriodPlush()==1)   {
             return "该用户已推送过";
         }
         if (Validator.isNotEmpty(userVo.getClassStartTime())) {

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

@@ -0,0 +1,59 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 学时不通过记录Vo mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学时不通过记录")
+public class ClassNoPassExportVo implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
+
+	@Excel(name = "身份证")
+	@ApiModelProperty("学员身份证")
+	private String idCard;
+
+	@Excel(name = "手机号码")
+	@ApiModelProperty("学员电话")
+	private String telPhone;
+
+	@Excel(name = "公司")
+	@ApiModelProperty("公司")
+	private String companyName;
+
+	@Excel(name = "报名岗位")
+	@ApiModelProperty("报名岗位")
+	private String categoryName;
+
+	@Excel(name = "课程名称")
+	@ApiModelProperty("课程名称")
+	private String goodsName;
+
+	@Excel(name = "审核不通过时间")
+	@ApiModelProperty("审核不通过时间")
+	private String noPassTime;
+
+	@Excel(name = "是否开始重学")
+	@ApiModelProperty("是否开始重学")
+	private String restart;
+
+	@Excel(name = "重学开始时间")
+	@ApiModelProperty("重学开始时间")
+	private String restartTime;
+
+
+}

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

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
         <result property="goodsFieldJson" column="goods_field_json"/>
         <result property="aliasName" column="alias_name"/>
+        <result property="reminderSign" column="reminder_sign"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -156,6 +156,7 @@
         <result property="aliasName" column="alias_name"/>
         <result property="moreCertificateStatus" column="more_certificate_status"/>
         <result property="makeGoodsIds" column="make_goods_ids"/>
+        <result property="reminderSign" column="reminder_sign"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -597,6 +598,7 @@
                cet.education_name,
                cpt.project_name,
                cb.business_name,
+               cb.reminder_sign,
                cb.template_status                                                                 AS special_goods,
                s.school_name,
                m.category_name,

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

@@ -961,6 +961,54 @@
           AND cgu.period_status = #{periodStatus}
     </select>
 
+    <select id="exportNoPassRecord"  resultType="com.zhongzheng.modules.grade.vo.ClassNoPassExportVo">
+        SELECT
+            u.realname AS realName,
+            AES_DECRYPT( UNHEX( u.id_card ), 'base20230213zzkj' ) AS idCard,
+            AES_DECRYPT( UNHEX( u.telphone ), 'base20230213zzkj' ) AS telPhone,
+            u.company_name AS companyName,
+            m.category_name AS categoryName,
+            g.goods_name AS goodsName,
+            (SELECT FROM_UNIXTIME( ups.audit_time, '%Y-%m-%d %H:%i:%s' ) FROM user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id LIMIT 1 ) AS noPassTime,
+        	 '否' AS restart,
+	        '' AS restartTime
+        FROM
+            class_grade_user cgu
+            LEFT JOIN `user` u ON cgu.user_id = u.user_id
+            LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+            LEFT JOIN goods g ON og.goods_id = g.goods_id
+            LEFT JOIN major m ON g.major_id = m.id
+        WHERE
+            cgu.`status` = 1
+          AND cgu.period_status = 0
+    </select>
+
+    <select id="exportRestartRecord"  resultType="com.zhongzheng.modules.grade.vo.ClassNoPassExportVo">
+        SELECT
+            u.realname AS realName,
+            AES_DECRYPT( UNHEX( u.id_card ), 'base20230213zzkj' ) AS idCard,
+            AES_DECRYPT( UNHEX( u.telphone ), 'base20230213zzkj' ) AS telPhone,
+            u.company_name AS companyName,
+            m.category_name AS categoryName,
+            g.goods_name AS goodsName,
+            (SELECT FROM_UNIXTIME( ups.audit_time, '%Y-%m-%d %H:%i:%s' ) FROM user_period up
+                        LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id LIMIT 1 ) AS noPassTime,
+            '是' AS restart,
+	        (SELECT FROM_UNIXTIME( ups.record_start_time , '%Y-%m-%d %H:%i:%s' ) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 3
+	            AND ups.record_start_time IS NOT NULL ORDER BY ups.record_start_time  LIMIT 1) AS restartTime
+        FROM
+            class_grade_user cgu
+            LEFT JOIN `user` u ON cgu.user_id = u.user_id
+            LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+            LEFT JOIN goods g ON og.goods_id = g.goods_id
+            LEFT JOIN major m ON g.major_id = m.id
+        WHERE
+           cgu.`status` = 1
+          AND cgu.period_status = -1
+          AND (SELECT COUNT(*) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 3 AND ups.record_start_time IS NOT NULL ) > 0
+    </select>
+
     <select id="listUserWeekStudyTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultType="Long">
         SELECT