diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index b7129e8..533ab17 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -11,9 +11,9 @@ spring: # url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false # username: root # password: zhzadmin@gzimtcs14! - url: jdbc:mysql://127.0.0.1:3306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false - username: ruanliang - password: ruanliang@MYSQL + url: jdbc:mysql://14.103.246.124/gz_imt0703?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false + username: root + password: mysql_CXzwWd type: com.alibaba.druid.pool.DruidDataSource redis: host: localhost diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 060565a..f4a8757 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ # 环境配置 spring: profiles: - active: saas \ No newline at end of file + active: local \ No newline at end of file diff --git a/src/main/resources/mappers/app/PartApplyAppMapper.xml b/src/main/resources/mappers/app/PartApplyAppMapper.xml index 65c83c1..7115c24 100644 --- a/src/main/resources/mappers/app/PartApplyAppMapper.xml +++ b/src/main/resources/mappers/app/PartApplyAppMapper.xml @@ -188,6 +188,9 @@ END as typeName FROM t_part_apply tpa + + tpa.status = #{status} + and ( tpa.code like concat('%',#{keyWord},'%') or diff --git a/src/main/resources/mappers/bases/PartApplyMapper.xml b/src/main/resources/mappers/bases/PartApplyMapper.xml index 5bf246f..889ab8c 100644 --- a/src/main/resources/mappers/bases/PartApplyMapper.xml +++ b/src/main/resources/mappers/bases/PartApplyMapper.xml @@ -28,6 +28,9 @@ FROM t_part_apply tpa left join pm_user pu on tpa.creator=pu.id + + and tpa.status = #{status} + and ( tpa.code like concat('%',#{keyWord},'%') or