Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -74,9 +74,10 @@
 	</select>
 
     <select id="getMusicGroupAuditSuccess" resultMap="MusicGroupBuildLog">
-        SELECT * FROM music_group_build_log where music_group_id_ IN
+        SELECT * FROM music_group_build_log WHERE music_group_id_ IN
         <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
             #{musicGroupId}
         </foreach>
+        AND event_ = '审核通过（审核中 -> 报名中）'
     </select>
 </mapper>

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

@@ -1845,7 +1845,7 @@ public class ExportController extends BaseController {
                 }
             }
             for (MusicGroupBuildLog groupAuditSuccess : musicGroupAuditSuccess) {
-                if (groupAuditSuccess.getMusicGroupId() != musicGroupRegister.getMusicGroupId()) continue;
+                if (!groupAuditSuccess.getMusicGroupId().equals(musicGroupRegister.getMusicGroupId())) continue;
                 musicGroupRegisterMap.put("auditSuccessTime", groupAuditSuccess.getCreateTime());
             }
             musicGroupRegisterMap.put("groupBuyMusicalNum", musicGroupRegister.getGroupBuyMusicalNum());