From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml index e2cbdd6..0c43003 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml @@ -184,8 +184,11 @@ from rm_client_amount_day rcad Left join se_client sc on sc.id = rcad.client_id <where> - <if test="clientName != null"> + <if test="clientName != null and clientName != '' "> and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%') + </if> + <if test="clientId != null and clientId != ''"> + and rcad.client_id = #{clientId} </if> <if test="startDt != null"> and rcad.dt >= #{startDt,jdbcType=DATE} @@ -212,9 +215,12 @@ from rm_client_amount_day rcad Left join se_client sc on sc.id = rcad.client_id <where> - <if test="clientName != null"> + <if test="clientName != null and clientName != '' "> and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%') </if> + <if test="clientId != null and clientId != ''"> + and rcad.client_id = #{clientId} + </if> <if test="startDt != null"> and rcad.dt >= #{startDt,jdbcType=DATE} </if> -- Gitblit v1.8.0