Merge branch '2021-04-21_music_replace' of http://git.dayaedu.com/yonge/mec into 2021-04-21_music_replace

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReplacementInstrumentActivityStatDto.java

@@ -11,8 +11,6 @@ public class ReplacementInstrumentActivityStatDto extends ReplacementInstrumentA
 
     private String subjectName;
 
-    private String studentName;
-
     /** 品牌 */
     private String brand;
 
@@ -27,14 +25,6 @@ public class ReplacementInstrumentActivityStatDto extends ReplacementInstrumentA
         this.subjectName = subjectName;
     }
 
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
     public String getBrand() {
         return brand;
     }

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

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface ReplacementInstrumentCooperationService extends BaseService<Integer, ReplacementInstrumentCooperation> {
@@ -19,4 +21,12 @@ public interface ReplacementInstrumentCooperationService extends BaseService<Int
      * @return
      */
     ReplacementInstrumentCooperation getByCooperationId(Integer cooperationId);
+
+
+    /**
+     * 获取合作单位乐器置换列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -22,10 +22,8 @@ import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 @Service
 public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrumentActivity> implements ReplacementInstrumentActivityService {
@@ -74,6 +72,10 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
+		if(Objects.nonNull(queryInfo.getCooperationOrganId())){
+			throw new BizException("请指定合作单位");
+		}
+
 		int count = replacementInstrumentActivityDao.countReplacements(params);
 
 		if(queryInfo.getPage()==1){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentCooperationServiceImpl.java

@@ -4,9 +4,11 @@ import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
 import com.ym.mec.biz.dal.dao.ReplacementInstrumentCooperationDao;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentCooperationService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,4 +51,13 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
     public ReplacementInstrumentCooperation getByCooperationId(Integer cooperationId) {
         return replacementInstrumentCooperationDao.getByCooperationId(cooperationId);
     }
+
+    @Override
+    public PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo) {
+        PageInfo<ReplacementInstrumentCooperation> pageInfo = queryPage(queryInfo);
+        if (pageInfo.getRows().size() > 0) {
+
+        }
+        return pageInfo;
+    }
 }

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

@@ -24,7 +24,6 @@
 
 	<resultMap id="ReplacementInstrumentActivityStatDto" type="com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto" extends="ReplacementInstrumentActivity">
 		<result property="subjectName" column="subject_name_"/>
-		<result property="studentName" column="student_name_"/>
 		<result property="brand" column="brand_"/>
 		<result property="specification" column="specification_"/>
 	</resultMap>
@@ -124,7 +123,7 @@
 		SELECT
 			ria.subject_id_,
 			sub.name_ subject_name_,
-			stu.username_ student_name_,
+			ria.user_name_,
 			ria.mobile_no_,
 			ri.brand_,
 			ri.specification_

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

@@ -55,7 +55,7 @@ public class ReplacementInstrumentCooperationController extends BaseController {
                 return failed("非法请求");
             }
         }
-        return succeed(replacementInstrumentCooperationService.queryPage(queryInfo));
+        return succeed(replacementInstrumentCooperationService.getPageList(queryInfo));
     }
 
     @ApiOperation(value = "新增合作单位置换活动")