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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java

@@ -19,7 +19,7 @@ public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, Repla
 
     int countReplacements(Map<String, Object> params);
 
-    ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationOrganId);
+    ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationId);
 
     int openPay(@Param("cooperationOrganId") Integer cooperationOrganId);
 

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

@@ -244,8 +244,9 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         int count = replacementInstrumentActivityDao.countReplacements(params);
 
         if (queryInfo.getPage() == 1) {
-            ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationOrganId());
-            CooperationOrgan cooperationOrgan = cooperationOrganDao.get(queryInfo.getCooperationOrganId());
+            ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationId());
+            ReplacementInstrumentCooperation cooperation = replacementInstrumentCooperationDao.get(queryInfo.getCooperationId());
+            CooperationOrgan cooperationOrgan = cooperationOrganDao.get(cooperation.getCooperationOrganId());
             head.setCooperationOrganName(cooperationOrgan.getName());
             pageInfo.setStatInfo(head);
         }

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

@@ -229,7 +229,7 @@
         FROM replacement_instrument_activity ria
                  LEFT JOIN replacement_instrument_cooperation ric
                            ON ria.cooperation_organ_id_ = ric.cooperation_organ_id_
-        WHERE ria.cooperation_organ_id_ = #{cooperationOrganId}
+        WHERE ria.replacement_instrument_cooperation_id_ = #{cooperationId}
     </select>
 
     <update id="openPay" parameterType="integer">