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

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

@@ -18,6 +18,8 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
      * @return
      */
     int batchAdd(@Param("studentInstruments") List<StudentInstrument> studentInstruments);
+    
+    int batchModify(@Param("studentInstruments") List<StudentInstrument> studentInstruments);
 
     /**
      * 批量修改
@@ -91,4 +93,6 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
      * @return
      */
     StudentInstrument getStudentMaintenance(@Param("studentId") Integer studentId, @Param("musicGroupId") String musicGroupId);
+    
+    List<StudentInstrument> queryById(@Param("idList") List<Long> idList);
 }

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
+import com.ym.mec.biz.dal.dto.StudentApplyInstrumentDto;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
@@ -153,4 +154,6 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
      * @return
      */
     List<Mapper> getInstrumentNumInMusicApply(@Param("musicGroupIds") List<String> musicGroupIds);
+    
+	List<StudentApplyInstrumentDto> queryByType(@Param("musicGroupId") String musicGroupId, @Param("orderDetailType") OrderDetailTypeEnum orderDetailType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyInstrumentDto.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dto;
+
+public class StudentApplyInstrumentDto {
+
+	private String musicGroupId;
+	
+	private Integer userId;
+	
+	private Long studentInstrumentId;
+	
+	private Long studentPyamentOrderId;
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Long getStudentInstrumentId() {
+		return studentInstrumentId;
+	}
+
+	public void setStudentInstrumentId(Long studentInstrumentId) {
+		this.studentInstrumentId = studentInstrumentId;
+	}
+
+	public Long getStudentPyamentOrderId() {
+		return studentPyamentOrderId;
+	}
+
+	public void setStudentPyamentOrderId(Long studentPyamentOrderId) {
+		this.studentPyamentOrderId = studentPyamentOrderId;
+	}
+}

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

@@ -184,6 +184,8 @@ public class MusicGroup {
 
 	//0云教练1云教练+
 	private Integer cloudTeacherType;
+	
+	private Integer musicalInstrumentsProvideStatus;
 
 	public Integer getCloudTeacherType() {
 		return cloudTeacherType;
@@ -634,4 +636,12 @@ public class MusicGroup {
 	public void setIsShowRecordOfStudent(Boolean isShowRecordOfStudent) {
 		this.isShowRecordOfStudent = isShowRecordOfStudent;
 	}
+
+	public Integer getMusicalInstrumentsProvideStatus() {
+		return musicalInstrumentsProvideStatus;
+	}
+
+	public void setMusicalInstrumentsProvideStatus(Integer musicalInstrumentsProvideStatus) {
+		this.musicalInstrumentsProvideStatus = musicalInstrumentsProvideStatus;
+	}
 }

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

@@ -40,6 +40,8 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	private Date visitStartDate;
 	
 	private Date visitEndDate;
+	
+	private String hrbp;
 
 	public String getUserNameOrIdOrMobile() {
 		return userNameOrIdOrMobile;
@@ -136,4 +138,12 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	public void setVisitEndDate(Date visitEndDate) {
 		this.visitEndDate = visitEndDate;
 	}
+
+	public String getHrbp() {
+		return hrbp;
+	}
+
+	public void setHrbp(String hrbp) {
+		this.hrbp = hrbp;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -390,4 +390,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
     Object getQuitGroupDetail(String musicGroupId);
+    
+    /**
+     * 乐保生效
+     * @param musicGroupId
+     * @return
+     */
+    boolean takeEffectOfinstrumentInsurance(String musicGroupId);
 }

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

@@ -9,16 +9,18 @@ import static com.ym.mec.biz.dal.enums.PaymentStatusEnum.YES;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.*;
-import com.ym.mec.biz.dal.page.MusicMemberQueryInfo;
-import com.ym.mec.biz.service.*;
-import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +34,46 @@ import com.alibaba.fastjson.TypeReference;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
+import com.ym.mec.biz.dal.dao.ChargeTypeDao;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
+import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupBuildLogDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderCourseSettingsDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderStudentDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentEntitiesDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentStudentCourseDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPurchaseListDao;
+import com.ym.mec.biz.dal.dao.MusicGroupQuitDao;
+import com.ym.mec.biz.dal.dao.MusicGroupSchoolTermCourseDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupSchoolTermStudentCourseDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupSubjectGoodsGroupDao;
+import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
+import com.ym.mec.biz.dal.dao.OrganizationCloudTeacherFeeDao;
+import com.ym.mec.biz.dal.dao.OrganizationDao;
+import com.ym.mec.biz.dal.dao.SchoolDao;
+import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.StudentInstrumentDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
+import com.ym.mec.biz.dal.dao.StudentPreRegistrationDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dao.StudentVisitDao;
+import com.ym.mec.biz.dal.dao.SubjectChangeDao;
+import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
+import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.CloseMusicGroupDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
@@ -40,13 +82,95 @@ import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.dal.dto.SporadicPayDto;
+import com.ym.mec.biz.dal.dto.StudentApplyInstrumentDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.dto.SubjectRegisterDto;
 import com.ym.mec.biz.dal.dto.UpdateExpectedNumDto;
+import com.ym.mec.biz.dal.entity.ApprovalStatus;
+import com.ym.mec.biz.dal.entity.ChargeType;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
+import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentStudentCourseDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.dal.entity.MusicGroupSchoolTermCourseDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.MusicMemberDto;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee;
+import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.entity.StudentInstrument;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.SubjectChange;
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
+import com.ym.mec.biz.dal.enums.GoodsType;
+import com.ym.mec.biz.dal.enums.GradeTypeEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.PeriodEnum;
+import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
+import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.biz.dal.page.MusicMemberQueryInfo;
 import com.ym.mec.biz.event.source.GroupEventSource;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.ClassGroupStudentMapperService;
+import com.ym.mec.biz.service.CloudTeacherOrderService;
+import com.ym.mec.biz.service.ContractService;
+import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.ImGroupMemberService;
+import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.PayService;
+import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.biz.service.StudentPaymentRouteOrderService;
+import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.ImGroupMember;
@@ -54,6 +178,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -3546,4 +3671,49 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         return resultMap;
     }
+
+	@Override
+	public boolean takeEffectOfinstrumentInsurance(String musicGroupId) {
+		
+		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息查询失败");
+		}
+		
+		if(musicGroup.getMusicalInstrumentsProvideStatus() != 0){
+			throw new BizException("乐器已发货，请勿重复操作");
+		}
+		
+		Date date = new Date();
+		
+		musicGroup.setMusicalInstrumentsProvideStatus(1);
+		musicGroup.setUpdateTime(date);
+		musicGroupDao.update(musicGroup);
+		
+		//查询当前乐团报名订单中购买了乐保的订单
+		List<StudentApplyInstrumentDto> maintenanceList = studentPaymentOrderDetailDao.queryByType(musicGroupId, OrderDetailTypeEnum.MAINTENANCE);
+		
+		List<Long> instrumentIdList = maintenanceList.stream().map(t -> t.getStudentInstrumentId()).collect(Collectors.toList());
+		
+		List<StudentInstrument> studentInstrumentList = studentInstrumentDao.queryById(instrumentIdList);
+		
+		List<StudentInstrument> updateList = new ArrayList<StudentInstrument>();
+		
+		for (StudentInstrument si : studentInstrumentList) {
+			if (si.getStatus() == 0 && si.getStartTime() == null) {
+				si.setStatus(1);
+				si.setStartTime(date);
+				si.setEndTime(DateUtil.addYears(date, 1));
+				si.setUpdateTime(date);
+				
+				updateList.add(si);
+			}
+		}
+		
+		if(updateList.size() > 0){
+			studentInstrumentDao.batchModify(updateList);
+		}
+		
+		return true;
+	}
 }

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

@@ -323,7 +323,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         Date endTime = null;
         if (orderDetails4Maintenance.size() > 0) {
             maintenanceDetail = orderDetails4Maintenance.get(0);
-            maintenanceStatus = 1;
+            //maintenanceStatus = 1;
             startTime = new Date();
             endTime = DateUtil.addYears(startTime, 1);
         }
@@ -336,8 +336,8 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         studentInstrument.setStatus(maintenanceStatus);
         studentInstrument.setOrderId(order.getId());
         studentInstrument.setChangeOrderId(order.getId());
-        studentInstrument.setStartTime(startTime);
-        studentInstrument.setEndTime(endTime);
+        //studentInstrument.setStartTime(startTime);
+        //studentInstrument.setEndTime(endTime);
         addStudentInstrument(studentInstrument);
         if (maintenanceDetail != null) {
             maintenanceDetail.setStudentInstrumentId(studentInstrument.getId());

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

@@ -167,6 +167,9 @@
 	        <if test="sourceFrom != null">
 	            AND ei.source_from_ = #{sourceFrom}
 	        </if>
+	        <if test="hrbp != null">
+	            AND ei.hrbp_ = #{hrbp}
+	        </if>
 			<if test="intentionCity != null">
 				AND ei.intention_city_ LIKE CONCAT('%',#{intentionCity},'%')
 			</if>
@@ -177,16 +180,16 @@
 	            AND ei.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	        </if>
 	        <if test="startDate != null">
-	            AND ei.update_time_ &gt;= #{startDate}
+	            AND date(ei.update_time_) &gt;= #{startDate}
 	        </if>
 	        <if test="endDate != null">
-	            AND ei.update_time_ &lt;= #{endDate}
+	            AND date(ei.update_time_) &lt;= #{endDate}
 	        </if>
 	        <if test="visitStartDate != null">
-	            AND ei.next_visit_date_ &gt;= #{visitStartDate}
+	            AND date(ei.next_visit_date_) &gt;= #{visitStartDate}
 	        </if>
 	        <if test="visitEndDate != null">
-	            AND ei.next_visit_date_ &lt;= #{visitEndDate}
+	            AND date(ei.next_visit_date_) &lt;= #{visitEndDate}
 	        </if>
 	        <if test="operator != null">
 	            AND (ei.operator_id_ like concat('%',#{operator},'%') or u.real_name_ like concat('%',#{operator},'%'))

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

@@ -44,6 +44,7 @@
         <result column="course_view_type_" property="courseViewType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
+        <result column="musical_instruments_provide_status_" property="musicalInstrumentsProvideStatus"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -215,6 +216,9 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag},
             </if>
+            <if test="musicalInstrumentsProvideStatus != null">
+                musical_instruments_provide_status_ = #{musicalInstrumentsProvideStatus},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -100,6 +100,61 @@
         </set>
         where id_ = #{id}
     </update>
+    
+    <update id="batchModify" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">
+        <!--@mbg.generated-->
+        <foreach collection="studentInstruments" item="studentInstrument" separator=";">
+        update student_instrument
+        <set>
+            <if test="studentInstrument.studentId != null">
+                student_id_ = #{studentInstrument.studentId},
+            </if>
+            <if test="studentInstrument.organId != null">
+                organ_id_ = #{studentInstrument.organId},
+            </if>
+            <if test="studentInstrument.goodsId != null">
+                goods_id_ = #{studentInstrument.goodsId},
+            </if>
+            <if test="studentInstrument.goodsName != null">
+                goods_name_ = #{studentInstrument.goodsName},
+            </if>
+            <if test="studentInstrument.goodsBrand != null">
+                goods_brand_ = #{studentInstrument.goodsBrand},
+            </if>
+            <if test="studentInstrument.specification != null">
+                specification_ = #{studentInstrument.specification},
+            </if>
+            <if test="studentInstrument.goodsImg != null">
+                goods_img_ = #{studentInstrument.goodsImg},
+            </if>
+            <if test="studentInstrument.status != null">
+                status_ = #{studentInstrument.status},
+            </if>
+            <if test="studentInstrument.operation != null">
+                operation_ = #{studentInstrument.operation},
+            </if>
+            start_time_ = #{studentInstrument.startTime},
+            end_time_ = #{studentInstrument.endTime},
+            <if test="studentInstrument.changeOrderId != null">
+                change_order_id_ = #{studentInstrument.changeOrderId},
+            </if>
+            <if test="studentInstrument.createTime != null">
+                create_time_ = #{studentInstrument.createTime},
+            </if>
+            <if test="studentInstrument.delFlag != null">
+                del_flag_ = #{studentInstrument.delFlag},
+            </if>
+            <if test="studentInstrument.goodsCategoryId != null">
+                goods_category_id_ = #{studentInstrument.goodsCategoryId},
+            </if>
+            <if test="studentInstrument.goodsCategoryName != null">
+                goods_category_name_ = #{studentInstrument.goodsCategoryName},
+            </if>
+            update_time = NOW(),
+        </set>
+        where id_ = #{studentInstrument.id}
+        </foreach>
+    </update>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentInstrument">
@@ -310,4 +365,12 @@
         AND student_id_ = #{studentId} AND del_flag_ = 0 AND end_time_ > NOW()
     </select>
 
+    <select id="queryById" resultMap="StudentInstrument">
+        SELECT * FROM student_instrument
+        where id_ IN
+        <foreach collection="idList" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

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

@@ -33,6 +33,13 @@
         <result column="key_" property="key"/>
         <result column="value_" property="value"/>
     </resultMap>
+    
+    <resultMap type="com.ym.mec.biz.dal.dto.StudentApplyInstrumentDto" id="StudentApplyInstrumentDto">
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="student_instrument_id_" property="studentInstrumentId"/>
+        <result column="user_id_" property="userId"/>
+        <result column="student_payment_order_id_" property="studentPyamentOrderId"/>
+    </resultMap>
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentPaymentOrderDetail">
@@ -311,4 +318,10 @@
         AND spo.type_ = 'APPLY' and spo.status_ = 'SUCCESS' and spod.type_ = 'MUSICAL'
         GROUP BY spo.music_group_id_
     </select>
+
+    <select id="queryByType" resultMap="StudentApplyInstrumentDto" parameterType="map">
+    	select spo.user_id_,spo.music_group_id_,spod.student_instrument_id_ from student_payment_order_detail spod left join student_payment_order spo on spod.payment_order_id_ = spo.id_ 
+        WHERE spo.music_group_id_ = #{musicGroupId}
+        AND spo.type_ = 'APPLY' and spo.status_ = 'SUCCESS' and spod.type_ = #{orderDetailType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </select>
 </mapper>

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

@@ -356,4 +356,15 @@ public class MusicGroupController extends BaseController {
 		}
 		return succeed(musicGroupService.queryMusicMemberList(queryInfo));
 	}
+
+	@ApiOperation(value = "确认发放乐器")
+	@PostMapping("/takeEffectOfinstrumentInsurance")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/takeEffectOfinstrumentInsurance')")
+	public HttpResponseResult takeEffectOfinstrumentInsurance(String musicGroupId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return succeed(musicGroupService.takeEffectOfinstrumentInsurance(musicGroupId));
+	}
 }