Procházet zdrojové kódy

Merge remote-tracking branch 'origin/test' into patch

anderx před 7 roky
rodič
revize
6537650af3

+ 18 - 0
src/main/java/com/goafanti/achievement/bo/AchievementEntity.java

@@ -32,6 +32,8 @@ public class AchievementEntity {
     private Integer interest;//是否感兴趣
     private Integer orderCount;//订单数
 	private String pictureUrlMin;//APP图片
+	private String  ownerName;//所有人名称
+	private String ownerMobile;//所有人电话
 
     public String getField2() {
 		return field2;
@@ -256,4 +258,20 @@ public class AchievementEntity {
 	public void setPictureUrlMin(String pictureUrlMin) {
 		this.pictureUrlMin = pictureUrlMin;
 	}
+
+	public String getOwnerName() {
+		return ownerName;
+	}
+
+	public void setOwnerName(String ownerName) {
+		this.ownerName = ownerName;
+	}
+
+	public String getOwnerMobile() {
+		return ownerMobile;
+	}
+
+	public void setOwnerMobile(String ownerMobile) {
+		this.ownerMobile = ownerMobile;
+	}
 }

+ 9 - 0
src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java

@@ -11,6 +11,7 @@ public class JtBusinessProjectResult extends JtBusinessProject {
 	private List<JtTag> tags;
 	
 	private String  ownerName;
+	private String ownerMobile;
 	private String interestCount;
 	private String createTimeFormat;
 	private  CommentDetailResult	CommentDetailResult;
@@ -116,4 +117,12 @@ public void setCompanyId(String companyId) {
 	public void setInterested(Integer interested) {
 		this.interested = interested;
 	}
+
+	public String getOwnerMobile() {
+		return ownerMobile;
+	}
+
+	public void setOwnerMobile(String ownerMobile) {
+		this.ownerMobile = ownerMobile;
+	}
 }

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

@@ -1429,8 +1429,9 @@ where
   	<select id="selectAppAchuevementDetail" resultType="com.goafanti.achievement.bo.AchievementEntity">
   	select a.id,a.name,a.keyword,a.data_category as dataCategory,a.category,a.summary,a.introduction,a.transfer_mode as transferMode,a.status,a.transfer_price as transferPrice ,a.innovation,a.maturity,a.audit_status,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,f3.name as field3,a.release_status as releaseStatus,a.audit_status as auditStatus,a.boutique,a.field_a as fieldA,a.is_hot as isHot,a.release_date as releaseDate,if(isnull(b.count),0,b.count) as interestCount,
-  if(isnull(d.achievement_id),0,1) interest,ifnull(t.count,0) as orderCount,a.picture_url_min as pictureUrlMin
+  if(isnull(d.achievement_id),0,1) interest,ifnull(t.count,0) as orderCount,a.picture_url_min as pictureUrlMin,us.nickname as ownerName,us.mobile as ownerMobile
    from achievement a left join industry_category f on a.field_a=f.id
+  left join `user` us on a.owner_id=us.id
   left join industry_category f2 on a.field_b=f2.id
   left join industry_category f3 on a.field_c=f3.id
   left join (select b.commodity_id as id,count(*) as count from jt_order a left join jt_order_detail b on a.order_no=b.order_no

+ 7 - 6
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -61,14 +61,15 @@
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAppByPrimaryKey" resultType="com.goafanti.demand.bo.AppDemandBo" parameterType="java.lang.String" >
-    select 
+       select 
     d.id, d.serial_number AS serialNumber, d.data_category AS dataCategory, d.name, d.keyword,d.budget_cost as budgetCost,
-    d.info_sources AS infoSources, d.industry_category_a AS fieldA,d.industry_category_b AS fieldB,
-    f.name as field1,f2.name as field2,d.is_hot as isHot,d.release_date as releaseDate,d.demand_type as demandType,
-    d.name,d.problem_des as problemDes,d.picture_url as pictureUrl,d.release_status as releaseStatus,
-    d.audit_status as auditStatus,d.fixed_budget as fixedBudget,d.crowd_cost as crowdCost,
-    ifnull(i.y,0) as interestCount,if(isnull(a.demand_id),0,1) as interest,ifnull(t.count,0) as orderCount,d.picture_url_min as pictureUrlMin
+    d.info_sources AS infoSources, d.industry_category_a AS fieldA,d.industry_category_b AS fieldB,f.name as field1,
+    f2.name as field2,d.is_hot as isHot,d.release_date as releaseDate,d.demand_type as demandType,d.name,
+    d.problem_des as problemDes,d.picture_url as pictureUrl,d.release_status as releaseStatus,d.audit_status as auditStatus,
+    d.fixed_budget as fixedBudget,d.crowd_cost as crowdCost,ifnull(i.y,0) as interestCount,if(isnull(a.demand_id),0,1) as interest,ifnull(t.count,0) as orderCount,
+    d.picture_url_min as pictureUrlMin,us.nickname as ownerName,us.mobile as ownerMobile
     from demand d
+    left join `user` us on d.employer_id=us.id
     left join (select b.commodity_id as id,count(*) as count from jt_order a left join jt_order_detail b on a.order_no=b.order_no
 	GROUP by b.commodity_id) t on d.id=t.id
 	left join (select count(0) as y,demand_id from demand_interest

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

@@ -597,12 +597,12 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKeyWithModule" resultType="com.goafanti.business.bo.JtBusinessProjectResult">
-    select 
-        jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
-        jtbp.activity_flag as activityFlag, u.nickname as ownerName,ifnull(p.count,0) as interestCount,if(isnull(x.project_id),0,1) as interested,jtbp.keyword,jtbp.summary,
+	select 
+    jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
+    jtbp.activity_flag as activityFlag,ifnull(p.count,0) as interestCount,if(isnull(x.project_id),0,1) as interested,jtbp.keyword,jtbp.summary,
     jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
     jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module,jtbp.advertisement
-    ,u.`type` as type
+    ,u.`type` as type,u.mobile as ownerMobile, u.nickname as ownerName
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
     left join jt_business_category jtbc on jtbc.id =  jtbp.category_id
     left join (select project_id,count(*) as count from project_interest group by project_id) p on jtbp.id=p.project_id

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

@@ -1347,7 +1347,7 @@ select a.id as uid,a.nickname as username,a.head_portrait_url as personPortraitU
 		b.industry,b.work_unit as workUnit,b.professional_title as professionalTitle,a.introduction,
 		ifnull(c.count,0) as countInterest,b.expert,ifnull(x.a,0) as favorable,ifnull(x.b,0) as general,
 		ifnull(x.c,0) as inferior,ifnull(x.d,0) as commentCount,ifnull( cast(x.a*100 / x.d as decimal(18, 2)), 100 ) as favorableRate,
-		if(isnull(d.to_uid),0,1) as interested, b.typical_case as typicalCase, b.good_at_industry as goodAtIndustry
+		if(isnull(d.to_uid),0,1) as interested, b.typical_case as typicalCase, b.good_at_industry as goodAtIndustry,a.mobile
 		from `user` a left join user_identity b on a.id=b.uid left join (select a.commodity_id as uid,
 			sum(case when a.star &gt; 3 then 1 else 0 end) as a,
 			sum(case when a.star=3 then 1 else 0 end) as b,

+ 15 - 0
src/main/java/com/goafanti/demand/bo/AppDemandBo.java

@@ -30,6 +30,9 @@ public class AppDemandBo {
 	    private BigDecimal budgetCost;
 	    private Date createTime;
 	    private String pictureUrlMin;
+		private String  ownerName;//所有人名称
+		private String ownerMobile;//所有人电话
+
 		public int getFieldA() {
 			return fieldA;
 		}
@@ -176,4 +179,16 @@ public class AppDemandBo {
 		public void setPictureUrlMin(String pictureUrlMin) {
 			this.pictureUrlMin = pictureUrlMin;
 		}
+		public String getOwnerName() {
+			return ownerName;
+		}
+		public void setOwnerName(String ownerName) {
+			this.ownerName = ownerName;
+		}
+		public String getOwnerMobile() {
+			return ownerMobile;
+		}
+		public void setOwnerMobile(String ownerMobile) {
+			this.ownerMobile = ownerMobile;
+		}
 }

+ 0 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -56,7 +56,6 @@
 							<input type="button" id="photo" value="获取验证码" disabled/>
 						</div>	
 						<div class="zhuce_input">
-							<img th:src="${portalHost+'/img/resiger_photo300.jpg'}" alt=""/>
 							<input type="text" name="beInviteCode" placeholder="请输入邀请码" id="beInviteCode" autocomplete="off"/>
 						</div>											
 						<div class="protocol">