Pārlūkot izejas kodu

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 gadi atpakaļ
vecāks
revīzija
27398b3cd9

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

@@ -1239,26 +1239,16 @@
 		    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.international_flag as internationalFlag,
+		    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, f.name as field1,f2.name as field2,
-		    a.create_time as createTime, a.release_status as releaseStatus, ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount,
+		    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,j.easemob_name as easemobName,
-		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
+		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
+		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile
     from achievement a
-    left join jpush_easemob_account j on a.owner_id=j.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 user_identity ui on a.owner_id = ui.uid
     left join user u on u.id = a.owner_id
-     left join (select count(0) as x,commodity_id from t_order
-				where order_status != 4
-				group by  commodity_id ) t on a.id=t.commodity_id
-    left join (select count(0) as x,commodity_id from t_order
-				where order_status != 4 and order_status != 0
-				group by  commodity_id ) t2 on a.id=t.commodity_id
-    left join marketing_management mm on a.id = mm.product_id
     where a.id = #{id,jdbcType=VARCHAR}
   </select>