Bladeren bron

Merge remote-tracking branch 'origin/master' into prod

Conflicts:
	src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
wanghui 8 jaren geleden
bovenliggende
commit
ca71b86a7d
1 gewijzigde bestanden met toevoegingen van 13 en 7 verwijderingen
  1. 13 7
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

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

@@ -1030,7 +1030,7 @@
 		    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,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
-		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile
+		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.jmrh_flag as jmrhFlag
     from achievement a
     left join organization_identity oi on a.owner_id = oi.uid
     left join user u on u.id = a.owner_id
@@ -1389,25 +1389,29 @@
   </select>
   <select id="selectJmrhAchievement" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
   	select 
-  		id, name
+  		id, name, owner_type as ownerType
 	from 
 		achievement t 
 	where 
-		jmrh_flag = 0 and data_category = 0
+		jmrh_flag = 1 and data_category = 0
+	order by 
+		create_time desc
 	limit 5;
   </select>
   <select id="selectJmrTechnology" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
   	select 
-  		id, name, maturity
+  		id, name, maturity, owner_type as ownerType
 	from 
 		achievement t 
 	where 
-		jmrh_flag = 0 and data_category = 1
+		jmrh_flag = 1 and data_category = 1
+	order by 
+		create_time desc
 	limit 5;
   </select>
   <select id="selectJmrProject" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
   	select 
-  		a.id, a.name, c.residence_city as residenceCity,d.name as industry
+  		a.id, a.name, c.residence_city as residenceCity,d.name as industry, owner_type as ownerType
 	from 
 		achievement a 
 	left join 
@@ -1417,7 +1421,9 @@
 	left join 
 		field_glossory d on a.field_a = d.id
 	where 
-		jmrh_flag = 0 and data_category = 2
+		jmrh_flag = 1 and data_category = 2
+	order by 
+		a.create_time desc
 	limit 5;
   </select>
 </mapper>