wanghui лет назад: 8
Родитель
Сommit
bfb141d371

+ 0 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -16,7 +16,6 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.CustomerMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AdminLocation;

+ 21 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -621,6 +621,27 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 *  关于我们
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	public ModelAndView aboutUs(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/aboutUs");
+		return modelview;
+	}
+	
+	/**
+	 * 联系我们
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	public ModelAndView contactUs(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/contactUs");
+		return modelview;
+	}
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

+ 7 - 0
src/main/java/com/goafanti/common/dao/CustomerLogMapper.java

@@ -72,4 +72,11 @@ public interface CustomerLogMapper {
 	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerLog record);
+	
+	   /**
+     * 查看操作日志
+     * @param customerId 客户编号
+     * @return
+     */
+    List<CustomerLog> listCustomerLog(@Param("cid") String customerId);
 }

+ 3 - 2
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -82,9 +82,10 @@ public interface CustomerMapper {
 	CustomerOut selectCustomerById(String id);
 
     /**
-     * 
+     *  查询团队 客户记录
      * @param ladderId 上层领导ID
-     * @return 查询团队 客户记录
+     * @return
      */
     List<Customer> selectByLadderId(@Param("ladderId")String ladderId);
+    
 }

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

@@ -413,4 +413,7 @@
       after_admin_name = #{afterAdminName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="listCustomerLog" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	select  <include refid="Base_Column_List" /> from customer_log where cid = #{cid,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -522,47 +522,7 @@
     left join admin d on a.aid=d.id
     where a.id = #{id,jdbcType=VARCHAR}
   </select> 
-  
-  <update id="updCustomerByPrimaryKey" parameterType="com.goafanti.common.model.Customer">
-    update customer
-    <set>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        paid = #{paid,jdbcType=VARCHAR},
-      </if>
-      <if test="shareType != null">
-        share_type = #{shareType,jdbcType=INTEGER},
-      </if>
-      <if test="customerType != null">
-        customer_type = #{customerType,jdbcType=INTEGER},
-      </if>
-      <if test="customerStatus != null">
-        customer_status = #{customerStatus,jdbcType=INTEGER},
-      </if>
-      <if test="companyIntention != null">
-        company_intention = #{companyIntention,jdbcType=CHAR},
-      </if>
-      <if test="followSituation != null">
-        follow_situation = #{followSituation,jdbcType=INTEGER},
-      </if>
-      <if test="tag != null">
-        tag = #{tag,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="followId != null">
-        follow_id = #{followId,jdbcType=VARCHAR},
-      </if>
-      <if test="effective != null">
-        effective = #{effective,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
+
   <select id="selectByLadderId" parameterType="java.lang.String" resultMap="BaseResultMap">
   	select 
     <include refid="Base_Column_List" />

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

@@ -409,7 +409,8 @@
 		c.name as adminName
 	from follow_up_record a left join customer_user_info b on a.cuid = b.id
 	left join admin c on a.aid = c.id
-	where a.cid = #{cid,jdbcType=VARCHAR} and a.effective = 0
+	where a.cid = #{cid,jdbcType=VARCHAR} and a.effective = 0 
+	order by followDate desc
   </select>
   
   <update id="deleteFollowUpRecord" parameterType="java.lang.String">

+ 17 - 6
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -94,7 +94,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//插入跟进表
 		followUpService.addFollowUp(fur);
 		//添加日志
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_CREATE,customerId);
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_CREATE,customerId);
 		return res;
 	}
 	
@@ -109,7 +109,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	public Result deleteCustomer(CustomerIn cusIn) throws ParseException {
 		Result res=new Result();
 		customerService.deleteCustomer(cusIn.getId());
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_DELETE,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_DELETE,cusIn.getId());
 		return res;
 	}
 	
@@ -229,7 +229,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新公司表
 		customerOrganizationService.updateCustomerOrganizationInfo(coi);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_MODIFY,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_MODIFY,cusIn.getId());
 	    return res;
 	}
 	
@@ -249,7 +249,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_TRANSFER,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_TRANSFER,cusIn.getId());
 	    return res;
 	}
 	
@@ -421,7 +421,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_RECEIVE,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_RECEIVE,cusIn.getId());
 	    return res;
 	}
 	
@@ -455,7 +455,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_TO_PUBLIC,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_TO_PUBLIC,cusIn.getId());
 	    return res;
 	}
 	
@@ -472,4 +472,15 @@ public class AdminCustomerApiController extends BaseApiController {
 		return res;
 	}
 
+	/**
+	 * 查看日志信息
+	 * @param customerId
+	 * @return
+	 */
+	@RequestMapping(value = "/listCustomerLog",method = RequestMethod.GET)
+	public Result listCustomerLog(String customerId){
+		Result  res = new Result();
+		res.setData(customerService.listCustomerLog(customerId));
+		return res;
+	}
 }

+ 0 - 11
src/main/java/com/goafanti/customer/service/CustomerLogoService.java

@@ -1,11 +0,0 @@
-package com.goafanti.customer.service;
-
-import com.goafanti.common.model.CustomerLog;
-
-public interface CustomerLogoService {
-	/**
-	 * 添加操作日志
-	 * @param cLog
-	 */
-	public void saveLogo(CustomerLog cLog);
-}

+ 12 - 2
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -1,6 +1,9 @@
 package com.goafanti.customer.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.Customer;
+import com.goafanti.common.model.CustomerLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.customer.bo.CustomerIn;
 import com.goafanti.customer.bo.CustomerOut;
@@ -61,7 +64,7 @@ public interface CustomerService {
 	 * 
 	 * @param cus 添加日志
 	 */
-	public void saveCustomerLogo(CustomerIn cus,String operatorType,String cid);
+	public void saveCustomerLog(CustomerIn cus,String operatorType,String cid);
 	
 	/**
 	 * 
@@ -83,5 +86,12 @@ public interface CustomerService {
 	 * @return 查询公司基本信息
 	 */
 	public CustomerOut findCustomerBaseInfo(String id);
-
+
+	/**
+	 *  查看日志信息
+	 * @param customerId
+	 * @return
+	 */
+	public List<CustomerLog> listCustomerLog(String customerId);
+	
 }

+ 9 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -36,7 +36,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	@Autowired
 	private AdminMapper adminMapper;
 	@Autowired
-	private CustomerLogMapper CustomerLogMapper;
+	private CustomerLogMapper customerLogMapper;
 	@Override
 	public int addCustomer(Customer cus) {
 		Date data =new Date();
@@ -224,7 +224,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	}
 	
 	@Override
