Merge remote-tracking branch 'origin/music_detail' into music_detail

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

@@ -1,30 +1,35 @@
 package com.ym.mec.biz.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
 import com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.biz.dal.dao.CooperationOrganDao;
-import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import org.springframework.transaction.annotation.Transactional;
-
 @Service
 public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, CooperationOrgan>  implements CooperationOrganService {
 	
@@ -55,13 +60,22 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public long insert(CooperationOrgan cooperationOrgan) {
+		Date date = new Date();
+		cooperationOrgan.setCreateTime(date);
+		cooperationOrgan.setUpdateTime(date);
+		super.insert(cooperationOrgan);
+
 		List<CooperationOrganLinkman> list = cooperationOrgan.getCooperationOrganLinkmanList();
-		
-		if(list != null && list.size() > 0){
+
+		if (list != null && list.size() > 0) {
+			for (CooperationOrganLinkman co : list) {
+				co.setCreateTime(date);
+				co.setCooperationOrganId(cooperationOrgan.getId());
+			}
 			cooperationOrganLinkmanDao.batchInsert(list);
 		}
-		
-		return super.insert(cooperationOrgan);
+
+		return 1;
 	}
 
 	@Override

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

@@ -81,7 +81,7 @@
 				mgn.music_group_id_ = #{musicGroupId}
 			</if>
 		</where>
-		ORDER BY mgn.id_
+		ORDER BY mgn.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -53,7 +53,7 @@ public class MusicGroupPerformanceController extends BaseController {
 	@ApiOperation("修改")
 	@PostMapping(value = "update")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupPerformance/update')")
-	public Object update(MusicGroupPerformance musicGroupPerformance) {
+	public Object update(@RequestBody MusicGroupPerformance musicGroupPerformance) {
 		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
 		if(musicScoreNames != null && musicScoreNames.size() > 0){
 			for (String musicScoreName : musicScoreNames) {