Procházet zdrojové kódy

修改任务查询

anderx před 6 roky
rodič
revize
5d1dd5af00

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -837,7 +837,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -871,7 +871,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="depId != null">
   	and g.department_id= #{depId ,jdbcType=VARCHAR}

+ 7 - 6
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.99\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.99
+jedis.host=127.0.0.1
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -54,14 +54,15 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.50
+#static.host=//sb.jishutao.com/1.0.50
+#avatar.host=//sb.jishutao.com
+
 portal.host=//sf.jishutao.com/portal/2.0.6
-avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
 
 #本地连生产
-#avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.0.92
+avatar.host=//static.kedexinxi.com
+static.host=//s.kedexinxi.com/1.0.92
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload