Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
anderx 8 years ago
parent
commit
cc133d984f
1 changed files with 35 additions and 35 deletions
  1. 35 35
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

+ 35 - 35
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1213,42 +1213,42 @@
 	</select>
   
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
-    select  
-	  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-	  	a.name, a.keyword, a.category, 
-	  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl, 
-	  	a.field_a as fieldA, a.field_b as fieldB, a.field_c as fieldC, f.name as field1, f2.name as field2,
-	  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl, 
-	  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId, 
-	  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber, 
-	    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
-	    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
-	    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
-	    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
-	    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
-	    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
-	    a.create_time as createTime, a.release_status as releaseStatus, 
-	    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
-	    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
-		ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,a.remark,
-		ifnull(t.x,0) as orderIntentionCount ,ifnull(t2.x,0) as orderCount,ifnull(mm.effective,0) hot,a.boutique,
-		a.international_flag as internationalFlag
+	select  
+		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
+		  	a.name, a.keyword, a.category, 
+		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl, 
+		  	a.field_a as fieldA, a.field_b as fieldB, a.field_c as fieldC, f.name as field1, f2.name as field2,
+		  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl, 
+		  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId, 
+		  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber, 
+		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
+		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
+		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
+		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
+		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
+		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
+		    a.create_time as createTime, a.release_status as releaseStatus, 
+		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
+		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
+			ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,a.remark,
+			ifnull(t.x,0) as orderIntentionCount ,ifnull(t2.x,0) as orderCount,ifnull(mm.effective,0) hot,a.boutique,
+			a.international_flag as internationalFlag
 	from achievement a
-	    left join user_identity ui on a.owner_id = ui.uid
-	    left join field_glossory f on a.field_a=f.id
-	  	left join field_glossory f2 on a.field_b=f2.id
-	    left join (select count(0) as x,tl.commodity_id from t_order tr
-					left join t_order_detail tl on tl.order_no=tr.order_no
-					where order_status != 4
-					group by  tl.commodity_id ) t on a.id=t.commodity_id 
-		left join (select count(0) as x,tl.commodity_id from t_order tr
-					left join t_order_detail tl on tl.order_no=tr.order_no
-					where tr.order_status != 4 and tr.order_status != 0
-					group by  tl.commodity_id) t2 on a.id=t2.commodity_id 
-	    left join jpush_easemob_account j on a.owner_id=j.uid
-	    left join user u on u.id = a.owner_id
-	    left join marketing_management mm on a.id = mm.product_id
-	  where a.id =#{id,jdbcType=VARCHAR}
+    left join user_identity ui on a.owner_id = ui.uid
+    left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
+    left join (select count(0) as x,tl.commodity_id from t_order tr
+				left join t_order_detail tl on tl.order_no=tr.order_no
+				where order_status != 4
+				group by  tl.commodity_id ) t on a.id=t.commodity_id 
+	left join (select count(0) as x,tl.commodity_id from t_order tr
+				left join t_order_detail tl on tl.order_no=tr.order_no
+				where tr.order_status != 4 and tr.order_status != 0
+				group by  tl.commodity_id) t2 on a.id=t2.commodity_id 
+    left join jpush_easemob_account j on a.owner_id=j.uid
+    left join user u on u.id = a.owner_id
+    left join marketing_management mm on a.id = mm.product_id
+  where a.id =#{id,jdbcType=VARCHAR}
   </select>
   
    <select id="selectOrgOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo">