Merge branch 'zx_saas_0303' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -467,4 +467,14 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<Map<Integer, String>> queryNormalGroupName(@Param("studentIds") List<Integer> studentIds);
+
+    /**
+    * @description: 乐团剩余时长未排课
+     * @param organIds
+     * @param tenantId
+    * @return java.util.List<java.lang.String>
+    * @author zx
+    * @date 2022/3/3 15:15 
+    */
+    List<String> queryHasSubCourseTimes(@Param("organIds") String organIds, @Param("tenantId") Integer tenantId);
 }

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

@@ -9,6 +9,9 @@ import java.util.Date;
 import java.util.List;
 
 public class MusicGroupPaymentBaseCalender {
+	@ApiModelProperty(value = "是否继续操作", required = true)
+	private Boolean confirmCreate = false;
+
 	private Long calenderId;
 
 	@ApiModelProperty(value = "乐团编号", required = true)
@@ -51,6 +54,14 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "进行中加学员拓展信息", required = false)
 	private CalenderAddStudent calenderAddStudent;
 
+	public Boolean getConfirmCreate() {
+		return confirmCreate;
+	}
+
+	public void setConfirmCreate(Boolean confirmCreate) {
+		this.confirmCreate = confirmCreate;
+	}
+
 	public Long getCalenderId() {
 		return calenderId;
 	}

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -71,6 +72,15 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 	@ApiModelProperty(value = "状态", required = false)
 	private CloudCoachPaymentProgram.StatusEnum status;
 
+	@ApiModelProperty(value = "审核人", required = false)
+	private Integer audit;
+
+	@ApiModelProperty(value = "审核人", required = false)
+	private String auditName;
+
+	@ApiModelProperty(value = "审核时间", required = false)
+	private Date auditTime;
+
 	public enum StatusEnum implements BaseEnum<String, CloudCoachPaymentProgram.StatusEnum> {
 		AUDITING("审核中"), REJECT("审核拒绝"), OPEN("审核通过");
 
@@ -90,6 +100,30 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 		}
 	}
 
