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/page/ReplacementInstrumentActivityQueryInfo.java

@@ -22,6 +22,17 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
     @ApiModelProperty(value="合作单位名称或编号搜索")
     private String cooperationOrganIdOrName;
 
+    @ApiModelProperty(value = "缴费状态 0-未缴费 1-缴费中 2-已缴费")
+    private Integer payStatus;
+
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     public Integer getCooperationOrganId() {
         return cooperationOrganId;
     }

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

@@ -157,6 +157,9 @@
             <if test="cooperationOrganIdOrName!=null and cooperationOrganIdOrName!=''">
                 AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%', #{cooperationOrganIdOrName}, '%'))
             </if>
+            <if test="payStatus!=null">
+                AND ria.pay_status_ = #{payStatus}
+            </if>
         </where>
     </sql>