ソースを参照

任务查询接口修改

anderx 6 年 前
コミット
affb8bc31c

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

@@ -865,6 +865,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     from t_task_log x left join  t_order_task a on x.task_id=a.id 
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
+    left join user f on e.buyer_id=f.id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     <if test="orderNo != null">

+ 5 - 4
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\://127.0.0.1\: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
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=127.0.0.1
+jedis.host=localhost
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -54,11 +54,12 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-#static.host=//sb.jishutao.com/1.0.50
-#avatar.host=//sb.jishutao.com
 
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
+#连接开发
+#static.host=//sb.jishutao.com/1.0.50
+#avatar.host=//sb.jishutao.com
 
 #本地连生产
 avatar.host=//static.kedexinxi.com

+ 1 - 1
src/main/resources/spring/spring-mybatis.xml

@@ -8,7 +8,7 @@
 	xsi:schemaLocation="
     		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
 			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
 			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
 			http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd">