add 问卷调查搜索条件修改

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.page;
 
 
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
 
@@ -15,7 +16,8 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
 
     private String specification;
 
-    private Boolean hasInstruments;
+    @ApiModelProperty(value="是否有置换乐器")
+    private Boolean hasInstrumentsId;
 
     public Integer getCooperationOrganId() {
         return cooperationOrganId;
@@ -57,11 +59,11 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
         this.specification = specification;
     }
 
-    public Boolean getHasInstruments() {
-        return hasInstruments;
+    public Boolean getHasInstrumentsId() {
+        return hasInstrumentsId;
     }
 
-    public void setHasInstruments(Boolean hasInstruments) {
-        this.hasInstruments = hasInstruments;
+    public void setHasInstrumentsId(Boolean hasInstrumentsId) {
+        this.hasInstrumentsId = hasInstrumentsId;
     }
 }

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

@@ -138,7 +138,7 @@
             <if test="subjectId!=null">
                 AND ria.subject_id_ = #{subjectId}
             </if>
-            <if test="hasInstruments!=null">
+            <if test="hasInstrumentsId!=null and hasInstrumentsId==true">
                 AND ria.instruments_id_ >=1
             </if>
             <if test="brand!=null and brand!=''">

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

@@ -67,7 +67,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
                 return failed("非法请求");
             }
         }
-        queryInfo.setHasInstruments(true);
+        queryInfo.setHasInstrumentsId(true);
         return succeed(replacementInstrumentActivityService.getPageList(queryInfo));
     }
 
@@ -110,7 +110,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
                 throw new BizException("非法请求");
             }
         }
-        queryInfo.setHasInstruments(true);
+        queryInfo.setHasInstrumentsId(true);
         queryInfo.setRows(99999);
         PageInfo<ReplacementInstrumentActivityStatDto> pageList = replacementInstrumentActivityService.getPageList(queryInfo);