feat:问卷调查

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/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/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>
@@ -126,7 +125,7 @@
 		SELECT
 			ria.subject_id_,
 			sub.name_ subject_name_,
-			stu.username_ student_name_,
+			ria.user_name_,
 			ria.mobile_no_,
 			ri.brand_,
 			ri.specification_