Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ChargeTypeSubjectMapperQueryInfo.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class ChargeTypeSubjectMapperQueryInfo extends QueryInfo {
+
+	private Integer chargeTypeId;
+
+	/**  */
+	private Integer subjectId;
+
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
+
+	public Integer getSubjectId() {
+		return subjectId;
+	}
+
+	public void setSubjectId(Integer subjectId) {
+		this.subjectId = subjectId;
+	}
+}

mec-biz/src/main/resources/config/mybatis/ChargeTypeSubjectMapperMapper.xml

@@ -130,14 +130,30 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ChargeTypeSubjectMapper" parameterType="map">
-        SELECT * FROM charge_type_subject_mapper ORDER BY id_
+        SELECT * FROM charge_type_subject_mapper 
+        <where>
+        	<if test="chargeTypeId != null">
+        		charge_type_id_ = #{chargeTypeId}
+        	</if>
+        	<if test="subjectId != null">
+        		subject_id_ = #{subjectId}
+        	</if>
+        </where>
+        ORDER BY id_ desc
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM charge_type_subject_mapper
+        SELECT COUNT(*) FROM charge_type_subject_mapper
+        <where>
+        	<if test="chargeTypeId != null">
+        		charge_type_id_ = #{chargeTypeId}
+        	</if>
+        	<if test="subjectId != null">
+        		subject_id_ = #{subjectId}
+        	</if>
+        </where>
     </select>
 
     <!-- 根据收费类型获取乐团乐器折扣 -->

mec-web/src/main/java/com/ym/mec/web/controller/ChargeTypeSubjectMapperController.java

@@ -1,11 +1,11 @@
 package com.ym.mec.web.controller;
 
-import java.util.List;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
+import com.ym.mec.biz.dal.page.ChargeTypeSubjectMapperQueryInfo;
 import com.ym.mec.biz.service.ChargeTypeSubjectMapperService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 
 @RequestMapping("chargeTypeSubjectMapper")
 @Api(tags = "收费类型与科目的关联服务")
@@ -32,7 +32,7 @@ public class ChargeTypeSubjectMapperController extends BaseController {
     @ApiOperation(value = "分页查询收费类型列表")
     @GetMapping(value = "/queryPage", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('chargeTypeSubjectMapper/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(ChargeTypeSubjectMapperQueryInfo queryInfo) {
         return succeed(chargeTypeSubjectMapperService.queryPage(queryInfo));
     }