-	public void saveCustomerLogo(CustomerIn cus,String operatorType,String cid){
+	public void saveCustomerLog(CustomerIn cus,String operatorType,String cid){
 		/* 记录日志 */
 		CustomerLog log = new CustomerLog();
 		log.setId(UUID.randomUUID().toString());
@@ -274,7 +274,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//修改前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_TO_PUBLIC);
 		}
-		CustomerLogMapper.insert(log);
+		customerLogMapper.insert(log);
 	}
 
 	/**
@@ -330,4 +330,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		}
 		return outList;
 	}
+
+	@Override
+	public List<CustomerLog> listCustomerLog(String customerId) {
+		
+		return customerLogMapper.listCustomerLog(customerId);
+	}
 }

+ 7 - 3
src/main/webapp/WEB-INF/views/common.html

@@ -77,13 +77,16 @@
 			<div class="nav_right" th:if="${!isLogin}">
 				<a th:href="${basePath + '/user/signIn.html'}"> <img
 					th:src="${portalHost+'/img/index_resiter.png'}" alt="" />
-				</a> <a href="javascript:;" class="head_login">登录</a> <a href="">关于我们</a>
+				</a> 
+				<a href="javascript:;" class="head_login">登录</a> 
+				<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
 				<div></div>
 			</div>
 			<div class="nav_right" th:if="${isLogin}">
 				<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
 					th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a> 
-				<a th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
+				<a th:href="${basePath + '/user/logout'}">退出</a> 
+				<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
 				<div></div>
 			</div>
 		</div>
@@ -122,7 +125,8 @@
 			<div class="bottom">
 				<div class="bottom_text">
 					<div class="text_top">
-						<a href="#">关于公司/</a> <a href="#">联系我们</a>
+						<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
+						<a th:href="${basePath + '/portal/contactUs.html'}">联系我们</a>
 						<p>Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号 -2
 							技术支持:湖南阿凡提科技有限公司</p>
 					</div>

Разница между файлами не показана из-за своего большого размера
+ 291 - 0
src/main/webapp/WEB-INF/views/portal/aboutUs.html


+ 231 - 0
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -0,0 +1,231 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head th:replace="common::header(~{::title},~{::link})">
+<title>技淘--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">
+</head>
+<body>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>		
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost+'/img/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+ 	<div id="contactUs">
+ 		<div class="contactUs">
+ 			<div class="contact_title">
+ 				联系我们
+ 			</div>
+			<div class="contact_cont">
+				<div class="contact_left">
+					<div class="contact_left_top">
+						
+					</div>
+					<div class="contact_left_center">
+						
+					</div>
+					<div class="contact_left_bottom">
+						
+					</div>
+				</div>
+				<div class="contact_center">
+					<div class="contact_center_top">
+						<h5>湖南科德信息咨询有限公司(总部)</h5>
+						<p>联 系 人:胡小姐</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:410005</p>
+						<p>E-mail:2035994611@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦8楼</p>
+					</div>
+					<div class="contact_center_bottom">
+						<h5>阿凡提信息科技股份有限公司(湖南分公司)</h5>
+						<p>联 系 人:王小姐</p>
+						<p>联系电话:0731-85202115</p>
+						<p>E-mail:3232358874@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦14楼</p>
+					</div>
+				</div>
+				<div class="contact_right">
+					<div style="width:400px;height:400px;border:#ccc solid 1px;" id="dituContent"></div>
+				</div>
+			</div>
+			<div class="contact_title">
+				全国分部
+			</div>
+			<div class="all_branch">
+				<div class="all_branch_map">
+					<div class="neimen"></div>
+					<div class="liaoning"></div>
+					<div class="beijing"></div>
+					<div class="hebei"></div>
+					<div class="shangdong"></div>
+					<div class="henan"></div>
+					<div class="jiangshu"></div>
+					<div class="anhui"></div>
+					<div class="hubei"></div>
+					<div class="sichuang"></div>
+					<div class="jiangxi"></div>
+					<div class="fujian"></div>
+					<div class="guizhou"></div>
+					<div class="yunnan"></div>
+					<div class="guanxi"></div>
+					<div class="guandong"></div>
+					<div class="hunan"></div>
+				</div>
+				<div class="all_map_case">
+					<div class="neimendiv">
+						<h5>内蒙古科发信息咨询有限公司</h5>
+						<p>联 系 人:科发信息</p>
+						<p>联系电话:18947910317 </p>
+						<p>邮&nbsp;&nbsp;编:010000</p>
+						<p>地&nbsp;&nbsp;址:呼和浩特市回民区明泽广场A座1110室</p>
+					</div>
+					<div class="liaoningdiv">
+						<h5>沈阳科德信息咨询有限公司</h5>
+						<p>联 系 人:沈阳科德</p>
+						<p>联系电话:024-31297263</p>
+						<p>邮&nbsp;&nbsp;编:110000</p>
+						<p>地&nbsp;&nbsp;址:沈阳市和平区南三经街2号金豪公寓2-11-2</p>
+					</div>
+					<div class="beijingdiv">
+						<h5>北京科德技淘信息技术有限公司</h5>
+						<p>联 系 人:冯亚娟</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:100000</p>
+						<p>地&nbsp;&nbsp;址:北京市朝阳区东三环南路小八里庄40号6号楼第六层614室</p>
+					</div>
+					<div class="hebeidiv">
+						<h5>石家庄科中企业管理咨询有限公司</h5>
+						<p>联 系 人:王洪垒</p>
+						<p>联系电话:18032295250</p>
+						<p>邮&nbsp;&nbsp;编:050000</p>
+						<p>地&nbsp;&nbsp;址:河北省石家庄市长安区跃进路3号天元商务大厦901室</p>
+					</div>
+					<div class="shangdongdiv">
+						<h5>青岛科德信息咨询有限公司</h5>
+						<p>联 系 人:青岛科德</p>
+						<p>联系电话:0532-58731385 </p>
+						<p>邮&nbsp;&nbsp;编:266000</p>
+						<p>地&nbsp;&nbsp;址:山东省青岛市黄岛开发区井冈山路紫金广场A座2708</p>
+					</div>
+					<div class="henandiv">
+						<h5>郑州科德企业管理咨询有限公司</h5>
+						<p>联 系 人:陈新裕</p>
+						<p>联系电话:18838010729</p>
+						<p>邮&nbsp;&nbsp;编:450000</p>
+						<p>地&nbsp;&nbsp;址:河南省郑州市金水区红专路政七街财源大厦B座1174</p>
+					</div>
+					<div class="jiangshudiv">
+						<h5>南京惟楚企业管理咨询有限公司</h5>
+						<p>联 系 人:周小姐</p>
+						<p>联系电话:025-66167661</p>
+						<p>邮&nbsp;&nbsp;编:210000</p>
+						<p>E-mail:1767604529@qq.com</p>
+						<p>地&nbsp;&nbsp;址:江苏省南京市玄武区成贤街118号科学会堂8号门701室</p>
+					</div>
+					<div class="anhuidiv">
+						<h5>合肥科稻信息咨询有限公司</h5>
+						<p>联 系 人:合肥科稻</p>
+						<p>联系电话:0551-62634195</p>
+						<p>邮&nbsp;&nbsp;编:230000</p>
+						<p>地&nbsp;&nbsp;址:合肥市庐阳区花园街安徽科技大厦11B</p>
+					</div>
+					<div class="hubeidiv">
+						<h5>武汉科汇科技咨询有限公司</h5>
+						<p>联 系 人:彭泽辉</p>
+						<p>联系电话:027-87313580</p>
+						<p>邮&nbsp;&nbsp;编:430000</p>
+						<p>地&nbsp;&nbsp;址:湖北省武汉市洪山区中北特一路楚天都市花园D座28G</p>
+					</div>
+					<div class="sichuangdiv">
+						<h5>成都科德信息技术有限公司</h5>
+						<p>联 系 人:杨根</p>
+						<p>联系电话:028-87078828</p>
+						<p>邮&nbsp;&nbsp;编:610000</p>
+						<p>地&nbsp;&nbsp;址:四川省成都市青羊区贝森南路18号B座904室</p>
+					</div>
+					<div class="jiangxidiv">
+						<h5>南昌科德信息咨询有限公司</h5>
+						<p>联 系 人:南昌科德</p>
+						<p>联系电话:0791-86259737</p>
+						<p>邮&nbsp;&nbsp;编:330000</p>
+						<p>E-mail:kcxx2012@163.com</p>
+						<p>地&nbsp;&nbsp;址:江西省南昌市东湖区省政府大院北二路53号科技情报中心二楼</p>
+					</div>
+					<div class="fujiandiv">
+						<h5>福州市科宇信息咨询有限公司</h5>
+						<p>联 系 人:吴先生</p>
+						<p>联系电话:18359155929</p>
+						<p>邮&nbsp;&nbsp;编:350000</p>
+						<p>地&nbsp;&nbsp;址:福建省福州市晋安区福马路504号科技信息大楼11楼</p>
+					</div>
+					<div class="guizhoudiv">
+						<h5>贵州科德华咨信息咨询有限公司</h5>
+						<p>联 系 人:贵州科德</p>
+						<p>联系电话:0851-88585225</p>
+						<p>邮&nbsp;&nbsp;编:550000</p>
+						<p>地&nbsp;&nbsp;址:贵州省贵阳市南明区遵义路105号万象国际A座19楼322 </p>
+					</div>
+					<div class="yunnandiv">
+						<h5>昆明科道企业管理有限公司</h5>
+						<p>联 系 人:王彪</p>
+						<p>联系电话:18987192587</p>
+						<p>邮&nbsp;&nbsp;编:650000</p>
+						<p>地&nbsp;&nbsp;址:昆明市官渡区官南大道2169号大润发商业广场2幢1410号</p>
+					</div>
+					<div class="guanxidiv">
+						<h5>广西南宁科发企业信息咨询有限公司</h5>
+						<p>联 系 人:南宁科发</p>
+						<p>联系电话:0771-6758726</p>
+						<p>邮&nbsp;&nbsp;编:530000</p>
+						<p>E-mail:2851902539@qq.com</p>
+						<p>地&nbsp;&nbsp;址:广西南宁市高新区滨河路5号中盟科技园4号6楼</p>
+					</div>
+					<div class="guandongdiv">
+						<h5>广州科丰管理咨询有限公司</h5>
+						<p>联 系 人:广州科丰</p>
+						<p>联系电话:020-29143112</p>
+						<p>邮&nbsp;&nbsp;编:510000</p>
+						<p>地&nbsp;&nbsp;址:广州市白云区黄石国际单位二期C2栋407</p>
+						<br/>
+						<h5>广州科德企业信息咨询有限公司</h5>
+						<p>联 系 人:广州科中</p>
+						<p>联系电话:18565104122 </p>
+						<p>邮&nbsp;&nbsp;编:510000</p>
+						<p>地&nbsp;&nbsp;址:广州市白云区嘉禾望岗望岗大道88号金塬大厦4018</p>
+					</div>
+					<div class="hunandiv">
+						<h5>湖南科德信息咨询有限公司</h5>
+						<p>联 系 人:胡小姐</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:410005</p>
+						<p>E-mail:2035994611@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦8楼</p>
+					</div>
+				</div>
+			</div>
+ 		</div>	
+ 	</div>
+  	<!--主体内容区域结束-->
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/contactUs.js'}"></script>
+	</div>
+</body>
+</html>

+ 3 - 0
src/test/java/com/goafanti/test/TestValueEvaluation.java

@@ -1,5 +1,8 @@
 package com.goafanti.test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;