Browse Source

Merge remote-tracking branch 'origin/test'

anderx 8 years ago
parent
commit
36946c2c51

+ 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>

+ 0 - 84
src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml

@@ -348,90 +348,6 @@
       remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <select id="selectBusinessList" resultType="com.goafanti.customer.bo.BusinessListBo">
-	  select
-		c.name as businessName,
-		b.identify_name as identifyName,
-		a.id as businessId,
-		a.create_time as createTime,
-		a.update_time as updateTime,
-		a.follow_situation as followSituation,
-		a.customer_status as customerStatus,
-		d.name as adminName
-	from
-		user_business a inner join user b on
-		a.uid = b.id left join business_glossory c on
-		a.business_glossory_id = c.id left join admin d on
-		a.aid = d.id
-	where 1 = 1
-	<if test="aid != null and aid != ''">
-		and a.aid = #{aid,jdbcType=VARCHAR}
-	</if>
-	<if test="uid != null and uid !=''">
-		and a.uid = #{uid,jdbcType=VARCHAR}
-	</if>
-	<if test="businessGlossoryId !=null and businessGlossoryId != ''">
-		and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
-	</if>
-	<if test="identifyName != null and identifyName != ''">
-		and b.identify_name like concat('%', #{identifyName},'%')
-	</if>
-	<if test="followSituation != null">
-		and a.follow_situation = #{followSituation,jdbcType=INTEGER}
-	</if>
-	<if test="customerStatus != null">
-		and a.customer_status = #{customerStatus,jdbcType=INTEGER}
-	</if>
-	<if test="adminName != null and adminName != ''">
-		and d.name = #{adminName,jdbcType=VARCHAR}
-	</if>
-	<if test="startDate != null and startDate != ''">
-		and a.create_time &gt; STR_TO_DATE(#{startDate},'%Y-%m-%d %H:%i:%s')
-	</if>
-	<if test="endDate != null and endDate != ''">
-		and a.create_time &lt; STR_TO_DATE(#{endDate},'%Y-%m-%d %H:%i:%s')
-	</if>
-	<if test="page_sql != null">
-    	${page_sql}
-    </if>
-  </select>
-  <select id="selectBusinessCount" parameterType="com.goafanti.customer.bo.BusinessListBo" resultType="java.lang.Integer">
-  	select
-  		count(0)
-  	from
-		user_business a inner join user b on
-		a.uid = b.id left join business_glossory c on
-		a.business_glossory_id = c.id left join admin d on
-		a.aid = d.id
-	where 1 = 1
-	<if test="aid != null and aid != ''">
-		and a.aid = #{aid,jdbcType=VARCHAR}
-	</if>
-	<if test="uid != null and uid !=''">
-		and a.uid = #{uid,jdbcType=VARCHAR}
-	</if>
-	<if test="businessGlossoryId !=null and businessGlossoryId != ''">
-		and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
-	</if>
-	<if test="identifyName != null and identifyName != ''">
-		and b.identify_name like concat('%', #{identifyName},'%')
-	</if>
-	<if test="followSituation != null">
-		and a.follow_situation = #{followSituation,jdbcType=INTEGER}
-	</if>
-	<if test="customerStatus != null">
-		and a.customer_status = #{customerStatus,jdbcType=INTEGER}
-	</if>
-	<if test="adminName != null and adminName != ''">
-		and d.name = #{adminName,jdbcType=VARCHAR}
-	</if>
-	<if test="startDate != null and startDate != ''">
-		and a.create_time &gt; STR_TO_DATE(#{startDate},'%Y-%m-%d %H:%i:%s')
-	</if>
-	<if test="endDate != null and endDate != ''">
-		and a.create_time &lt; STR_TO_DATE(#{endDate},'%Y-%m-%d %H:%i:%s')
-	</if>		
-  </select>
   
   <select id="findBusinessGlossory" resultType="com.goafanti.customer.bo.BusinessListBo">
   	select id as businessGlossoryId,name as businessName from business_glossory

+ 85 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -763,4 +763,89 @@
 		where a.follow_id = #{followId,jdbcType=VARCHAR}
 	</select>
 	
+	<select id="selectBusinessList" resultType="com.goafanti.customer.bo.BusinessListBo">
+	  select
+		c.name as businessName,
+		b.identify_name as identifyName,
+		a.id as businessId,
+		a.create_time as createTime,
+		a.update_time as updateTime,
+		a.follow_situation as followSituation,
+		a.customer_status as customerStatus,
+		d.name as adminName
+	from
+		user_business a inner join user b on
+		a.uid = b.id left join business_glossory c on
+		a.business_glossory_id = c.id left join admin d on
+		a.aid = d.id
+	where 1 = 1
+	<if test="aid != null and aid != ''">
+		and a.aid = #{aid,jdbcType=VARCHAR}
+	</if>
+	<if test="uid != null and uid !=''">
+		and a.uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="businessGlossoryId !=null and businessGlossoryId != ''">
+		and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
+	</if>
+	<if test="identifyName != null and identifyName != ''">
+		and b.identify_name like concat('%', #{identifyName},'%')
+	</if>
+	<if test="followSituation != null">
+		and a.follow_situation = #{followSituation,jdbcType=INTEGER}
+	</if>
+	<if test="customerStatus != null">
+		and a.customer_status = #{customerStatus,jdbcType=INTEGER}
+	</if>
+	<if test="adminName != null and adminName != ''">
+		and d.name = #{adminName,jdbcType=VARCHAR}
+	</if>
+	<if test="startDate != null and startDate != ''">
+		and a.create_time &gt; STR_TO_DATE(#{startDate},'%Y-%m-%d %H:%i:%s')
+	</if>
+	<if test="endDate != null and endDate != ''">
+		and a.create_time &lt; STR_TO_DATE(#{endDate},'%Y-%m-%d %H:%i:%s')
+	</if>
+	<if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+  <select id="selectBusinessCount" parameterType="com.goafanti.customer.bo.BusinessListBo" resultType="java.lang.Integer">
+  	select
+  		count(0)
+  	from
+		user_business a inner join user b on
+		a.uid = b.id left join business_glossory c on
+		a.business_glossory_id = c.id left join admin d on
+		a.aid = d.id
+	where 1 = 1
+	<if test="aid != null and aid != ''">
+		and a.aid = #{aid,jdbcType=VARCHAR}
+	</if>
+	<if test="uid != null and uid !=''">
+		and a.uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="businessGlossoryId !=null and businessGlossoryId != ''">
+		and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
+	</if>
+	<if test="identifyName != null and identifyName != ''">
+		and b.identify_name like concat('%', #{identifyName},'%')
+	</if>
+	<if test="followSituation != null">
+		and a.follow_situation = #{followSituation,jdbcType=INTEGER}
+	</if>
+	<if test="customerStatus != null">
+		and a.customer_status = #{customerStatus,jdbcType=INTEGER}
+	</if>
+	<if test="adminName != null and adminName != ''">
+		and d.name = #{adminName,jdbcType=VARCHAR}
+	</if>
+	<if test="startDate != null and startDate != ''">
+		and a.create_time &gt; STR_TO_DATE(#{startDate},'%Y-%m-%d %H:%i:%s')
+	</if>
+	<if test="endDate != null and endDate != ''">
+		and a.create_time &lt; STR_TO_DATE(#{endDate},'%Y-%m-%d %H:%i:%s')
+	</if>		
+  </select>
 </mapper>

+ 7 - 2
src/main/java/com/goafanti/portal/controller/PortalNewsController.java

@@ -12,8 +12,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.app.bo.ProjectDetailBo;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
+import com.goafanti.business.service.BusinessProjectService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -32,7 +34,8 @@ public class PortalNewsController extends BaseController {
 	NewsService				newsService;
 	@Resource
 	private BannersService	bannersService;
-
+	@Resource
+	private BusinessProjectService	businessProjectService;
 	/**
 	 * 策源地
 	 * 
@@ -153,7 +156,9 @@ public class PortalNewsController extends BaseController {
 	 * 高新认定APP
 	 */
 	@RequestMapping(value = "/portal/news/appCognizance", method = RequestMethod.GET)
-	public ModelAndView appCognizance(HttpServletRequest request, ModelAndView modelview) {
+	public ModelAndView appCognizance(HttpServletRequest request, ModelAndView modelview,String id) {
+		ProjectDetailBo bo = businessProjectService.orgProject(id);
+		modelview.addObject("bo", bo);
 		modelview.setViewName("/portal/news/appCognizance");
 		return modelview;
 	}

+ 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>

+ 10 - 7
src/main/webapp/WEB-INF/views/portal/news/appCognizance.html

@@ -11,37 +11,40 @@
 </head>
 	<body>
 		<div class="container">
-			<img th:src="${portalHost + '/img/appCognizance01.jpg'}"  alt="高企认定" id="imgs"/>
+			<img th:src="${bo.maxLogo == null
+					?portalHost + '/img/appCognizance01.jpg':avatarUploadHost+bo.maxLogo}"  alt="高企认定" id="imgs"/>
 			<div class="contant">
 				<div class="service">
-					<h3 id="dataName"></h3>
+					<h3 id="dataName" th:text="${bo.name}"></h3>
 				</div>
 				<div class="service">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}"  alt="" /><span>项目描述</span></h3>
 					<hr>
 					<div class="promiseText" id="describe">
-						
+						<p th:text="${bo.introduce}">
 					</div>
 				</div>
 				<div class="service">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>项目价值</span></h3>
 					<hr>
 					<div class="promiseText" id="data">
-						
+						<p th:text="${bo.valueEffect}">
 					</div>
 				</div>
 				<div class="service servicebj">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>服务规格</span></h3>
 					<hr>
-					<div class="specifications" >
-					
+					<div class="specifications">
+						<div th:each="item:${bo.projectSize}">
+							<p th:text="${item}"></p>
+						</div>
 					</div>
 				</div>
 				<div class="service">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>所需资料</span></h3>
 					<hr>
 					<div class="promiseText" id="promise">
-					
+						<p th:utext="${bo.clientSize}">
 					</div>
 				</div>
 				

+ 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">