update

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

@@ -27,7 +27,7 @@
 		left join sys_area pa on sa.region_province_id_ = pa.id_
 		left join sys_area ca on sa.region_city_id_ = ca.id_
 		left join sys_area coa on sa.region_county_id_ = coa.id_
-		WHERE id_ = #{id}
+		WHERE sa.id_ = #{id}
 	</select>
 
 	<!-- 全查询 -->

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

@@ -1264,8 +1264,8 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出乐器采购清单")
     @PostMapping("order/musicalListExport")
     @PreAuthorize("@pcs.hasPermissions('order/musicalListExport')")
-    public void musicalListExport(HttpServletResponse response, String musicGroupId) throws IOException {
-        List<Goods> musicalList = studentPaymentOrderDetailService.getMusicalList(musicGroupId, null);
+    public void musicalListExport(HttpServletResponse response, String musicGroupId, int deliveryStatus) throws IOException {
+        List<Goods> musicalList = studentPaymentOrderDetailService.getMusicalList(musicGroupId, deliveryStatus);
         if (musicalList == null) {
             throw new BizException("数据集为空");
         }
@@ -1298,8 +1298,8 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出学员采购清单明细")
     @PostMapping("order/musicalListDetailExport")
     @PreAuthorize("@pcs.hasPermissions('order/musicalListDetailExport')")
-    public void musicalListDetailExport(HttpServletResponse response, String musicGroupId) throws IOException {
-        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId, null);
+    public void musicalListDetailExport(HttpServletResponse response, String musicGroupId, int deliveryStatus) throws IOException {
+        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId, deliveryStatus);
         if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }

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

@@ -50,7 +50,10 @@ public class MusicGroupShippingAddressController extends BaseController {
 	@AuditLogAnnotation(operateName = "乐团收货地址新增", interfaceURL = "musicGroupShippingAddress/add")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupShippingAddress/add')")
 	public Object add(@RequestBody MusicGroupShippingAddress shippingAddress) {
-
+		Date date = new Date();
+		shippingAddress.setUpdateTime(date);
+		shippingAddress.setCreateTime(date);
+		shippingAddress.setDelFlag(0);
 		return succeed(musicGroupShippingAddressService.insert(shippingAddress));
 	}