Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentActivity.java

@@ -18,6 +18,9 @@ public class ReplacementInstrumentActivity {
 	
 	/**  */
 	private Integer userId;
+
+	/**  */
+	private Integer openFlag;
 	
 	/**  */
 	private String userName;
@@ -46,6 +49,14 @@ public class ReplacementInstrumentActivity {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getOpenFlag() {
+		return openFlag;
+	}
+
+	public void setOpenFlag(Integer openFlag) {
+		this.openFlag = openFlag;
+	}
+
 	public String getCooperationOrganName() {
 		return cooperationOrganName;
 	}

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

@@ -2416,7 +2416,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
             if(queryInfo.getMusicGroupIds() == null || queryInfo.getMusicGroupIds().size() == 0){
-                return null;
+                return new PageInfo<MusicGroup>();
             }
         }
         musicGroupPageInfo = queryPage(queryInfo);

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

@@ -20,8 +20,8 @@ import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 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;
@@ -43,6 +43,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Object add(ReplacementInstrumentActivity replacementInstrumentActivity) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {

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

@@ -17,6 +17,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="question_result_" property="questionResult" />
 		<result column="instruments_id_" property="instrumentsId" />
+		<result column="open_flag_" property="openFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -50,6 +51,9 @@
 		<if test="subjectId != null">
 		subject_id_ = #{subjectId},
 		</if>
+		<if test="openFlag != null">
+		open_flag_ = #{openFlag},
+		</if>
 		<if test="userId != null">
 		user_id_ = #{userId},
 		</if>

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -53,7 +53,9 @@ public class ReplacementInstrumentActivityController extends BaseController {
             replacementInstrumentActivity = new ReplacementInstrumentActivity();
             replacementInstrumentActivity.setUserId(user.getId());
             replacementInstrumentActivity.setClasses(student.getCurrentClass());
-            replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            if(student.getCurrentGradeNum() != null){
+                replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            }
             replacementInstrumentActivity.setCooperationOrganId(cooperationOrganId);
             replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
             replacementInstrumentActivity.setMobileNo(user.getPhone());