yangdamao 1 year ago
parent
commit
6dc31be37c

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

@@ -1493,7 +1493,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
-            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+//            iUserLoginErrorService.saveErrorLog(bo.getAccount());
             throw new BaseException("登录信息错误");
         }
         Long tenantId = user.getTenantId();

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

@@ -83,4 +83,6 @@ public class CourseBusinessAddBo {
     private Integer periodType;
     @ApiModelProperty("学时审核层级:1初审,2初审和复审")
     private Integer periodNumber;
+    @ApiModelProperty("学时审核标签:1开启 2关闭")
+    private Integer periodCheckSign;
 }

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

@@ -94,4 +94,6 @@ public class CourseBusinessEditBo {
     private Integer periodType;
     @ApiModelProperty("学时审核层级:1初审,2初审和复审")
     private Integer periodNumber;
+    @ApiModelProperty("学时审核标签:1开启 2关闭")
+    private Integer periodCheckSign;
 }

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

@@ -72,6 +72,8 @@ private static final long serialVersionUID=1L;
     private Integer periodType;
     /** 学时审核层级:1初审,2初审和复审 */
     private Integer periodNumber;
+    /** 学时审核标签:1开启 2关闭 */
+    private Integer periodCheckSign;
     private Long tenantId;
 
     @TableField(exist = false)

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

@@ -130,4 +130,6 @@ public class CourseBusinessVo {
 	private Integer periodNumber;
 	@ApiModelProperty("专题页ID")
 	private Long topicId;
+	@ApiModelProperty("学时审核标签:1开启 2关闭")
+	private Integer periodCheckSign;
 }

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

@@ -479,6 +479,7 @@
         GROUP BY c.goods_id ) ge on og.goods_id = ge.goods_id */
         where 1=1
         and cgu.`status` =1
+        and cb.`period_check_sign` = 1
         <if test="periodPlush != null and periodPlush != ''">
             AND cgu.period_plush = #{periodPlush}
         </if>