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

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

@@ -8,6 +8,8 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
 
     private Integer cooperationOrganId;
 
+    private Integer cooperationId;
+
     private String organId;
 
     private String subjectId;
@@ -28,6 +30,14 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否参与校赛")
     private Boolean hasYesFirstAnswer;
 
+    public Integer getCooperationId() {
+        return cooperationId;
+    }
+
+    public void setCooperationId(Integer cooperationId) {
+        this.cooperationId = cooperationId;
+    }
+
     public Integer getPayStatus() {
         return payStatus;
     }

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

@@ -256,11 +256,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 
         pageInfo.setTotal(count);
         params.put("offset", pageInfo.getOffset());
-        List<ReplacementInstrumentActivityStatDto> dataList = replacementInstrumentActivityDao.queryReplacements(params);
-        if (!CollectionUtils.isEmpty(dataList)) {
-
-        }
-        pageInfo.setRows(dataList);
+        pageInfo.setRows(replacementInstrumentActivityDao.queryReplacements(params));
         return pageInfo;
     }
 

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

@@ -136,6 +136,20 @@
 			</if>
 		</where>
 	</sql>
+
+	<sql id="queryDetailPageSql1">
+		<where>
+			<if test="activeId != null">
+				AND qu1.active_id_ = #{activeId}
+			</if>
+			<if test="activeType != null and activeType != ''">
+				AND qu1.active_type_ = #{activeType}
+			</if>
+			<if test="topicId != null">
+				AND qu1.questionnaire_topic_id_ = #{topicId}
+			</if>
+		</where>
+	</sql>
 	<select id="queryDetailPage" resultMap="QuestionnaireUserResultDto">
 		SELECT qu1.*,qur.username_,qur.phone_,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_
 		FROM (SELECT su.id_,su.username_,su.phone_ FROM questionnaire_user_result qu
@@ -146,6 +160,7 @@
 		LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
 		LEFT JOIN questionnaire_question qq ON qq.id_ = qu1.questionnaire_question_id_
 		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qu1.questionnaire_question_item_id_list_)
+		<include refid="queryDetailPageSql1"/>
 		GROUP BY qu1.user_id_,qq.id_
 		ORDER BY qu1.user_id_
 	</select>

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

@@ -150,6 +150,9 @@
             <if test="cooperationOrganId!=null">
                 AND ria.cooperation_organ_id_ = #{cooperationOrganId}
             </if>
+            <if test="cooperationId != null">
+                AND ria.replacement_instrument_cooperation_id_ = #{cooperationId}
+            </if>
             <if test="subjectId!=null">
                 AND ria.subject_id_ = #{subjectId}
             </if>
@@ -283,7 +286,8 @@
         g.discount_price_,
         g.group_purchase_price_ sale_price_,
         (g.discount_price_ - g.group_purchase_price_) depreciation_price_,
-        s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
+        s.name_ subject_name_,co.name_ cooperationOrganName
+        FROM replacement_instrument_activity ria
         LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         LEFT JOIN subject s ON s.id_ = ria.subject_id_
         lEFT JOIN sys_user su ON su.id_ = ria.user_id_

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

@@ -98,11 +98,11 @@
 
     <select id="countAllReplacementsInfo" resultType="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
         SELECT cooperation_organ_id_              cooperationOrganId,
-               COUNT(*)                           activeNum,
+               COUNT(user_id_)                           activeNum,
                SUM(IF(instruments_id_ > 0, 1, 0)) replaceNum,
                SUM(IF(pay_status_ = 2, 1, 0)) payNum
         FROM replacement_instrument_activity
-        GROUP BY cooperation_organ_id_
+        GROUP BY replacement_instrument_cooperation_id_
     </select>
     <select id="findByCooperationOrganIdAndTopicId" resultMap="ReplacementInstrumentCooperation">
         SELECT *