From 9b9fa60a9211ef0f0a88326588ad3d7a6c8cec76 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Tue, 8 Jul 2025 11:04:47 +0800 Subject: [PATCH] =?UTF-8?q?dev(environment):=20=E5=88=87=E6=8D=A2=E5=88=B0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -将 spring.profiles.active 从 saas 改为 local - 更新本地数据库配置，包括 URL、用户名和密码 - 在 PartApplyAppMapper 和 PartApplyMapper 中添加 status 参数的条件判断 --- src/main/resources/application-local.yml | 6 +++--- src/main/resources/application.yml | 2 +- src/main/resources/mappers/app/PartApplyAppMapper.xml | 3 +++ src/main/resources/mappers/bases/PartApplyMapper.xml | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) 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