add 问卷调查搜索条件修改

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

@@ -19,6 +19,9 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
     @ApiModelProperty(value="是否有置换乐器")
     private Boolean hasInstrumentsId;
 
+    @ApiModelProperty(value="合作单位名称或编号搜索")
+    private String cooperationOrganIdOrName;
+
     public Integer getCooperationOrganId() {
         return cooperationOrganId;
     }
@@ -66,4 +69,12 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
     public void setHasInstrumentsId(Boolean hasInstrumentsId) {
         this.hasInstrumentsId = hasInstrumentsId;
     }
+
+    public String getCooperationOrganIdOrName() {
+        return cooperationOrganIdOrName;
+    }
+
+    public void setCooperationOrganIdOrName(String cooperationOrganIdOrName) {
+        this.cooperationOrganIdOrName = cooperationOrganIdOrName;
+    }
 }

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

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