+	public Integer getAudit() {
+		return audit;
+	}
+
+	public void setAudit(Integer audit) {
+		this.audit = audit;
+	}
+
+	public String getAuditName() {
+		return auditName;
+	}
+
+	public void setAuditName(String auditName) {
+		this.auditName = auditName;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
 	public StatusEnum getStatus() {
 		return status;
 	}

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

@@ -25,6 +25,12 @@ public class QuestionnaireTopic extends BaseEntity {
 
 	/** 创建人编号 */
 	private Integer creatorId;
+
+	/** 是否需要登录（1是0否） */
+	private Integer loginFlag = 1;
+
+	/** 是否逐题提交） */
+	private Integer commitType = 1;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -38,6 +44,22 @@ public class QuestionnaireTopic extends BaseEntity {
 	//问卷题目
 	private List<QuestionnaireQuestion> questionnaireQuestionList;
 
+	public Integer getLoginFlag() {
+		return loginFlag;
+	}
+
+	public void setLoginFlag(Integer loginFlag) {
+		this.loginFlag = loginFlag;
+	}
+
+	public Integer getCommitType() {
+		return commitType;
+	}
+
+	public void setCommitType(Integer commitType) {
+		this.commitType = commitType;
+	}
+
 	public int getAgainCommitFlag() {
 		return againCommitFlag;
 	}

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

@@ -98,7 +98,7 @@ public class StudentAttendance extends BaseEntity {
 	private int normalRemind;
 
 	@ApiModelProperty(value = "是否达标1是0否")
-	private Integer qualifiedFlag = 0;
+	private Integer qualifiedFlag = 1;
 
 	public Integer getQualifiedFlag() {
 		return qualifiedFlag;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexErrorType.java

@@ -30,6 +30,7 @@ public enum IndexErrorType implements BaseEnum<String, IndexErrorType> {
     COURSE_TIME_ERROR("COURSE_TIME_ERROR", "课程时间安排异常"),
     TEACHER_LEAVE("TEACHER_LEAVE", "老师请假"),
     TEACHER_EXPECT_SALARY_BE_LOW("TEACHER_EXPECT_SALARY_BE_LOW", "预计课酬较低"),
+    MUSIC_GROUP_HAS_COURSE_TIMES("MUSIC_GROUP_HAS_COURSE_TIMES", "乐团剩余时长未排课"),
     INSPECTION_ITEM("INSPECTION_ITEM", "乐团巡查任务未计划"),
     INSPECTION_ITEM_PLAN("INSPECTION_ITEM_PLAN", "乐团巡查任务未提交"),
     STUDENT_VISIT("STUDENT_VISIT", "回访任务未完成"),

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

@@ -53,6 +53,17 @@ public class MusicGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "维修技师")
     private Integer repairUserId;
 
+    @ApiModelProperty(value = "有剩余未排课时长（当缴费项目结束3个月后，该缴费项目中的学员剩余时长仍未排课，则提醒该事项）")
+    private boolean hasSubCourseTimes = false;
+
+    public boolean getHasSubCourseTimes() {
+        return hasSubCourseTimes;
+    }
+
+    public void setHasSubCourseTimes(boolean hasSubCourseTimes) {
+        this.hasSubCourseTimes = hasSubCourseTimes;
+    }
+
     public Integer getRepairUserId() {
         return repairUserId;
     }

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

@@ -8,8 +8,10 @@ import java.util.Set;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import org.springframework.ui.ModelMap;
 
 public interface MusicGroupPaymentCalenderService extends BaseService<Long, MusicGroupPaymentCalender> {
 
@@ -25,7 +27,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param musicGroupPaymentBaseCalender
 	 * @return
 	 */
-	String create1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
+	HttpResponseResult<ModelMap> create1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
 	
 	/**
 	 * 获取明细
@@ -195,7 +197,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	* @author zx
 	* @date 2021/12/27 20:43
 	*/
-    String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
+	HttpResponseResult<ModelMap> merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
 
     MusicGroupPaymentCalender getMusicGroupRegCalender(String musicGroupId);
 

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.CloudCoachPaymentProgram;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
@@ -50,6 +52,8 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 	private SysMessageService sysMessageService;
 	@Autowired
 	private TeacherDao teacherDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, CloudCoachPaymentProgram> getDAO() {
@@ -164,14 +168,18 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 		if(status == CloudCoachPaymentProgram.StatusEnum.AUDITING){
 			throw new BizException("审核状态异常");
 		}
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		paymentProgram.setStatus(status);
 		paymentProgram.setMemo(cloudCoachPaymentProgram.getMemo());
-		paymentProgram.setUpdateTime(new Date());
-		cloudCoachPaymentProgramDao.update(cloudCoachPaymentProgram);
+		Date date = new Date();
+		paymentProgram.setUpdateTime(date);
+		paymentProgram.setAuditTime(date);
+		paymentProgram.setAudit(sysUser.getId());
+		cloudCoachPaymentProgramDao.update(paymentProgram);
 		if(status == CloudCoachPaymentProgram.StatusEnum.OPEN){
-			List<Integer> userIds = studentCloudCoachPaymentDetailsDao.findUserByProgramId(cloudCoachPaymentProgram.getId());
-			cloudCoachPaymentProgram.setUserIds(userIds);
-			this.auditPass(cloudCoachPaymentProgram);
+			List<Integer> userIds = studentCloudCoachPaymentDetailsDao.findUserByProgramId(paymentProgram.getId());
+			paymentProgram.setUserIds(userIds);
+			this.auditPass(paymentProgram);
 		}
 	}
 }

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

@@ -1060,6 +1060,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size());
 		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg());
 		result.add(infoDto1);
+
+		//乐团剩余时长未排课
+		List<String> musicGroupIds = musicGroupDao.queryHasSubCourseTimes(organIds,tenantId);
+		result.add(new IndexErrInfoDto(IndexErrorType.MUSIC_GROUP_HAS_COURSE_TIMES, IndexErrorType.MUSIC_GROUP_HAS_COURSE_TIMES.getMsg(),musicGroupIds.size(), null));
 		return result;
 	}
 

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

@@ -16,7 +16,9 @@ import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
 import com.ym.mec.biz.event.source.GroupEventSource;
 import com.ym.mec.biz.event.source.SendSeoMessageSource;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
@@ -26,9 +28,11 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -147,12 +151,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("请登录");
         }
         // 所有缴费项目已完成排课才能创建下一个缴费项目
-        String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
+        /*String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
         if (StringUtils.isNoneBlank(organBatchNo)) {
             if (StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(organBatchNo)) {
                 throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
             }
-        }
+        }*/
 
         List<MusicGroupPaymentCalenderStudentDetail> calenderStudentDetails = musicGroupPaymentCalenderDto.getMusicGroupPaymentCalenderStudentDetails();
 
@@ -222,7 +226,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String create1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    public HttpResponseResult<ModelMap> create1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
         checkObjectNull(musicGroupPaymentBaseCalender, o -> {
             throw new BizException("参数校验异常");
         });
@@ -237,19 +241,13 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("请登录");
         });
 
-//		if(musicGroupPaymentBaseCalender.getCalenderActivityList() == null
-//				&& musicGroupPaymentBaseCalender.getCalenderMember() == null
-//				&& musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() == null
-//				&& musicGroupPaymentBaseCalender.getMusicRepair() == null){
-//			throw new BizException("请选择一个缴费项目");
-//		}
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.PRE_BUILD_FEE) {
             throw new BizException("创建缴费失败：已存在缴费项目");
         }
         // 所有缴费项目已完成排课才能创建下一个缴费项目
         String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
-        if (StringUtils.isNoneBlank(orignBatchNo)) {
-            throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
+        if (!musicGroupPaymentBaseCalender.getConfirmCreate() && StringUtils.isNoneBlank(orignBatchNo)) {
+            return BaseController.failed(HttpStatus.MULTI_STATUS,"当前乐团存在未排课的缴费项目，请再次确认操作");
         }
 
         // 不是进行中，只能创建一次缴费
@@ -426,7 +424,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 executor.shutdown();
             }
         }
-        return batchNo;
+        ModelMap map = new ModelMap(1);
+        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
+        return BaseController.succeed(map);
     }
 
     //校验缴费项目进行中加学员
@@ -1221,7 +1221,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    public HttpResponseResult<ModelMap> merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
         del(musicGroupPaymentBaseCalender.getCalenderId());
         return create1(musicGroupPaymentBaseCalender);
     }

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

@@ -3073,8 +3073,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (sysUser == null) {
             throw new BizException("获取用户信息失败");
         }
-        PageInfo<MusicGroup> musicGroupPageInfo;
-        musicGroupPageInfo = queryPage(queryInfo);
+        //查询有剩余排课时长的乐团
+        if(queryInfo.getHasSubCourseTimes()){
+            List<String> musicGroupIds = musicGroupDao.queryHasSubCourseTimes(queryInfo.getOrganId(),queryInfo.getTenantId());
+            queryInfo.setMusicGroupIds(musicGroupIds);
+        }
+        PageInfo<MusicGroup> musicGroupPageInfo = queryPage(queryInfo);
         List<MusicGroup> musicGroupList = musicGroupPageInfo.getRows();
 
         if (musicGroupList == null || musicGroupList.size() == 0) {

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

@@ -22,7 +22,9 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
-		<result column="memo_" property="memo" />
+		<result column="audit_" property="audit" />
+		<result column="audit_name_" property="auditName" />
+		<result column="audit_time_" property="auditTime" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
@@ -42,7 +44,8 @@
 		payment_user_num_,period_,member_rank_setting_id_,actual_amount_,original_amount_,
 		operator_,create_time_,update_time_,tenant_id_,memo_,status_)
 		VALUES(#{name},#{remark},#{memberNum},#{userNum},#{paymentUserNum},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{memberRankSettingId},#{actualAmount},#{originalAmount},#{operator},NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+		#{memberRankSettingId},#{actualAmount},#{originalAmount},#{operator},
+		NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -54,6 +57,12 @@
 		<if test="memo != null">
 			memo_ = #{memo},
 		</if>
+		<if test="audit != null">
+			audit_ = #{audit},
+		</if>
+		<if test="auditTime != null">
+			audit_time_ = #{auditTime},
+		</if>
 		<if test="operator != null">
 			operator_ = #{operator},
 		</if>
@@ -120,8 +129,9 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="CloudCoachPaymentProgram" parameterType="map">
-		SELECT ccpp.*,su.real_name_ operator_name_ FROM cloud_coach_payment_program ccpp
+		SELECT ccpp.*,su.real_name_ operator_name_,su1.real_name_ audit_name_ FROM cloud_coach_payment_program ccpp
 		LEFT JOIN sys_user su ON su.id_ = ccpp.operator_
+		LEFT JOIN sys_user su1 ON su1.id_ = ccpp.audit_
 		<include refid="queryPageSql"/>
 		ORDER BY ccpp.id_ DESC
 		<include refid="global.limit"/>

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

@@ -997,4 +997,16 @@
         </foreach>
         GROUP BY sr.user_id_
     </select>
+    <select id="queryHasSubCourseTimes" resultType="java.lang.String">
+        SELECT DISTINCT mgpc.music_group_id_ FROM music_group_payment_student_course_detail mgpscd
+        LEFT JOIN music_group_payment_calender mgpc ON mgpscd.music_group_payment_calender_id_ = mgpc.id_
+        WHERE mgpc.status_ = 'OVER' AND DATEDIFF(NOW(),mgpc.deadline_payment_date_) > 90
+        AND mgpscd.used_course_minutes_ = 0
+        <if test="tenantId != null">
+            AND mgpc.tenant_id_ = #{tenantId}
+        </if>
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(mgpc.organ_id_,#{organIds})
+        </if>
+    </select>
 </mapper>

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

@@ -58,7 +58,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/add')")
-    public Object add(@RequestBody MusicGroupPaymentCalenderDto musicGroupPaymentCalenderDto) {
+    public HttpResponseResult add(@RequestBody MusicGroupPaymentCalenderDto musicGroupPaymentCalenderDto) {
     	String batchNo = musicGroupPaymentCalenderService.create(musicGroupPaymentCalenderDto);
         ModelMap map = new ModelMap(1);
         map.put("musicGroupPaymentCalenderBatchNo", batchNo);
@@ -68,21 +68,15 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping(value = "/createCalender", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/createCalender')")
-    public Object createCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
-    	String batchNo = musicGroupPaymentCalenderService.create1(musicGroupPaymentBaseCalender);
-        ModelMap map = new ModelMap(1);
-        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
-        return succeed(map);
+    public HttpResponseResult<ModelMap> createCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    	return musicGroupPaymentCalenderService.create1(musicGroupPaymentBaseCalender);
     }
 
     @ApiOperation(value = "修改乐团缴费日历")
     @PostMapping(value = "/updateCalender", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/updateCalender')")
-    public Object updateCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
-    	String batchNo = musicGroupPaymentCalenderService.merge1(musicGroupPaymentBaseCalender);
-        ModelMap map = new ModelMap(1);
-        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
-        return succeed(map);
+    public HttpResponseResult<ModelMap> updateCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    	return musicGroupPaymentCalenderService.merge1(musicGroupPaymentBaseCalender);
     }
 
     @ApiOperation(value = "待审核的缴费项目撤回")