Merge branch 'dev_20210330' of 139.224.139.2:AGSH/yd-backend into dev_20210330

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

@@ -45,6 +45,7 @@ public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
             mdDropOptionIds=(Long[]) ConvertUtils.convert(requestVO.getMdDropOptionId().split(","),Long.class);
             mdDropOptionIds=(Long[]) ConvertUtils.convert(requestVO.getMdDropOptionId().split(","),Long.class);
         }
         }
         PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getId(),
         PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getId(),
+                requestVO.getShareCode(),
                 mdDropOptionIds,
                 mdDropOptionIds,
                 requestVO.getIsActive(),
                 requestVO.getIsActive(),
                 requestVO.getPractitionerFileShares().getPageNum(),
                 requestVO.getPractitionerFileShares().getPageNum(),

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

@@ -9,6 +9,8 @@ public class PractitionerFileSharingListRequestVO {
 
 
     private Long id;
     private Long id;
 
 
+    private String shareCode;
+
     private String mdDropOptionId;
     private String mdDropOptionId;
 
 
     private Integer isActive;
     private Integer isActive;
@@ -77,10 +79,19 @@ public class PractitionerFileSharingListRequestVO {
         this.id = id;
         this.id = id;
     }
     }
 
 
+    public String getShareCode() {
+        return shareCode;
+    }
+
+    public void setShareCode(String shareCode) {
+        this.shareCode = shareCode;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "PractitionerFileSharingListRequestVO{" +
         return "PractitionerFileSharingListRequestVO{" +
                 "id=" + id +
                 "id=" + id +
+                ", shareCode='" + shareCode + '\'' +
                 ", mdDropOptionId='" + mdDropOptionId + '\'' +
                 ", mdDropOptionId='" + mdDropOptionId + '\'' +
                 ", isActive=" + isActive +
                 ", isActive=" + isActive +
                 ", practitionerFileShares=" + practitionerFileShares +
                 ", practitionerFileShares=" + practitionerFileShares +

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

@@ -14,5 +14,5 @@ public interface AgmsPractitionerMapper {
      * @param isActive 是否启用
      * @param isActive 是否启用
      * @return
      * @return
      */
      */
-    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("id")Long id,@Param("mdDropOptionIds") Long[] mdDropOptionIds ,@Param("isActive") Integer isActive);
+    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("id")Long id,@Param("shareCode") String shareCode,@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 id ,Long[] mdDropOptionId, Integer isActive, int pageNum, int size);
+    PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long id ,String shareCode,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 id ,Long[] mdDropOptionIds, Integer isActive, int pageNum, int size) {
+    public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long id ,String shareCode,Long[] mdDropOptionIds, Integer isActive, int pageNum, int size) {
         PageHelper.startPage(pageNum, size);
         PageHelper.startPage(pageNum, size);
-        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(id,mdDropOptionIds,isActive);
+        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(id,shareCode,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

@@ -30,6 +30,9 @@
                 <if test="id != null">
                 <if test="id != null">
                     and s.id = #{id,jdbcType=BIGINT}
                     and s.id = #{id,jdbcType=BIGINT}
                 </if>
                 </if>
+                <if test="shareCode != null">
+                    and s.share_code = #{shareCode,jdbcType=VARCHAR}
+                </if>
                 <if test="isActive != null">
                 <if test="isActive != null">
                     and s.is_active = #{isActive,jdbcType=INTEGER}
                     and s.is_active = #{isActive,jdbcType=INTEGER}
                 </if>
                 </if>