update

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

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class MusicGroupDeliveryRecordQueryInfo extends QueryInfo {
+
+	private String musicGroupId;
+	
+	private String expressCompany;
+	
+	private String expressBillNo;
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public String getExpressCompany() {
+		return expressCompany;
+	}
+
+	public void setExpressCompany(String expressCompany) {
+		this.expressCompany = expressCompany;
+	}
+
+	public String getExpressBillNo() {
+		return expressBillNo;
+	}
+
+	public void setExpressBillNo(String expressBillNo) {
+		this.expressBillNo = expressBillNo;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupDeliveryRecordService.java

@@ -5,4 +5,5 @@ import com.ym.mec.common.service.BaseService;
 
 public interface MusicGroupDeliveryRecordService extends BaseService<Long, MusicGroupDeliveryRecord> {
 
+	
 }

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

@@ -82,13 +82,35 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupDeliveryRecord"
 		parameterType="map">
-		SELECT * FROM music_group_delivery_record ORDER BY id_
+		SELECT * FROM music_group_delivery_record
+		<where>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				and music_group_id_ = #{musicGroupId}
+			</if>
+			<if test="expressCompany != null and expressCompany != ''">
+				and express_company_ = #{expressCompany}
+			</if>
+			<if test="expressBillNo != null and expressBillNo != ''">
+				and express_bill_no_ = #{expressBillNo}
+			</if>
+		</where>
+		 ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		music_group_delivery_record
+		SELECT COUNT(*) FROM music_group_delivery_record
+		<where>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				and music_group_id_ = #{musicGroupId}
+			</if>
+			<if test="expressCompany != null and expressCompany != ''">
+				and express_company_ = #{expressCompany}
+			</if>
+			<if test="expressBillNo != null and expressBillNo != ''">
+				and express_bill_no_ = #{expressBillNo}
+			</if>
+		</where>
 	</select>
 </mapper>

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

@@ -0,0 +1,33 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
+import com.ym.mec.biz.dal.page.MusicGroupDeliveryRecordQueryInfo;
+import com.ym.mec.biz.service.MusicGroupDeliveryRecordService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+@RequestMapping("musicGroupDeliveryRecord")
+@Api(tags = "乐团发货记录")
+@RestController
+public class MusicGroupDeliveryRecordController extends BaseController {
+
+	@Autowired
+	private MusicGroupDeliveryRecordService musicGroupDeliveryRecordService;
+	
+	@GetMapping("/queryPage")
+	public HttpResponseResult<PageInfo<MusicGroupDeliveryRecord>> queryPage(MusicGroupDeliveryRecordQueryInfo queryInfo) {
+		return succeed(musicGroupDeliveryRecordService.queryPage(queryInfo));
+	}
+	
+	@GetMapping("/queryGoodsDetail")
+	public Object queryGoodsDetail() {
+		return succeed();
+	}
+}