yonge 5 years ago
parent
commit
241eb8d019

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

@@ -22,6 +22,8 @@ public class ClassGroupQueryInfo extends QueryInfo {
     
     @ApiModelProperty(value = "班级名称", required = false)
     private String name;
+    
+    private Integer delFlag;
 
 	public Integer getId() {
 		return id;
@@ -62,4 +64,12 @@ public class ClassGroupQueryInfo extends QueryInfo {
 	public void setName(String name) {
 		this.name = name;
 	}
+
+	public Integer getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Integer delFlag) {
+		this.delFlag = delFlag;
+	}
 }

+ 6 - 0
mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -149,6 +149,9 @@
     <select id="queryPage" resultMap="ClassGroup" parameterType="map">
         SELECT * FROM class_group 
         <where>
+        	<if test="delFlag != null">
+				and del_flag_ = #{delFlag}
+			</if>
         	<if test="id != null">
 				and id_ = #{id}
 			</if>
@@ -173,6 +176,9 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM class_group
         <where>
+        	<if test="delFlag != null">
+				and del_flag_ = #{delFlag}
+			</if>
         	<if test="id != null">
 				and id_ = #{id}
 			</if>

+ 1 - 0
mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -54,6 +54,7 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryPage')")
     public Object queryPage(ClassGroupQueryInfo queryInfo) {
+    	queryInfo.setDelFlag(0);
         return succeed(classGroupService.queryPage(queryInfo));
     }