Ver código fonte

代码修改

LAPTOP-KB9HII50\70708 2 anos atrás
pai
commit
ddcc793648

+ 1 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/WlyyDoctorOnlineTimeDao.java

@ -4,7 +4,6 @@ import com.yihu.jw.entity.hospital.doctor.WlyyDoctorOnlineTimeDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
@ -17,6 +16,6 @@ public interface WlyyDoctorOnlineTimeDao extends JpaRepository<WlyyDoctorOnlineT
    @Query("from WlyyDoctorOnlineTimeDO a where a.doctor = ?1 and (a.startTime <= ?2 AND a.endTime <= ?2 )OR (a.startTime <= ?3 AND a.endTime <= ?3)")
    List<WlyyDoctorOnlineTimeDO> findWorkExistList(String doctor, Date startDate,Date endDate);
    @Query("from WlyyDoctorOnlineTimeDO a where a.doctor = ?1 and a.startTime >= ?2 AND a.startTime <= ?3 order By a.startTime ASC)")
    @Query("from WlyyDoctorOnlineTimeDO a where a.doctor = ?1 and a.startTime >= ?2 AND a.startTime <= ?3 order By a.startTime ASC ")
    List<WlyyDoctorOnlineTimeDO> findWorkList(String doctor, Date startDate,Date endDate);
}

+ 2 - 2
server/svr-authentication/src/main/resources/application.yml

@ -6,7 +6,7 @@ spring:
  datasource:
  hikari:
    registerMbeans: true
    driver-class-name: com.mysql.jdbc.Driver
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-active: 100
    max-idle: 100 #最大空闲连接
    min-idle: 10 #最小空闲连接
@ -91,7 +91,7 @@ wechat:
  id: xm_zsyy_wx  # base库中,wx_wechat 的id字段
---
spring:
  profiles: jwtest
  profiles: mlwTest
  datasource:
    url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root

+ 3 - 2
svr/svr-base/src/main/resources/application.yml

@ -10,7 +10,7 @@ express:
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-active: 50
    max-idle: 50 #最大空闲连接
    min-idle: 10 #最小空闲连接
@ -1041,4 +1041,5 @@ testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  im_list_get: http://172.26.0.105:3000/
  data_base_name: 1