增加-id查询/时间显示

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

@@ -44,7 +44,8 @@ public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
         if (!CommonUtil.isNullOrBlank(requestVO.getMdDropOptionId())){
         if (!CommonUtil.isNullOrBlank(requestVO.getMdDropOptionId())){
             mdDropOptionIds=(Long[]) ConvertUtils.convert(requestVO.getMdDropOptionId().split(","),Long.class);
             mdDropOptionIds=(Long[]) ConvertUtils.convert(requestVO.getMdDropOptionId().split(","),Long.class);
         }
         }
-        PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(mdDropOptionIds,
+        PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getId(),
+                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,6 +7,8 @@ import com.github.pagehelper.PageInfo;
  */
  */
 public class PractitionerFileSharingListRequestVO {
 public class PractitionerFileSharingListRequestVO {
 
 
+    private Long id;
+
     private String mdDropOptionId;
     private String mdDropOptionId;
 
 
     private Integer isActive;
     private Integer isActive;
@@ -67,10 +69,19 @@ public class PractitionerFileSharingListRequestVO {
         this.practitionerFileShares = practitionerFileShares;
         this.practitionerFileShares = practitionerFileShares;
     }
     }
 
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "PractitionerFileSharingListRequestVO{" +
         return "PractitionerFileSharingListRequestVO{" +
-                "mdDropOptionId=" + mdDropOptionId +
+                "id=" + id +
+                ", 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("mdDropOptionIds") Long[] mdDropOptionIds ,@Param("isActive") Integer isActive);
+    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("id")Long id,@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 id ,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[] mdDropOptionIds, Integer isActive, int pageNum, int size) {
+    public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long id ,Long[] mdDropOptionIds, Integer isActive, int pageNum, int size) {
         PageHelper.startPage(pageNum, size);
         PageHelper.startPage(pageNum, size);
-        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(mdDropOptionIds,isActive);
+        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(id,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

@@ -7,10 +7,10 @@
                 s.md_drop_option_id mdDropOptionId,
                 s.md_drop_option_id mdDropOptionId,
                 s.file_content fileContent,
                 s.file_content fileContent,
                 s.is_active isActive,
                 s.is_active isActive,
-                s.created_at createdAt,
+                date_format(s.created_at, '%Y-%m-%d %H:%i:%s')createdAt,
                 s.created_by createdBy,
                 s.created_by createdBy,
                 uc.name createdName,
                 uc.name createdName,
-                s.updated_at updatedAt,
+                date_format(s.updated_at, '%Y-%m-%d %H:%i:%s') updatedAt,
                 s.updated_by updatedBy,
                 s.updated_by updatedBy,
                 uu.name updatedName,
                 uu.name updatedName,
                 s.title title,
                 s.title title,
@@ -23,10 +23,13 @@
                 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="mdDropOptionIds != null">
                 <if test="mdDropOptionIds != null">
-                    <foreach collection="mdDropOptionIds" item="mdDropOptionId" index="index" separator="or">
+                    <foreach collection="mdDropOptionIds" item="mdDropOptionId" index="index" open="(" close=")" separator="or">
                         find_in_set (#{mdDropOptionId,jdbcType=BIGINT},s.md_drop_option_id)
                         find_in_set (#{mdDropOptionId,jdbcType=BIGINT},s.md_drop_option_id)
                     </foreach>
                     </foreach>
                 </if>
                 </if>
+                <if test="id != null">
+                    and s.id = #{id,jdbcType=BIGINT}
+                </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>