Browse Source

代码修改

anderx 6 years ago
parent
commit
d2143184d3

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

@@ -409,6 +409,7 @@
 	c.id,c.name,c.province,c.city,c.area,c.address,c.contacts,date_format(c.create_time,'%Y-%m-%d %H:%I:%S') as createTimes,
 	c.contacts_mobile as contactsMobile,c.remarks from t_order_new a 
 	left join t_order_task b on a.order_no=b.order_no left join outsource_organization c on b.id=c.tid
-	where a.delete_sign=0 and b.status=0 and c.id is not null and a.order_no= #{orderNo}
+	where a.delete_sign=0 and b.status=0 and c.id is not null
+	and a.order_no= #{orderNo}
   </select>
 </mapper>

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -890,8 +890,8 @@
   	o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
   	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName,e.name as outsourceName
   	from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
-  	left join department d on o.order_dep=d.id left join ( select order_no, name from outsource_organization group by order_no,name) e
-  	on o.order_no=e.order_no where delete_sign = 0 and order_status = 2
+  	left join department d on o.order_dep=d.id left join (select order_no,max(name) from outsource_organization group by order_no) e
+  	 on o.order_no=e.order_no where delete_sign = 0 and order_status = 2
   	and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	<if test="o.processStatus == 2">
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
@@ -1030,8 +1030,8 @@
   0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName from t_order_new o left join department d 
   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id left join 
   (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no 
-  left join (select order_no,name from outsource_organization 	group by order_no,name) e on o.order_no=e.order_no  				
-  	 where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
+  left join (select order_no,max(name) as name from outsource_organization group by order_no) e 
+  on o.order_no=e.order_no where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

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

@@ -848,9 +848,8 @@
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.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
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
-    group by task_id) i on a.id=i.task_id  left join (select order_no,name from outsource_organization
-  	group by order_no,name ) j on a.order_no=j.order_no where e.delete_sign=0  and e.order_status not in (5,7)
-    and e.outsource= #{outsource,jdbcType=INTEGER}
+    group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
+    on a.order_no=j.order_no where e.delete_sign=0  and e.order_status not in (5,7) and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.08
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.08
+avatar.host=//sb.jishutao.com
 
 #连生产
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.08
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.08
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload