经营报表

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

@@ -199,6 +199,17 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 
 	private String organName;
 
+	@ApiModelProperty(value = "标记是否云教练缴费项目",required = false)
+	private Boolean cloudTeacherPaymentFlag = false;
+
+	public Boolean getCloudTeacherPaymentFlag() {
+		return cloudTeacherPaymentFlag;
+	}
+
+	public void setCloudTeacherPaymentFlag(Boolean cloudTeacherPaymentFlag) {
+		this.cloudTeacherPaymentFlag = cloudTeacherPaymentFlag;
+	}
+
 	public String getOrganName() {
 		return organName;
 	}

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

@@ -296,7 +296,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         BigDecimal repairActualAmount = musicGroupPaymentCalenderRepairService.getActualAmount(musicGroupPaymentBaseCalender);
         BigDecimal activityActualAmount = musicGroupPaymentCalenderActivityService.getActualAmount(musicGroupPaymentBaseCalender);
         if(memberActualAmount.compareTo(BigDecimal.ZERO) > 0 && (courseActualAmount.compareTo(BigDecimal.ZERO) == 0 || activityActualAmount.compareTo(BigDecimal.ZERO) == 0)){
-
+            musicGroupPaymentCalender.set
         }
 
         BigDecimal actualTotalAmount = courseActualAmount.add(memberActualAmount)

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

@@ -229,7 +229,7 @@
             <if test="musicalInstrumentsProvideStatus != null">
                 musical_instruments_provide_status_ = #{musicalInstrumentsProvideStatus},
             </if>
-            <if test="musicalInstrumentsProvideTime != null AND musicalInstrumentsProvideTime != ''">
+            <if test="musicalInstrumentsProvideTime != null and musicalInstrumentsProvideTime != ''">
                 musical_instruments_provide_time_ = #{musicalInstrumentsProvideTime},
             </if>
             <if test="memberCourseShowFlag != null">