Browse Source

RD列表修改

anderx 3 years ago
parent
commit
ac3df31de4

+ 6 - 6
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -302,13 +302,13 @@
     from rd_details a
     where 1=1
     <if test="RdStart !=null and RdEnd !=null">
-      and a.rd_start  <![CDATA[ <= ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
+      and a.rd_start  <![CDATA[ >= ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
     </if>
     <if test="RdName !=null ">
-      and a.rd_name =#{RdName}
+      and a.rd_name like concat('%',#{RdName},'%')
     </if>
     <if test="RdNo !=null ">
-      and a.rd_no =#{RdNo}
+      and a.rd_no like concat('%',#{RdNo},'%')
     </if>
     <if test="aid !=null ">
       and a.aid =#{aid}
@@ -323,13 +323,13 @@
     from rd_details a
     where 1=1
     <if test="RdStart !=null and RdEnd !=null">
-      and a.rd_start  <![CDATA[ <= ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
+      and a.rd_start  <![CDATA[ >=  ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
     </if>
     <if test="RdName !=null ">
-      and a.rd_name =#{RdName}
+      and a.rd_name like concat('%',#{RdName},'%')
     </if>
     <if test="RdNo !=null ">
-      and a.rd_no =#{RdNo}
+      and a.rd_no like concat('%',#{RdNo},'%')
     </if>
     <if test="aid !=null ">
       and a.aid =#{aid}

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20