Ver código fonte

搜索条件新增

change 3 anos atrás
pai
commit
898173fa3b
16 arquivos alterados com 43 adições e 2 exclusões
  1. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamQueryBo.java
  2. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterQueryBo.java
  3. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionQueryBo.java
  4. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java
  5. 2 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseHandoutsQueryBo.java
  6. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleQueryBo.java
  7. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java
  8. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionQueryBo.java
  9. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/bank/ExamMapper.xml
  10. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterMapper.xml
  11. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml
  12. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml
  13. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml
  14. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml
  15. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleMapper.xml
  16. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamQueryBo.java

@@ -41,6 +41,9 @@ public class ExamQueryBo extends BaseEntity {
 	@ApiModelProperty(" 状态 1正常 0关闭")
 	private List<Integer> status;
 
+	@ApiModelProperty("讲义key")
+	private String key;
+
 	/** 前缀名称 */
 	@ApiModelProperty("前缀名称")
 	private String prefixName;

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterQueryBo.java

@@ -37,6 +37,9 @@ public class QuestionChapterQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+
+	@ApiModelProperty("key")
+	private String key;
 	/** 名称 */
 	@ApiModelProperty("名称")
 	private String name;

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionQueryBo.java

@@ -41,6 +41,8 @@ public class QuestionQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	@ApiModelProperty("key")
+	private String key;
 	/** 题目正文 */
 	@ApiModelProperty("题目正文")
 	private String content;

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

@@ -37,6 +37,8 @@ public class CourseChapterQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	@ApiModelProperty("key")
+	private String key;
 	/** 名称 */
 	@ApiModelProperty("名称")
 	private String name;

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

@@ -57,8 +57,8 @@ public class CourseHandoutsQueryBo extends BaseEntity {
 	private String encoder;
 
 	/** 教育ID */
-	@ApiModelProperty("教育ID")
-	private Long educationId;
+	@ApiModelProperty("讲义key")
+	private String key;
 	/** 业务ID */
 	@ApiModelProperty("业务ID")
 	private Long businessId;

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

@@ -37,6 +37,8 @@ public class CourseModuleQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	@ApiModelProperty("key")
+	private String key;
 	/** 前缀名称 */
 	@ApiModelProperty("前缀名称")
 	private String prefixName;

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -98,4 +98,7 @@ public class CourseQueryBo extends BaseEntity {
 	/** 科目id */
 	@ApiModelProperty("科目id")
 	private Long subjectId;
+
+	@ApiModelProperty("讲义key")
+	private String key;
 }

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

@@ -37,6 +37,8 @@ public class CourseSectionQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	@ApiModelProperty("key")
+	private String key;
 	/** 名称 */
 	@ApiModelProperty("名称")
 	private String name;

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/bank/ExamMapper.xml

@@ -122,6 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="prefixName != null and prefixName != ''">
             AND e.prefix_name  like concat('%', #{prefixName}, '%')
         </if>
+        <if test="key != null and key != ''">
+            AND (e.exam_name  like concat('%', #{key}, '%') or e.prefix_name  like concat('%', #{key}, '%') or e.code = #{key})
+        </if>
         ORDER BY e.exam_id DESC
     </select>
 </mapper>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterMapper.xml

@@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="prefixName != null and prefixName != ''">
             AND qc.prefix_name  like concat('%', #{prefixName}, '%')
         </if>
+        <if test="key != null and key != ''">
+            AND (qc.name  like concat('%', #{key}, '%') or qc.prefix_name  like concat('%', #{key}, '%') or qc.code = #{key})
+        </if>
         ORDER BY qc.chapter_exam_id DESC
     </select>
 </mapper>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -189,6 +189,9 @@
         <if test="prefixName != null and prefixName != ''">
             AND q.prefix_name like concat('%', #{prefixName}, '%')
         </if>
+        <if test="key != null and key != ''">
+            AND (q.content like concat('%', #{key}, '%') or q.prefix_name like concat('%', #{key}, '%') or q.code = #{key})
+        </if>
         <if test="pageSizeSelf != null and pageSizeSelf != ''">
             LIMIT #{currIndex} , #{pageSizeSelf}
         </if>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="publishStatus != null ">
             AND c.publish_status = #{publishStatus}
         </if>
+        <if test="key != null and key != ''">
+            AND (c.name like concat('%', #{key}, '%') or c.prefix_name like concat('%', #{key}, '%') or c.code = #{key})
+        </if>
         <if test="educationTypeId != null and educationTypeId != ''">
             AND ccb.education_type_id = #{educationTypeId}
         </if>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml

@@ -87,6 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="handoutsName != null and handoutsName != ''">
             AND s.handouts_name like (concat('%', #{handoutsName}, '%'))
         </if>
+        <if test="key != null and key != ''">
+            AND (s.handouts_name like (concat('%', #{key}, '%')) or s.encoder = #{key})
+        </if>
         GROUP BY s.handouts_id
         ORDER BY s.update_time desc
     </select>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -235,6 +235,9 @@
         <if test="majorId != null and majorId != ''">
             AND c.major_id = #{majorId}
         </if>
+        <if test="key != null and key != ''">
+            AND (c.course_name like concat('%', #{key}, '%') or c.code = #{key})
+        </if>
         GROUP BY
         c.course_id
         ORDER BY c.update_time DESC

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleMapper.xml

@@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="prefixName != null and prefixName != ''">
             AND c.prefix_name like concat('%', #{prefixName}, '%')
         </if>
+        <if test="key != null and key != ''">
+            AND (c.module_name like concat('%', #{key}, '%') or c.prefix_name like concat('%', #{key}, '%') or c.code = #{key})
+        </if>
         ORDER BY c.module_id DESC
     </select>
 

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -136,6 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="prefixName != null and prefixName != ''">
             AND c.prefix_name like concat('%', #{prefixName}, '%')
         </if>
+        <if test="key != null and key != ''">
+            AND (c.name like concat('%', #{key}, '%') or c.prefix_name like concat('%', #{key}, '%') or c.code = #{key})
+        </if>
         <if test="status != null and status.size()!=0 ">
             AND c.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">