submit

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-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-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -916,17 +916,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setSubjectIds(ToolsUtils.join(",", sIdList));
             }
             User user = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,EncryptHandler.encrypt(itemImport.getTelphone())).last("limit 1"));
+                    .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
             if(Validator.isNotNull(user)){
-                if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
-                    throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
-                }
-                if(Validator.isEmpty(user.getIdCard())){
-                    //更新身份证和姓名
-                    user.setIdCard(itemImport.getIdCard());
-                    user.setRealname(itemImport.getRealname());
-                    updateById(user);
-                }
+//                if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
+//                    throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
+//                }
+//                if(Validator.isEmpty(user.getIdCard())){
+//                    //更新身份证和姓名
+//                    user.setIdCard(itemImport.getIdCard());
+//                    user.setRealname(itemImport.getRealname());
+//                    updateById(user);
+//                }
                 //手机号已存在
                 itemImport.setUserId(user.getUserId());
                 itemImport.setImportNo(importNo);
@@ -941,13 +941,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     updateById(user);
                 }
                 continue;
-            }else{
-                User user2 = getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
-                if(Validator.isNotEmpty(user2)){
-                    throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
-                }
             }
+//            else{
+//                User user2 = getOne(new LambdaQueryWrapper<User>()
+//                        .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
+//                if(Validator.isNotEmpty(user2)){
+//                    throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
+//                }
+//            }
             User inertData = new User();
             inertData.setTelphone(itemImport.getTelphone());
             //隐藏手机号作为初始昵称

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/service/impl/ClassGradeUserServiceImpl.java

@@ -1468,7 +1468,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/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,