Преглед изворни кода

Accept Merge Request #277 更新生产 : (test -> prod)

Merge Request: 更新生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/277
浅川 пре 8 година
родитељ
комит
40d820c579

+ 0 - 3
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1701,9 +1701,6 @@
   <select id="findAppProjectInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from project_interest t
-	left join (select id,count(0)  as countInterest ,project_id from project_interest
-				group by project_id
-				) x on t.id=x.id  
 	left join business_project  b on t.project_id=b.id
 	where  t.uid=#{uid,jdbcType=VARCHAR}
 	</select>

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

@@ -655,13 +655,11 @@
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
 		a.transaction_subject as transactionSubject,
 		a.transaction_amount as transactionAmount,
-		b.commodity_id as commodityId,
-		b.commodity_type as commodityType,
 		a.confirm_sign as confirmSign
 	from
-		t_funding_records a left join t_order b on a.order_no = b.order_no
+		t_funding_records a
 	where
-		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR})
 		<if test="orderNo != null and orderNo != ''">
 			and a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>
@@ -675,9 +673,9 @@
   	select
 		count(0)
 	from
-		t_funding_records a left join t_order b on a.order_no = b.order_no
+		t_funding_records a
 	where
-		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR})
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>

+ 1 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -267,6 +267,7 @@ public class DemandSearchListBo {
 	}
 
 	public String getCountInterest() {
+		if (StringUtils.isBlank(countInterest)) countInterest = "0";
 		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 

+ 6 - 6
src/main/webapp/WEB-INF/views/portal/index.html

@@ -207,7 +207,7 @@
 					</span>
 					<div class="index_cont">
 						<div th:if="${#lists.size(speciaList) ge 1}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[0].id},type=${speciaList[0].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[0].id},type=${speciaList[0].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[0].headPortraitUrl}?${avatarUploadHost+speciaList[0].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[0].abilityLabel}">湖南大学生物科学教授</h4>
@@ -218,7 +218,7 @@
 							</a>	
 						</div>
 						<div th:if="${#lists.size(speciaList) ge 2}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[1].id},type=${speciaList[1].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[1].id},type=${speciaList[1].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[1].headPortraitUrl}?${avatarUploadHost+speciaList[1].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[1].abilityLabel}">中医皮肤病医院专家</h4>
@@ -229,7 +229,7 @@
 							</a>	
 						</div>
 						<div th:if="${#lists.size(speciaList) ge 3}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[2].id},type=${speciaList[2].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[2].id},type=${speciaList[2].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[2].headPortraitUrl}?${avatarUploadHost+speciaList[2].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[2].abilityLabel}">电子薄膜材料专家</h4>
@@ -239,7 +239,7 @@
 							</a>	
 						</div>
 						<div th:if="${#lists.size(speciaList) ge 4}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[3].id},type=${speciaList[3].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[3].id},type=${speciaList[3].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[3].headPortraitUrl}?${avatarUploadHost+speciaList[3].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[3].abilityLabel}">热轧平整工艺专家</h4>
@@ -251,7 +251,7 @@
 							</a>	
 						</div>
 						<div th:if="${#lists.size(speciaList) ge 5}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[4].id},type=${speciaList[4].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[4].id},type=${speciaList[4].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[4].headPortraitUrl}?${avatarUploadHost+speciaList[4].headPortraitUrl}:${avatarUploadHost+ '/default/person.jpg'}" alt=""   />
 									<h4 class="appellation" th:text="${speciaList[4].abilityLabel}">联网信息产品营销专家</h4>
@@ -261,7 +261,7 @@
 							</a>	
 						</div>
 						<div th:if="${#lists.size(speciaList) ge 6}">
-							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[5].id},type=${speciaList[5].type})}">
+							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[5].id},type=${speciaList[5].type})}">
 								<div class="index_oneman">
 									<img th:src="${speciaList[5].headPortraitUrl}?${avatarUploadHost+speciaList[5].headPortraitUrl}:${avatarUploadHost+ '/default/person.jpg'}" alt=""   />
 									<h4 class="appellation" th:text="${speciaList[5].abilityLabel}">考古文博学院教授</h4>

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

@@ -82,7 +82,7 @@
 		<h3>相关智者</h3>
 		<div>
 			<div th:each="reuserPartner:${reuserPartner}">
-					<a th:href="@{/user/subscriberDetail.html(uid=${reuserPartner.uid},type=${reuserPartner.type})}">
+					<a th:href="@{/portal/subscriberDetail.html(uid=${reuserPartner.uid},type=${reuserPartner.type})}">
 						<img th:src="${reuserPartner.personPortraitUrl}?${avatarUploadHost+reuserPartner.personPortraitUrl}:${avatarUploadHost+ '/default/person.jpg'}"
 								alt="" />
 						<div class="about_name">