Merge branch 'dev' into pre

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

@@ -70,4 +70,7 @@ public class CourseSubjectQueryBo extends BaseEntity {
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;
+
+	@ApiModelProperty("项目id")
+	private Long[] courseSubjectProjects;
 }

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

@@ -72,4 +72,8 @@ public class MajorQueryBo extends BaseEntity {
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;
+
+	/** 绑定项目id集合 */
+	@ApiModelProperty("绑定项目id集合")
+	private Long[] majorProjects;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseSubjectMapper.java

@@ -23,4 +23,6 @@ public interface CourseSubjectMapper extends BaseMapper<CourseSubject> {
     Collection<CourseSubjectVo> queryList(CourseSubjectQueryBo bo);
 
     List<CourseProjectTypeVo> queryProject(Long id);
+
+    Integer countNum(CourseSubjectQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorMapper.java

@@ -21,4 +21,6 @@ public interface MajorMapper extends BaseMapper<Major> {
     List<CourseProjectTypeVo> selectProject(CourseProjectTypeQueryBo courseProjectTypeQueryBo);
 
     Collection<Major> queryList(MajorQueryBo bo);
+
+    Integer countNum(MajorQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java

@@ -95,9 +95,9 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
         status.add(1);
         status.add(0);
         courseSubjectQueryBo.setStatus(status);
-        Collection<CourseSubjectVo> courseSubjectVos = baseMapper.queryList(courseSubjectQueryBo);
-        if (CollectionUtils.isNotEmpty(courseSubjectVos)){
-            throw new RuntimeException("重复科目名称");
+        courseSubjectQueryBo.setCourseSubjectProjects(bo.getCourseSubjectProjects());
+        if (baseMapper.countNum(courseSubjectQueryBo)>0){
+            throw new RuntimeException("该科目下已存在重复科目名称");
         }
         CourseSubject add = BeanUtil.toBean(bo, CourseSubject.class);
         validEntityBeforeSave(add);
@@ -127,9 +127,9 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
             List<Integer> status = new ArrayList<>();
             status.add(1);
             courseSubjectQuery.setStatus(status);
-            Collection<CourseSubjectVo> courseSubjectVo = baseMapper.queryList(courseSubjectQuery);
-            if (CollectionUtils.isNotEmpty(courseSubjectVo)){
-                throw new RuntimeException("重复科目名称");
+            courseSubjectQueryBo.setCourseSubjectProjects(bo.getCourseSubjectProjects());
+            if (baseMapper.countNum(courseSubjectQueryBo)>0){
+                throw new RuntimeException("该科目下已存在重复科目名称");
             }
         }
         CourseSubject update = BeanUtil.toBean(bo, CourseSubject.class);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorServiceImpl.java

@@ -103,15 +103,11 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     @Override
     public Boolean insertByAddBo(MajorAddBo bo) {
         //判断新增名字是否重复
-        LambdaQueryWrapper<Major> lqw = Wrappers.lambdaQuery();
-        List<Integer> status = new ArrayList<>();
-        status.add(1);
-        status.add(0);
-        lqw.eq(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
-        lqw.in( Major::getStatus, status);
-        List<Major> list = this.list(lqw);
-        if (CollectionUtils.isNotEmpty(list)){
-            throw new IllegalArgumentException("专业名称重复");
+        MajorQueryBo queryBo = new MajorQueryBo();
+        queryBo.setMajorProjects(bo.getMajorProjects());
+        queryBo.setCategoryName(bo.getCategoryName());
+        if (baseMapper.countNum(queryBo)>0){
+            throw new IllegalArgumentException("该科目下已存在专业名称重复");
         }
 
         Major add = BeanUtil.toBean(bo, Major.class);
@@ -134,21 +130,12 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     public Boolean updateByEditBo(MajorEditBo bo) {
 
         //修改判断名字是否重复
-        LambdaQueryWrapper<Major> lqwMajor = Wrappers.lambdaQuery();
-        lqwMajor.eq(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
-        lqwMajor.eq(bo.getId()!= null, Major::getId, bo.getId());
-        List<Major> list = this.list(lqwMajor);
-        if (CollectionUtils.isEmpty(list)){
-            lqwMajor.clear();
-            lqwMajor.eq(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
-            List<Integer> status = new ArrayList<>();
-            status.add(1);
-            status.add(0);
-            lqwMajor.in(bo.getStatus() != null, Major::getStatus, status);
-            List<Major> list1 = this.list(lqwMajor);
-            if (CollectionUtils.isNotEmpty(list1)){
-                throw new IllegalArgumentException("专业名称重复");
-            }
+        MajorQueryBo queryBo = new MajorQueryBo();
+        queryBo.setMajorProjects(bo.getMajorProjects());
+        queryBo.setCategoryName(bo.getCategoryName());
+        queryBo.setId(bo.getId());
+        if (baseMapper.countNum(queryBo)>0){
+            throw new IllegalArgumentException("该科目下已存在专业名称重复");
         }
 
         Major update = BeanUtil.toBean(bo, Major.class);

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

@@ -75,5 +75,5 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);
 
-    List<ClassGradeUserVo> queryCountList(Integer projectId);
+    List<ClassGradeUserVo> queryCountList(@Param("projectId")Integer projectId, @Param("all") Integer all);
 }

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

@@ -1655,6 +1655,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         List<StudyAccountStatusVo> list = new ArrayList<>();
         if (!CollectionUtils.isEmpty(set)) {
             for (Long businessId : set) {
+                LambdaQueryWrapper<CourseBusiness> lqw1 = Wrappers.lambdaQuery();
+                lqw1.eq(CourseBusiness::getId, businessId);
+                lqw1.eq(CourseBusiness::getStatus, 1);
+                CourseBusiness cb = iCourseBusinessService.getOne(lqw1);
+                if (cb == null) {
+                    continue;
+                }
                 Integer notConfiguredNum = 0;
                 Integer interfaceNum = 0;
                 Integer noInterfaceNum = 0;
@@ -1686,7 +1693,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     vo.setEducationName(courseEducationType.getEducationName());
                     vo.setEducationTypeId(courseEducationType.getId());
                 }
-                List<ClassGradeUserVo> countList = queryCountList(goods.getProjectId());
+                List<ClassGradeUserVo> countList = queryCountList(goods.getProjectId(), 0);
                 for (ClassGradeUserVo classGradeUser : countList) {
                     if (Validator.isNotEmpty(classGradeUser.getLearnStatus())) {
                         //统计账号未开通数量
@@ -1729,7 +1736,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     }
                 }
                 //统计所有班级人数
-                vo.setUserNum(countList.size());
+                vo.setUserNum(queryCountList(goods.getProjectId(), null).size());
                 vo.setNotConfiguredNum(notConfiguredNum);
                 vo.setInterfaceNum(interfaceNum);
                 vo.setNoInterfaceNum(noInterfaceNum);
@@ -1751,8 +1758,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
 
-    private List<ClassGradeUserVo> queryCountList(Integer projectId) {
-        return baseMapper.queryCountList(projectId);
+    private List<ClassGradeUserVo> queryCountList(Integer projectId, Integer all) {
+        return baseMapper.queryCountList(projectId, all);
     }
 
 

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

@@ -109,4 +109,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             j.subject_id=#{id}
     </select>
+
+    <select id="countNum" parameterType="com.zhongzheng.modules.course.bo.CourseSubjectQueryBo"  resultType="Integer">
+        SELECT
+        count(*)
+        FROM
+        course_subject cs
+        LEFT JOIN course_subject_project csp ON cs.id = csp.subject_id
+        WHERE
+        cs.`status` != -1 and
+        cs.subject_name = #{subjectName}
+        <if test="courseSubjectProjects != null and courseSubjectProjects.size()!=0 ">
+            AND csp.project_id in
+            <foreach collection="courseSubjectProjects" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="id != null and id!='' ">
+            and cs.id != #{id}
+        </if>
+    </select>
 </mapper>

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

@@ -84,4 +84,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by m.sort
     </select>
 
+    <select id="countNum" parameterType="com.zhongzheng.modules.course.bo.MajorQueryBo"  resultType="Integer">
+        SELECT
+        count(*)
+        FROM
+        major m
+        LEFT JOIN major_project mp ON m.id = mp.major_id
+        WHERE
+        m.`status` != -1 and
+        m.category_name = #{categoryName}
+        <if test="majorProjects != null and majorProjects.size()!=0 ">
+            AND mp.project_id in
+            <foreach collection="majorProjects" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="id != null and id!='' ">
+            and m.id != #{id}
+        </if>
+    </select>
 </mapper>

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

@@ -1215,6 +1215,8 @@
         WHERE
           cgu.`status` = 1
           and g.project_id = #{projectId}
-          and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
+          <if test="all != null and all == 0">
+            and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
+          </if>
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockRecordMapper.xml

@@ -136,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         user_mock_record ue
         LEFT JOIN exam e ON ue.exam_id = e.exam_id
         LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        LEFT JOIN user_mock_subscribe ums ON ue.each_exam_id = ums.each_exam_id
         WHERE
         ue.user_id = #{userId}
         GROUP BY