修改-文章支持多個標簽查詢

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsPractitionerServiceImpl.java

@@ -8,6 +8,7 @@ import com.yd.dal.entity.customer.AclPractitionerFileSharing;
 import com.yd.dal.service.agms.AgmsPractitionerDALService;
 import com.yd.dal.service.agms.AgmsPractitionerDALService;
 import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
 import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
 import com.yd.util.config.ZHBErrorConfig;
 import com.yd.util.config.ZHBErrorConfig;
+import org.apache.commons.beanutils.ConvertUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -38,7 +39,8 @@ public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
     @Override
     @Override
     public PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO) {
     public PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO) {
         PractitionerFileSharingListResponseVO responseVO = new PractitionerFileSharingListResponseVO();
         PractitionerFileSharingListResponseVO responseVO = new PractitionerFileSharingListResponseVO();
-        PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getMdDropOptionId(),
+        Long[] mdDropOptionIds=(Long[]) ConvertUtils.convert(requestVO.getMdDropOptionId().split(","),Long.class);
+        PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(mdDropOptionIds,
                 requestVO.getIsActive(),
                 requestVO.getIsActive(),
                 requestVO.getPractitionerFileShares().getPageNum(),
                 requestVO.getPractitionerFileShares().getPageNum(),
                 requestVO.getPractitionerFileShares().getPageSize());
                 requestVO.getPractitionerFileShares().getPageSize());

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListRequestVO.java

@@ -7,7 +7,7 @@ import com.github.pagehelper.PageInfo;
  */
  */
 public class PractitionerFileSharingListRequestVO {
 public class PractitionerFileSharingListRequestVO {
 
 
-    private Long mdDropOptionId;
+    private String mdDropOptionId;
 
 
     private Integer isActive;
     private Integer isActive;
 
 
@@ -18,7 +18,7 @@ public class PractitionerFileSharingListRequestVO {
      *
      *
      * @return the mdDropOptionId
      * @return the mdDropOptionId
      */
      */
-    public Long getMdDropOptionId() {
+    public String getMdDropOptionId() {
         return this.mdDropOptionId;
         return this.mdDropOptionId;
     }
     }
 
 
@@ -27,7 +27,7 @@ public class PractitionerFileSharingListRequestVO {
      *
      *
      * @param mdDropOptionId the  to set
      * @param mdDropOptionId the  to set
      */
      */
-    public void setMdDropOptionId(Long mdDropOptionId) {
+    public void setMdDropOptionId(String mdDropOptionId) {
         this.mdDropOptionId = mdDropOptionId;
         this.mdDropOptionId = mdDropOptionId;
     }
     }
 
 

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsPractitionerMapper.java

@@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param;
 public interface AgmsPractitionerMapper {
 public interface AgmsPractitionerMapper {
     /**
     /**
      *
      *
-     * @param mdDropOptionId 文章类型
+     * @param mdDropOptionIds 文章类型
      * @param isActive 是否启用
      * @param isActive 是否启用
      * @return
      * @return
      */
      */
-    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("mdDropOptionId") Long mdDropOptionId ,@Param("isActive") Integer isActive);
+    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("mdDropOptionIds") Long[] mdDropOptionIds ,@Param("isActive") Integer isActive);
 }
 }

yd-api/src/main/java/com/yd/dal/service/agms/AgmsPractitionerDALService.java

@@ -15,5 +15,5 @@ public interface AgmsPractitionerDALService {
      * @param size 每页的数量
      * @param size 每页的数量
      * @return 查询结果
      * @return 查询结果
      */
      */
-    PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size);
+    PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long[] mdDropOptionId, Integer isActive, int pageNum, int size);
 }
 }

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsPractitionerDALServiceImpl.java

@@ -18,9 +18,9 @@ public class AgmsPractitionerDALServiceImpl implements AgmsPractitionerDALServic
     @Autowired
     @Autowired
     private AgmsPractitionerMapper mapper;
     private AgmsPractitionerMapper mapper;
     @Override
     @Override
-    public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size) {
+    public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long[] mdDropOptionIds, Integer isActive, int pageNum, int size) {
         PageHelper.startPage(pageNum, size);
         PageHelper.startPage(pageNum, size);
-        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(mdDropOptionId,isActive);
+        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(mdDropOptionIds,isActive);
         PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
         PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
         return pageInfo;
         return pageInfo;
     }
     }

yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml

@@ -22,8 +22,10 @@
                 left join  ag_acl_user uc on uc.id = s.created_by
                 left join  ag_acl_user uc on uc.id = s.created_by
                 left join  ag_acl_user uu on uu.id = s.created_by
                 left join  ag_acl_user uu on uu.id = s.created_by
             <where>
             <where>
-                <if test="mdDropOptionId != null">
-                    find_in_set (#{mdDropOptionId,jdbcType=BIGINT},s.md_drop_option_id)
+                <if test="mdDropOptionIds != null">
+                    <foreach collection="mdDropOptionIds" item="mdDropOptionId" index="index" separator="and">
+                        find_in_set (#{mdDropOptionId,jdbcType=BIGINT},s.md_drop_option_id)
+                    </foreach>
                 </if>
                 </if>
                 <if test="isActive != null">
                 <if test="isActive != null">
                     and s.is_active = #{isActive,jdbcType=INTEGER}
                     and s.is_active = #{isActive,jdbcType=INTEGER}