Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSubjectController.java

@@ -109,4 +109,16 @@ public class CourseSubjectController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iCourseSubjectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }*/
+
+    /**
+     * 查询科目列表
+     */
+    @ApiOperation("查询科目下拉框")
+    @PreAuthorize("@ss.hasPermi('course:subject:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo<CourseSubjectVo> listAll(CourseSubjectQueryBo bo) {
+        startPage();
+        List<CourseSubjectVo> list = iCourseSubjectService.queryListAll(bo);
+        return getDataTable(list);
+    }
 }

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

@@ -59,4 +59,8 @@ public class CourseSubjectQueryBo extends BaseEntity {
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+
+	/** yes */
+	@ApiModelProperty("yes")
+	private Long wrong;
 }

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

@@ -49,4 +49,6 @@ public interface ICourseSubjectService extends IService<CourseSubject> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<CourseSubjectVo> queryListAll(CourseSubjectQueryBo bo);
 }

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

@@ -133,4 +133,15 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<CourseSubjectVo> queryListAll(CourseSubjectQueryBo bo) {
+        Collection<CourseSubjectVo> courseSubjectVos = baseMapper.queryList(bo);
+        if (bo.getEducationId() != null || bo.getBusinessId() != null || bo.getProjectId() !=null){
+            CourseSubjectQueryBo courseSubjectQueryBo = new CourseSubjectQueryBo();
+            courseSubjectQueryBo.setWrong(1L);
+            courseSubjectVos.addAll(baseMapper.queryList(courseSubjectQueryBo));
+        }
+        return entity2Vo(courseSubjectVos);
+    }
 }

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

@@ -99,5 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="businessId != null and businessId!=0 ">
             AND b.id = #{businessId}
         </if>
+        <if test="wrong != null and wrong!=0 ">
+              and (select COUNT(v.id) FROM course_subject_project v where s.id=v.subject_id) = 0
+        </if>
     </select>
 </mapper>