缴费项目改造

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class CooperationRefundQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "合作单位编号",required = false)
+    private Integer cooperationId;
+
     @ApiModelProperty(value = "分部",required = false)
     private String organId;
 
@@ -17,6 +20,14 @@ public class CooperationRefundQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "缴费结束时间",required = false)
     private String refundEndDate;
 
+    public Integer getCooperationId() {
+        return cooperationId;
+    }
+
+    public void setCooperationId(Integer cooperationId) {
+        this.cooperationId = cooperationId;
+    }
+
     public Integer getRefundStatus() {
         return refundStatus;
     }

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

@@ -101,8 +101,11 @@
 		<result property="refundStatus" column="refundStatus"/>
 	</resultMap>
 	<sql id="queryCoopCalenderSql">
+		<if test="cooperationId != null">
+			AND crp.cooperation_organ_id_ = #{cooperationId}
+		</if>
 		<if test="calenderId != null">
-			AND crp.calender_id_
+			AND crp.calender_id_ = #{calenderId}
 		</if>
 		<if test="refundStartDate != null and refundStartDate != ''">
 			AND crp.refund_date_ BETWEEN #{refundStartDate} AND #{refundEndDate}