1、更新原产地书介绍页面的内容；

2、更新关于我们页面介绍内容；
3、增加前端签证机构展示方式；
4、增加签证机构管理模块。

src/main/java/org/ccpit/business/noticeManage/NoticeService.java

@@ -90,8 +90,7 @@ public class NoticeService {
 		Object[] ids = jsonArray.toArray();
 		boolean flag = false;
 		for (Object metadataId : ids) {
-			Notice Notice = noticeDao.queryById(Long.valueOf(String
-					.valueOf(metadataId)));
+			Notice Notice = noticeDao.queryById(Long.valueOf(String.valueOf(metadataId)));
 			Notice.setDeleted(true);
 			flag = noticeDao.update(Notice);
 		}

src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWork.java

@@ -3,12 +3,13 @@
  */
 package org.ccpit.business.serviceNetWork;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Where;
 
+import java.util.Date;
+
 /**
  * Company Name : 中贸促信息技术有限责任公司 Project Name:memberManageSys File
  * Name:DownloadFileController.java Package Name:ccpit.base.controller Date:
@@ -27,7 +28,7 @@ public class ServiceNetWork {
 	/**
 	 * 网点名称
 	 */
-	private String name;
+	private String orgName;
 	/**
 	 * 网点地址
 	 */
@@ -49,16 +50,55 @@ public class ServiceNetWork {
 	 */
 	private String contacts;
 
+	public String getArea() {
+		return area;
+	}
+
+	public void setArea(String area) {
+		this.area = area;
+	}
+
 	/**
-	 *
+	 *所属地区
 	 */
-	private String parentId;
+	private String area;
 
 	/**
+	 * 创建时间
+	 */
+	public Date createTime;
+	/**
+	 * 创建人
+	 */
+	public User creator;
+	/**
+	 * 修改人
+	 */
+	public User modifyBy;
+	/**
+	 * 修改时间
+	 */
+	public Date modifyTime;
+	/**
 	 * 是否删除
 	 */
 	private boolean deleted;
 
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	/**
+	 * 排序号
+	 */
+	private Integer sort;
+
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
 	public long getId() {
 		return id;
 	}
@@ -67,12 +107,12 @@ public class ServiceNetWork {
 		this.id = id;
 	}
 
-	public String getName() {
-		return name;
+	public String getOrgName() {
+		return orgName;
 	}
 
-	public void setName(String name) {
-		this.name = name;
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
 	}
 
 	public String getLinkAddress() {
@@ -123,12 +163,35 @@ public class ServiceNetWork {
 		this.deleted = deleted;
 	}
 
-	public String getParentId() {
-		return parentId;
+
+	@OneToOne
+	public User getCreator() {
+		return creator;
+	}
+	public void setCreator(User creator) {
+		this.creator = creator;
 	}
 
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
+	@OneToOne
+	public User getModifyBy() {
+		return modifyBy;
+	}
+	public void setModifyBy(User modifyBy) {
+		this.modifyBy = modifyBy;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getModifyTime() {
+		return modifyTime;
+	}
+	public void setModifyTime(Date modifyTime) {
+		this.modifyTime = modifyTime;
 	}
 
 }

src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWorkController.java

+package org.ccpit.business.serviceNetWork;
+
+
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value="/business/serviceNetWorkManage")
+public class ServiceNetWorkController extends BaseController {
+
+
+    @Autowired
+    private ServiceNetWorkService serviceNetWorkService;
+    @Autowired
+    private LogInfoService logInfoService;
+
+    @RequestMapping(value ="/goinServiceNetWorkPage")
+    public ModelAndView getPage() {
+        ModelAndView mv = new ModelAndView("business/serviceNetWorkPage");
+        return mv;
+    }
+
+    /**
+     * 查询所有问题
+     * @author
+     * @param request
+     * @param serviceNetWork
+     * @return
+     * @since JDK 1.8.0
+     */
+    @RequestMapping(value="/queryAllServiceNetWork")
+    public Object queryAllServiceNetWork(HttpServletRequest request, ServiceNetWork serviceNetWork) {
+        PageRequest pageRequest = getPage(request);
+        String orgName = request.getParameter("orgName");
+        Page<ServiceNetWork> pageInformation = serviceNetWorkService.queryServiceNetWorks(pageRequest, orgName);
+
+        return serviceNetWorkService.convert(pageInformation);
+    }
+    /**
+     *
+     * isExistServiceNetWork:(根据标题查询是否存在). <br/>
+     * @author
+     * @param request
+     * @return
+     * @since JDK 1.8.0
+     */
+    @RequestMapping(value="/isExistServiceNetWork")
+    public Object isExistServiceNetWork(HttpServletRequest request){
+        Map<String,Object> result = new HashMap<String,Object>();
+        String orgName = request.getParameter("orgName");
+        boolean isExist = serviceNetWorkService.queryServiceNetWorkByName(orgName);
+        result.put("flag", isExist);
+        if(isExist){
+            result.put("info", "机构信息已存在，请不要重复录入...");
+        }
+        return result;
+    }
+
+    /**
+     *
+     * addOrUpdateServiceNetWork:(新增或修改). <br/>
+     * @author
+     * @param request
+     * @param response
+     * @return
+     * @since JDK 1.8.0
+     */
+    @RequestMapping(value="/addOrUpdateServiceNetWork",produces = "application/json;charset=UTF-8")
+    public Object addOrUpdateServiceNetWork(HttpServletRequest request, HttpServletResponse response, ServiceNetWork serviceNetWork){
+        String result = "";
+        String operate = request.getParameter("operate");
+        String serviceNetWorkId = request.getParameter("serviceNetWorkId");
+
+        boolean flag = serviceNetWorkService.addOrUpdateServiceNetWork(serviceNetWork, operate, serviceNetWorkId, (User)getUserSession(request), request);
+        if(flag){
+            result = "{ \"flag\": "+ flag  +", \"info\": \"数据保存成功！\" }";
+        }else {
+            result = "{ \"flag\": "+ flag  +", \"info\": \"数据保存失败！\" }";
+        }
+        return result;
+    }
+
+    /**
+     *
+     * delPerson:(这里用一句话描述这个方法的作用). <br/>
+     * @author
+     * @param request
+     * @return
+     * @since JDK 1.8.0
+     */
+    @RequestMapping(value="/deleteServiceNetWorks")
+    public Object deleteServiceNetWorks(HttpServletRequest request){
+        Map<String,Object> result = new HashMap<String,Object>();
+        boolean flag = serviceNetWorkService.deleteServiceNetWorkById(request.getParameter("ids"));
+        result.put("flag", flag);
+        if(flag){
+            result.put("info", "数据删除成功！");
+        }else {
+            result.put("info", "数据删除失败！");
+        }
+        return result;
+    }
+
+    /**
+     *
+     * queryPersonById:(通过id查询). <br/>
+     * @author
+     * @param id
+     * @return
+     * @since JDK 1.8.0
+     */
+    @RequestMapping(value="/queryServiceNetWorkById/{id}")
+    public ServiceNetWork queryServiceNetWorkById(@PathVariable long id){
+        return serviceNetWorkService.queryServiceNetWorkById(id);
+    }
+    
+}

src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWorkDao.java

@@ -3,8 +3,14 @@
  */
 package org.ccpit.business.serviceNetWork;
 
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
 import org.ccpit.base.dao.BaseDao;
+import org.hibernate.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.Assert;
+
+import java.util.List;
 
 /**
  * Company Name : 中贸促信息技术有限责任公司
@@ -18,4 +24,28 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class ServiceNetWorkDao extends BaseDao<ServiceNetWork> {
 
+    @Override
+    public Page findPage(PageRequest pageRequest, String hql, Object[] values) {
+        Assert.notNull(pageRequest, "pageRequest对象不能为空");
+
+        Page page = new Page(pageRequest);
+
+        if (pageRequest.isCountTotal()) {
+            long totalCount = countTotalResult(hql, values);
+            page.setTotal(totalCount);
+        }
+
+        if (pageRequest.isOrderBySetted()) {
+            hql = setOrderParameterToHql(hql, pageRequest);
+        }
+
+        Query q = createQuery(hql, values);
+        q.setFirstResult(pageRequest.getOffset());
+        q.setMaxResults(pageRequest.getPageSize());
+        q.setCacheable(true);
+
+        List result = q.list();
+        page.setRows(result);
+        return page;
+    }
 }

src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWorkService.java

@@ -3,36 +3,141 @@
  */
 package org.ccpit.business.serviceNetWork;
 
-import java.util.List;
-
-import javax.transaction.Transactional;
-
+import net.sf.json.JSONArray;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.utils.StringUtil;
+import org.ccpit.base.utils.page.PageUtil;
+import org.ccpit.business.noticeManage.Notice;
+import org.ccpit.business.questionsManage.Question;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-/**
- * Company Name : 中贸促信息技术有限责任公司 Project Name:memberManageSys File
- * Name:DownloadFileController.java Package Name:ccpit.base.controller Date:
- * 2017年4月24日 下午3:46:12 Copyright (c) 2016, liyang@ccpit.org All Rights
- * Reserved.
- *
- */
+import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 @Transactional
 public class ServiceNetWorkService  {
-	
+
 	@Autowired
 	private ServiceNetWorkDao netWorkDao;
-	
+
+	@Autowired
+	private LogInfoService logInfoService;
+
 	public ServiceNetWork queryServiceNetWorkById(long id) {
 		return netWorkDao.queryById(id);
 	}
-	
-	public List<ServiceNetWork> queryServiceNetWorksByPId(String id) {
-		
-		String hql =" from ServiceNetWork where parentId = '"+id+"'";
-		
-		return netWorkDao.query(hql);
+
+	public Page<ServiceNetWork> queryServiceNetWorks(PageRequest pageRequest, String orgName) {
+		StringBuffer hql = new StringBuffer("from ServiceNetWork where 1=1");
+		if (orgName != null && !"".equals(orgName)) {
+			hql.append(" and orgName like '%" + orgName + "%'");
+		}
+		hql.append(" order by sort asc");
+		return netWorkDao.findPage(pageRequest, hql.toString(), null);
+	}
+
+	public List<ServiceNetWork> queryServiceNetWorksByName(String orgName) {
+		StringBuffer hql = new StringBuffer("from ServiceNetWork where 1=1");
+		if (orgName != null && !"".equals(orgName)) {
+			hql.append(" and orgName like '%" + orgName + "%'");
+		}
+		hql.append(" order by createTime desc");
+
+		return netWorkDao.query(hql.toString());
+	}
+
+
+	public boolean addOrUpdateServiceNetWork(ServiceNetWork serviceNetWork, String operate,
+									   String questionId, User user, HttpServletRequest request) {
+		boolean flag = false;
+		if ("add".equals(operate)) {
+			serviceNetWork.setCreateTime(new Date());
+			serviceNetWork.setCreator(user);
+			flag = netWorkDao.save(serviceNetWork);
+			if (flag) {
+				// 记录用户操作日志信息
+				logInfoService.recordLog(request, "新增签证机构数据信息");
+			}
+		} else if ("edit".equals(operate)) {
+			ServiceNetWork question1 = queryQuestionById(Long.parseLong(questionId));
+			PageUtil.setterValues(serviceNetWork, question1);
+			question1.setModifyTime(new Date());
+			question1.setModifyBy(user);
+			flag = netWorkDao.update(question1);
+			if (flag) {
+				// 记录用户操作日志信息
+				logInfoService.recordLog(request, "修改签证机构数据信息");
+			}
+		}
+		return flag;
+	}
+
+	public ServiceNetWork queryQuestionById(long id) {
+		return netWorkDao.queryById(id);
+	}
+
+	public boolean deleteServiceNetWorkById(String jsonIds) {
+		JSONArray jsonArray = JSONArray.fromObject(jsonIds);
+		Object[] ids = jsonArray.toArray();
+		boolean flag = false;
+		for (Object metadataId : ids) {
+			ServiceNetWork serviceNetWork = netWorkDao.queryById(Long.valueOf(String.valueOf(metadataId)));
+			serviceNetWork.setDeleted(true);
+			flag = netWorkDao.update(serviceNetWork);
+		}
+		return flag;
+	}
+
+	public boolean queryServiceNetWorkByName(String orgName) {
+		if (null != orgName && !"".equals(orgName)) {
+			try {
+				orgName = java.net.URLDecoder.decode(orgName, "UTF-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+		}
+		List<ServiceNetWork> questionList = netWorkDao.query("from ServiceNetWork where orgName = '" + orgName + "'", null);
+		if (null != questionList && questionList.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public PageBo<ServiceNetWork> convert(Page<ServiceNetWork> page) {
+		return new PageBo<ServiceNetWork>(page, new Convert<ServiceNetWork>() {
+			@Override
+			public Map<String, Object> convert(ServiceNetWork obj) {
+				return convertToMap(obj);
+			}
+		});
+	}
+
+	public Map<String, Object> convertToMap(ServiceNetWork question) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (question == null) {
+			return map;
+		}
+		map.put("id", question.getId());
+		map.put("orgName", question.getOrgName());   //签证机构
+		map.put("linkAddress", question.getLinkAddress());   //签证机构地址
+		map.put("tel", question.getTel());   //电话
+		map.put("createTime", StringUtil.DATE_FORMATE.format(question.getCreateTime()));
+		map.put("area", question.getArea());  //所属地区
+		map.put("creator", question.getCreator().getUsername());
+
+		return map;
 	}
 
 }

src/main/java/org/ccpit/front/IndexController.java

@@ -99,17 +99,31 @@ public class IndexController extends BaseController {
 	public Object queryTaxableGoods(HttpServletRequest request) {
 		PageRequest pageRequest = getPage(request);
 		String taxNumber = request.getParameter("taxNumber");
-		Page<TaxableGoods> pageInformation = taxableGoodsService
-				.queryTaxableGoodsList(pageRequest, taxNumber);
+		Page<TaxableGoods> pageInformation = taxableGoodsService.queryTaxableGoodsList(pageRequest, taxNumber);
 		return pageInformation;
 	}
 
 	@RequestMapping(value = "/front/serviceNetWork")
 	public ModelAndView serviceNetWork(ModelAndView mv) {
-		mv.setViewName("/front/serviceNetWork");
+//		mv.setViewName("/front/serviceNetWork");
+		mv.setViewName("/front/serviceNetWorkList");
 		return mv;
 	}
 
+	@RequestMapping(value = "/front/serviceNetWorkByKey")
+	public Object serviceNetWorkByKey(ModelAndView mv) {
+		String queryParam = request.getParameter("queryParams");
+		PageRequest pageRequest = getPage(request);
+//		String orgName = request.getParameter("orgName");
+		String orgName = queryParam.split(":")[1];
+		if("undefined".equals(orgName)){
+			orgName = "";
+		}
+		Page<ServiceNetWork> pageInformation = serviceNetWorkService.queryServiceNetWorks(pageRequest, orgName);
+
+		return serviceNetWorkService.convert(pageInformation);
+	}
+
 	@RequestMapping(value = "/front/aboutCO")
 	public ModelAndView centerInfo(ModelAndView mv) {
 		mv.setViewName("/front/certificateOfOrigin");
@@ -180,6 +194,8 @@ public class IndexController extends BaseController {
 		return mv;
 	}
 
+
+
 	@RequestMapping(value = "/front/aboutQuestions")
 	public Object queryAllQuestion(HttpServletRequest request, Question question) {
 		PageRequest pageRequest = getPage(request);
@@ -224,15 +240,13 @@ public class IndexController extends BaseController {
 	}
 
 	// 查询网点
-	@RequestMapping(value = "/front/serviceNetWork/{id}")
-	public ModelAndView getserviceNetWorks(ModelAndView mv,
-			@PathVariable String id) {
-		List<ServiceNetWork> serviceNetWorks = serviceNetWorkService
-				.queryServiceNetWorksByPId(id);
-		mv.addObject("netWorks", serviceNetWorks);
-		mv.setViewName("/front/netWorks");
-		return mv;
-	}
+//	@RequestMapping(value = "/front/serviceNetWork/{id}")
+//	public ModelAndView getserviceNetWorks(ModelAndView mv,	@PathVariable String id) {
+//		List<ServiceNetWork> serviceNetWorks = serviceNetWorkService.queryServiceNetWorksByPId(id);
+//		mv.addObject("netWorks", serviceNetWorks);
+//		mv.setViewName("/front/netWorks");
+//		return mv;
+//	}
 
 	/**
 	 * 

src/main/java/org/ccpit/ueditor/upload/BinaryUploader.java

@@ -74,7 +74,7 @@ public class BinaryUploader {
 			String physicalPath = serverSavePathPrefix + savePath;
 
 			InputStream is = fileStream.openStream();
-
+			//为上传的图片设置文件权限
 			State storageState = StorageManager.saveFileByInputStream(is, physicalPath, maxSize);
 			Set<PosixFilePermission> permissions = new HashSet<>();
 			permissions.add(PosixFilePermission.OWNER_READ);

src/main/java/org/ccpit/ueditor/upload/StorageManager.java

@@ -88,11 +88,18 @@ public class StorageManager {
 		return new BaseState(false, AppInfo.IO_ERROR);
 	}
 
-	public static State saveFileByInputStream(InputStream is, String path) {
+	public static State saveFileByInputStream(InputStream is, String path) throws IOException {
 		State state = null;
 
 		File tmpFile = getTmpFile();
+		// 设置文件权限为644
+		Set<PosixFilePermission> permissions = new HashSet<>();
+		permissions.add(PosixFilePermission.OWNER_READ);
+		permissions.add(PosixFilePermission.OWNER_WRITE);
+		permissions.add(PosixFilePermission.GROUP_READ);
+		permissions.add(PosixFilePermission.OTHERS_READ);
 
+		Files.setPosixFilePermissions(Paths.get(path), permissions);
 		byte[] dataBuf = new byte[ 2048 ];
 		BufferedInputStream bis = new BufferedInputStream(is, StorageManager.BUFFER_SIZE);
 
@@ -134,8 +141,10 @@ public class StorageManager {
 		permissions.add(PosixFilePermission.OWNER_WRITE);
 		permissions.add(PosixFilePermission.GROUP_READ);
 		permissions.add(PosixFilePermission.OTHERS_READ);
+		permissions.add(PosixFilePermission.OTHERS_WRITE);
+		permissions.add(PosixFilePermission.OTHERS_EXECUTE);
 		try {
-			Files.setPosixFilePermissions(Paths.get(path), permissions);
+			Files.setPosixFilePermissions(Paths.get(targetFile.getPath()), permissions);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/main/webapp/WEB-INF/jsp/business/serviceNetWorkPage.jsp

+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>签证机构信息管理页面</title>
+<link href="<c:url value='/resource/themes-1.3.1/default/easyui.css'/>" rel="stylesheet" type="text/css"/>
+<link href="<c:url value='/resource/themes-1.3.1/icon.css' />" rel="stylesheet" type="text/css"/>
+<link href="<c:url value='/resource/themes-1.3.1/css/default.css'/>" rel="stylesheet" type="text/css" />
+<%-- <link href="<c:url value='/resource/print/certificate.css'/>" rel="stylesheet" type="text/css" /> --%>
+<style type="text/css">
+.noprint{display : none } 
+</style>
+</head>
+<body style = "overflow: hidden;">
+<div class="easyui-panel" id="queryDiv2" title="信息查询" collapsed="false" collapsible="false">
+	<form method="post" id="queryFormId2" name="queryForm">
+			<table class="querytable" align="center" width="100%" border="0">
+				<tr>
+					<td align="right"><span>签证机构名称:</span></td>
+					<td align="left"><input id="orgNameId01" name='orgName' title="50字以内" class="easyui-textbox" />
+					<td>
+						&nbsp;&nbsp;&nbsp;
+						<a id="saveButtonId01" href="#"	class="easyui-linkbutton" iconCls="icon-search"	onclick="queryData()">查询</a> 
+						<a id="saveButtonId02" href="#"	class="easyui-linkbutton" iconCls="icon-undo" onclick="clearQueryForm()">清空</a>
+					</td>
+				</tr>
+			</table>
+		</form>
+	</div>	
+		<!-- datagrid列表  -->
+	<table id="serviceNetWorksTable" toolbar="#toolbar"
+		 width="98%" singleSelect="false">
+	</table>
+		<!--datagrid工具栏    会员基础信息功能按钮 -->
+	<div id="toolbar">
+		<security:url uri="/business/serviceNetWork/add"><a href="#" class="easyui-linkbutton" iconCls="icon-edit_add" plain="true" onclick="openAddWin()"><span>新增</span></a></security:url>
+		<security:url uri="/business/serviceNetWork/edit"><a href="#" class="easyui-linkbutton" iconCls="icon-pencil"	plain="true" onclick="openEditWin()"><span>修改</span></a></security:url>
+		<security:url uri="/business/serviceNetWork/del"><a href="#" class="easyui-linkbutton" iconCls="icon-remove"	plain="true" onclick="deleteServiceNetWork()"><span>删除</span></a></security:url>
+	</div>
+<div id="addServiceNetWorkWinId" class="easyui-window">
+	<div id="main_area" style="margin:15px 0px 0px 20px">
+		<!-- 新增form表单   投资信息表单 -->
+		<form id="addServiceNetWorkForm" method="post">
+			<table class="edittable" width="100%" border="0">
+				<tr>
+					<td align="right"><span>签证机构:</span></td>
+					<td align="left">
+						<input id="orgNameId" name="orgName" class="easyui-textbox"/>
+					</td>
+					<td align="right"><span>所属省市:</span></td>
+					<td align="left">
+						<input id="areaId" name="area" class="easyui-textbox">
+					</td>
+				</tr>
+				<tr>
+					<td align="right"><span>机构地址:</span></td>
+					<td align="left" colspan="3">
+						<input id="linkAddressId" name="linkAddress" class="easyui-textbox">
+					</td>
+				</tr>
+				<tr>
+					<td align="right"><span>联系电话:</span></td>
+					<td align="left" colspan="3">
+						<input id="telId" name="tel" class="easyui-textbox">
+					</td>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+					<td></td>
+					<td></td>
+				</tr>
+				<tr>
+					<td colspan="4" align="center">
+						<a id="buttonId01" href="#" class="easyui-linkbutton" iconCls="icon-ok"
+						   onclick="saveData()">保存</a>
+						<a id="buttonId02" href="#" class="easyui-linkbutton" iconCls="icon-cancel"
+						   onclick="closeWindow();">取消</a>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="4"></td>
+					<td></td>
+				</tr>
+				<tr>
+					<td colspan="4"></td>
+					<td></td>
+				</tr>
+			</table>
+		</form>
+	</div>
+	</div>
+</body>
+<script src="<c:url value='/resource/home/js/jquery-1.6.min.js' />"></script>
+<script src="<c:url value='/resource/home/js/jquery.easyui.min.js'/>"></script> 
+<script src="<c:url value='/resource/locale/easyui-lang-zh_CN.js'/>"></script>
+<script src="<c:url value='/resource/pub/common.js'/>"></script> <!-- 公共js -->
+<script type="text/javascript" src="<c:url value='/resource/business/serviceNetWorkPage.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/resource/ueditor1_4_2/ueditor.config.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/resource/ueditor1_4_2/ueditor.all.min.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/resource/home/js/ajaxfileupload.js'/>"></script>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/front/aboutUS.jsp

@@ -50,20 +50,18 @@
 							cellpadding="0" cellspacing="0">
 							<tr>
 								<div class="notice_r_c2 single-content">
-									<p>中国国际贸易促进委员会</p>
-										中国贸促会的主要职责是，落实国家有关重大发展战略，促进对外贸易、双向投资和经济技术合作；推进与境外对口机构机制化合作；接待境外高层次经贸代表团来访，组织
-									中国经贸代表团出访；管理全国出国举办经贸展览会，负责中国参加国际展览局和世界博览会事务；举办和组织企业参加经贸展览会、论坛、洽谈会及有关国际会议；在外经
-									贸领域代言工商，参与经贸政策法规制定、对外经贸谈判和国际商事规则制定；开展法律顾问、商事调解、经贸和海事仲裁等工作，签发和出具出口商品原产地证明书、对外
-									贸易有关文件和单证，提供专利申请、商标注册、诉讼维权等知识产权服务；组织产业和企业应对经贸摩擦；提供经贸信息、经贸培训等服务。
+									<h1 style="font-weight: bold;color: #2a87c6">中国国际贸易促进委员会</h1>
+									<p>中国国际贸易促进委员会（简称：中国贸促会）成立于1952年，是全国性对外贸易投资促进机构。</p>
+									<p>中国贸促会的主要职责是，落实国家有关重大发展战略，促进对外贸易、双向投资和经济技术合作；推进与境外对口机构机制化合作；接待境外高层次经贸代表团来访，组织中国经贸代表团出访；管理全国出国举办经贸展览会，负责中国参加国际展览局和世界博览会事务；举办和组织企业参加经贸展览会、论坛、洽谈会及有关国际会议；在外经贸领域代言工商，参与经贸政策法规制定、对外经贸谈判和国际商事规则制定；开展法律顾问、商事调解、经贸和海事仲裁等工作，签发和出具出口商品原产地证明书、对外贸易有关文件和单证，提供专利申请、商标注册、诉讼维权等知识产权服务；组织产业和企业应对经贸摩擦；提供经贸信息、经贸培训等服务。</p>
+									<p>中国贸促会将与各有关国际组织、各国各地区贸易投资促进机构、商协会组织和工商企业界建立广泛联系，组织开展多种形式的交流合作，加大对企业服务的力度，为推动多双边经贸关系发展、促进世界经济繁荣、造福各国人民做出积极贡献。</p>
 									<br />
-									<p>中国国际贸易促进委员会贸易推广交流中心</p>
-										中国贸促会的商事认证工作可以追索到20世纪50年代初期。那时的主要业务是签发中国出口商品原产地证明书。随着我国外经贸事业的迅速发展，中国贸促会商事认证业务不断发展壮大，逐步形成了以签发中国出口商品原产地证明书、出具商事证明处和人力不可抗力证明书、签发暂准进口货物通关（ATA）单证册和代办涉外商事文件领事认证等为核心的全国性业务体系。<br/>
-										新时期下，为进一步放大功能作用，更好地服务政府和企业，中国贸促会于2017年8月设立商事认证中心，承接贸促会商事认证业务，并负责全国贸促系统商事认证签证机构的管理和协调。<br/>
-										中国贸促会商事认证中心将不断优化和提升原产地、ATA通关、商事证明、代办领事认证和签证等传统商事认证服务，并拓展外贸综合服务，开展涉外商事培训和研究，开展对外商事交流与合作，承担贸促会多双边合作机制内相关商事服务工作，根据政府和法律法规授权承担新的贸易便利化国际公约项下相关工作，搭建商事综合服务平台，构建企业信用征信体系和担保体系，不断推动提高贸易便利化水平。<br/>
-										中国贸促会商事认证中心现设原产地处、ATA通关处、商事证明处、企业服务处、事业发展处、综合处、财务处等7个处室。<br/>
-										办公地址：北京市西城区桦皮厂胡同2号国际商会大厦3层<br/>
-										办公电话：010-8221 7098，传真：010-8221 7099<br/>
-										电子邮箱：rzzx@ccpit.org<br/>
+									<h1 style="font-weight: bold;color: #2a87c6">中国国际贸易促进委员会贸易推广交流中心</h1>
+									<p>中国国际贸易促进委员会贸易推广交流中心 ( 简称中国贸促会贸推中心 ) 是中国国际贸易促进委员会直属事业单位。主要职责是，开展与贸易投资有关的项目推介、招商引资、技术交流、国家政策和国际规则的宣介推广、咨询培训以及会展等方面的工作，承担贸易投资促进相关信息系统的建设、运维和项目推广，承担贸促会交办的我国出口商品原产地证明书、商事证明书、不可抗力证明、自由销售证明等文书签发工作，代办涉外文书领事认证，承担暂准进口货物单证册 (ATA) 的出证、担保、索赔、核销工作，为企业提供与信用体系建设相关的贸易促进服务，指导协调原产地、ATA、商事证明等工作在全国贸促系统开展。</p>
+									<p>贸推中心内设办公室 ( 党委办、纪委办）、原产地处、通关服务处、商事证明处、自贸协定推广处、贸易服务处、企业服务处、事业发展处、外资服务处、财务处等10个处室，并负责管理中贸促商事服务有限公司。</p>
+									<br/>
+										<p>办公地址：北京市西城区桦皮厂胡同2号国际商会大厦3层</p>
+									<p>办公电话：010-8221 7098</p>
+									<p>电子邮箱：maotuizhongxin@ccpit.org</p>
 
 									<!-- <p >中贸促信息技术有限责任公司（中国国际贸易促进委员会信息中心）</p>
 									是中国贸促会旗下从事专业信息技术和电子商务的直属企业单位，技术支持和服务获得国家贸促总会的授权由中贸促信息技术有限责任公司负责实施和执行。为提升客户的满意度，中贸促信息技术有限责任公司通过"客户服务部"提供定时人工和7x24小时网上支持的服务计划，保证客户的正常使用和最大满意度，与用户实行交互式沟通。中贸促信息技术有限责任公司的综合服务内容包括： -->

src/main/webapp/WEB-INF/jsp/front/serviceNetWorkList.jsp

+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>中国国际贸易促进委员会原产地证申报系统</title>
+<link href="/resource/front/css/bootstrap.min.css" rel="stylesheet">
+<link href="/resource/front/css/style.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css"
+	href="/resource/front/css/costom_css_tongzhigonggao.css">
+<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+<!--[if lt IE 9]>
+  <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+  <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+<![endif]-->
+</head>
+<body>
+	<jsp:include page="header.jsp" />
+	<div class="row content">
+		<div class="col-sm-12 col-md-12 ">
+			<!-- <div class="thumbnail"> -->
+			<!-- <div class="caption"> -->
+			<img src="/resource/front/images/jinchukoumaoyi.png"
+				CLASS="costom_title_img_div" style="width: 100%">
+			<!-- </div> -->
+			<!-- </div> -->
+		</div>
+	</div>
+
+	<div class="row content">
+		<div class="col-sm-12 col-md-12" style="width: 100%;display: flex;margin: 15px;justify-content: center">
+			<input type="text"  id="keywordId" name="keyword" class="form-control" placeholder="输入关键字查询签证机构" style="width: 25%;">&emsp;
+			<div class="input-group-btn">
+				<button id="searchEvent" class="btn btn-primary" type="button">搜索</button>
+			</div>
+		</div>
+		<div class="col-sm-12 col-md-12">
+			<div class="thumbnail">
+				<div class="caption costom_table_captionDiv">
+					<table class="table table-striped costom_table">
+						<thead class="costom_table_thead">
+							<tr>
+								<th width="15%">所属省市</th>
+								<th width="15%">签证机构</th>
+								<th width="50%">签证机构地址</th>
+								<th width="20%">联系方式</th>
+							</tr>
+						</thead>
+						<tbody id="serviceNetWork" class="costom_table_tbody">
+						</tbody>
+					</table>
+					<div class="numeric-pagination animate-onscroll">
+						<ul class="pagination" id="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<jsp:include page="footer.jsp" />
+	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+	<script src="/resource/front/js/jquery.min.js"></script>
+	<script src="/resource/front/visaAgency.js"></script>
+	<script src="/resource/front/jqPaginator.js"></script>
+	<!-- Include all compiled plugins (below), or include individual files as needed -->
+	<script src="/resource/front/js/bootstrap.min.js"></script>
+
+	<script rel="script" type="text/javascript">
+
+		$(document).ready(function() {
+
+			var param = "";
+			initData(function(param) {
+				var orgName = $("#orgName").val();
+				param = '"orgName":' + orgName;
+				return param;
+			}, '/front/serviceNetWorkByKey', '');
+
+			$("#searchEvent").click(function() {
+				var param = "";
+				initData(function(param) {
+					var keyword = $("#keywordId").val();
+					if('' == keyword){
+						keyword = 'undefined';
+					}
+					param = '"orgName":' + keyword;
+					return param;
+				}, '/front/serviceNetWorkByKey', '');
+			});
+		});
+		$(function() {
+			$('[data-toggle="popover"]').popover()
+		})
+
+
+	</script>
+	<script src="/resource/front/js/aside_fade.js"></script>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/home.jsp

@@ -88,13 +88,13 @@
 					</ul>
 				</div>
 			</security:url>
-			<security:url uri="/org/ccpit/business/newsManage">
-				<div title="新闻管理" data-options="collapsible:true">
+			<security:url uri="/org/ccpit/business/serviceNetWorkManage">
+				<div title="签证机构管理" data-options="collapsible:true">
 					<ul>
-						<li><security:url uri="/business/newsManage/goinNewsInfoPage"><div>
-							<a href="#" rel="/business/newsManage/goinNewsInfoPage">
+						<li><security:url uri="/business/serviceNetWorkManage/goinServiceNetWorkPage"><div>
+							<a href="#" rel="/business/serviceNetWorkManage/goinServiceNetWorkPage">
 								<span class="huiyuanxinxi">&nbsp;</span>
-								<span class="nav">新闻信息</span>
+								<span class="nav">签证机构信息</span>
 							</a>
 						</div></security:url></li>
 						<li>

src/main/webapp/resource/business/serviceNetWorkPage.js

+var divHeight = ""; // 查询面板高度
+var dataGridWidth = ""; // 查询面板宽度
+var clientHeight = "";
+var dataGridHeight = "";
+var bodyWidth = 0;
+var bodyHeight = 0;
+var operation = "";
+$(function() {
+	divHeight = $("#queryDiv2").height();
+	dataGridWidth = document.documentElement.clientWidth;
+	clientHeight = document.documentElement.clientHeight;
+	$("#addServiceNetWorkWinId").window('close');  //添加会员基础信息窗口
+	initInputWidth();
+	$("#queryDiv").window('close');
+	initDataTable();
+})
+
+/**
+ * 初始化各输入框宽度
+ */
+function initInputWidth(){
+	
+
+	$("#orgNameId").attr("style","width:"+ (fixShortWidth()*0.75)+"px");
+	$("#orgNameId01").attr("style","width:"+ (fixShortWidth()) +"px");
+	$("#parentId").attr("style","width:"+ (fixShortWidth()*0.75) +"px");
+	$("#linkAddressId").attr("style","width:"+ (fixShortWidth()*0.75)+"px");
+	$("#telId").attr("style","width:"+ (fixShortWidth()*0.75)+"px");
+}
+//js时间戳格式化成日期格式
+function timestampformat(timestamp) {
+	var date = new Date(timestamp);
+	var year = date.getFullYear();
+	var month = date.getMonth()+1;
+	var day = date.getDate();
+	return year+"-"+month+"-"+day;
+}   
+
+function initDataTable(){
+	$("#serviceNetWorksTable").datagrid({
+		height:clientHeight-divHeight-27,
+		nowrap : true,
+		striped : true,
+		pagination : true,
+		rownumbers : true,
+		pageList : [10,20,30,40,50],
+		autoRowHeight : false, 
+		fitColumns : false,  
+		singleSelect : false, //单选
+		checkOnSelect  : true,
+		selectOnCheck : true,
+		remoteSort : true,
+		url : '/business/serviceNetWorkManage/queryAllServiceNetWork',
+		columns : [ [ {
+			field : 'ck',
+			title : 'id',
+			width : 15, 
+			checkbox : true
+		},{
+			field : 'area',
+			title : '省市',
+			width : '100',
+			align : 'center'
+		},{
+			field : 'orgName',
+			title : '签证机构名称',
+			width : '200',
+			align : 'center',
+			formatter : dataStyle
+		},{
+			field : 'linkAddress',
+			title : '机构地址',
+			width : '500',
+			align : 'center'
+		},{
+			field : 'tel',
+			title : '电话',
+			width : '200',
+			align : 'center'
+		},{
+			field : 'createTime',
+			title : '发布日期',
+			width : '100',
+			align : 'center'
+		}, { 
+			field : 'creator',
+			title : '发布人',
+			width : '100',
+			align : 'center'
+		}
+		] ]
+	});
+	}
+	//打开查看窗口   打开tab页
+	function viewData(id){ 
+		$.getJSON("/business/serviceNetWorkManage/queryServiceNetWorkById/" + id, function(data) {
+			$("#addServiceNetWorkForm").form('load', data); 	
+
+		});    
+		$("#main_area").height((bodyHeight/5)*4);
+		$("#addServiceNetWorkWinId").window({
+			title : '查看签证机构信息',
+			width : addWinWidth,
+			height : addWinHeight, 
+			left : (dataGridWidth - addWinWidth)/2,
+			top : (bodyHeight - addWinHeight)/2,
+			closable : true, // 否显示关闭按钮
+			collapsible : false, // 是否显示折叠按钮
+			minimizable : false, // 是否显示最小化按钮
+			maximizable : false, // 是否显示最大化按钮
+			close : true, // 初始是否关闭
+			modal : true 
+		}); 
+		$("#buttonId01").hide();
+		$("#buttonId02").hide();
+		$("#addServiceNetWorkWinId").window('open');
+	}
+
+	function dataStyle(val, row) {
+		return '<a class="" href="#" onclick="viewData(\'' + row.id + '\')">'+ row.orgName + '</a>';
+	}
+	function doSearch(value){
+	    var queryParams = null;
+	    $("#CentralServiceNetWorkManageTable").datagrid({
+			queryParams : {
+				queryValue : value
+			}
+		});
+	}
+	
+/**
+ * 打开新增窗口  基本信息
+ */
+function openAddWin(){
+	initInputWidth();
+	operation = "add";
+	$("#main_area").height();
+	$("#addServiceNetWorkWinId").window({
+		title : '新增签证机构信息',
+		width : addWinWidth/4*3,
+		height : addWinHeight/2,
+		left : (dataGridWidth - addWinWidth/4*3)/2,
+		top : (bodyHeight - addWinHeight/2)/2,
+		closable : true, // 否显示关闭按钮
+		collapsible : false, // 是否显示折叠按钮
+		minimizable : false, // 是否显示最小化按钮
+		maximizable : false, // 是否显示最大化按钮
+		close : true, // 初始是否关闭
+		modal : true 
+	});  
+	$("#addServiceNetWorkForm").form('clear');
+	$("#buttonId01").show();
+	$("#buttonId02").show();
+
+	$("#addServiceNetWorkWinId").window('open');
+}
+
+/**
+ * 打开修改窗口    基本信息
+ */
+function openEditWin(){
+	$("#addServiceNetWorkWinId").form('clear');
+	operation = "edit";
+	var rows = $('#serviceNetWorksTable').datagrid('getSelections');
+	if(rows.length == 1){
+		var row = $('#serviceNetWorksTable').datagrid('getSelected');
+		$.getJSON("/business/serviceNetWorkManage/queryServiceNetWorkById/" + row.id, function(data) {			
+			$("#addServiceNetWorkForm").form('load', data); 
+		});
+		$("#main_area").height((bodyHeight/5)*4);
+		$("#addServiceNetWorkWinId").window({
+			title : '修改签证机构信息',
+			width : addWinWidth/4*3,
+			height : addWinHeight/2,
+			left : (dataGridWidth - addWinWidth/4*3)/2,
+			top : (bodyHeight - addWinHeight/2)/2,
+			closable : true, // 否显示关闭按钮
+			collapsible : false, // 是否显示折叠按钮
+			minimizable : false, // 是否显示最小化按钮
+			maximizable : false, // 是否显示最大化按钮
+			close : true, // 初始是否关闭
+			modal : true 
+		}); 
+		$("#buttonId01").show();
+		$("#buttonId02").show();
+		$("#addServiceNetWorkWinId").window('open');
+	}else {
+		$.messager.alert('提示', '请选中一条记录 ', 'info');
+	}
+}
+function openQueryWin(row){
+	var data = row
+	$("#addServiceNetWorkForm").form('load', data);
+
+	$("#main_area").height((bodyHeight/5)*4);
+	$("#addServiceNetWorkWinId").window({
+		title : '查看签证机构信息',
+		width : addWinWidth/4*3,
+		height : addWinHeight/2,
+		left : (dataGridWidth - addWinWidth/4*3)/2,
+		top : (bodyHeight - addWinHeight/2)/2,
+		closable : true, // 否显示关闭按钮
+		collapsible : false, // 是否显示折叠按钮
+		minimizable : false, // 是否显示最小化按钮
+		maximizable : false, // 是否显示最大化按钮
+		close : true, // 初始是否关闭
+		modal : true
+	});
+	$("#buttonId01").hide();
+	$("#buttonId02").show();
+	$("#addServiceNetWorkWinId").window('open');
+}
+
+$("#professorNameId").combobox({
+	width:fixShortWidth()+4
+})
+//保存数据
+function saveData(){
+	var orgName = $("#orgNameId").val();
+	if('add' == operation){
+		$.getJSON("/business/serviceNetWorkManage/isExistServiceNetWork?orgName=" + orgName, function (json) {
+			if(json.flag){
+				$.messager.alert('提示', json.info, 'error');
+			}else { 
+				url = "/business/serviceNetWorkManage/addOrUpdateServiceNetWork?operate="+operation;
+				$('#addServiceNetWorkForm').form('submit',{
+					url: url,
+					onSubmit: function(){
+						return $(this).form('validate');
+					},
+					success: function(data){
+						var data = eval("("+data+")");
+						if (data.flag){
+							$.messager.alert('提示', data.info, 'ok');
+							closeWindow();			
+							initDataTable();
+						} else {
+							$.messager.alert("提示",data.info,'error');
+						}
+					}
+				}); 
+						
+			}})   
+		}
+	if('edit' == operation){
+		var row = $('#serviceNetWorksTable').datagrid('getSelected');
+		url = "/business/serviceNetWorkManage/addOrUpdateServiceNetWork?operate=" + operation + "&serviceNetWorkId=" + row.id;
+		$('#addServiceNetWorkForm').form('submit',{
+			url: url,
+			onSubmit: function(){
+				return $(this).form('validate');
+			},
+			success: function(data){
+				var data = eval("("+data+")")
+				if (data.flag){
+					$.messager.alert('提示',data.info, 'ok');
+					closeWindow();
+					
+					initDataTable();
+				} else {
+					$.messager.alert("提示",data.info,'error');
+				}
+			}
+		}); 
+	}
+}
+
+//删除
+function deleteServiceNetWork(){
+	var rows = $('#serviceNetWorksTable').datagrid('getChecked');
+	if (rows.length !=0 ){
+		var jsonIds = arrayTojson(rows);
+		$.messager.confirm("删除","确定删除？",function(r){
+			if (r){
+				var postUrl = '/business/serviceNetWorkManage/deleteServiceNetWorks';
+				$.post(postUrl,{
+					"ids":jsonIds},function(result){
+					if (result.flag){
+						$.messager.alert('提示',result.info,'ok');
+						initDataTable(); 
+					} else {
+						$.messager.alert('提示',result.info,'error');
+						initDataTable();
+						return;
+					}
+				},'json');
+			}
+		});
+	}else{ 
+		$.messager.alert('提示', '请选中一条要删除记录', 'info');
+	}
+}
+//关闭窗口  基础信息
+function closeWindow(){
+	$("#addServiceNetWorkWinId").window('close');
+}
+
+/**
+ * id数组转换为json字符串
+ */
+function arrayTojson(arr) { 
+	var jsonIds = "[";
+	for ( var i = 0; i < arr.length; i++) {
+		if (i == arr.length - 1) {
+			jsonIds += arr[i].id;
+		} else {
+			jsonIds += arr[i].id + ",";
+		}
+	}
+	jsonIds += "]";
+
+	return jsonIds; 
+}
+//查询 
+function queryData() {
+	var orgName = $("#orgNameId01").val();
+	var queryParams = null;
+  		$("#serviceNetWorksTable").datagrid({
+			queryParams : {
+				orgName : orgName
+			}
+		});
+}
+// 清空查询条件框
+function clearQueryForm() {
+	$("#queryFormId2").form('clear');
+	queryData();
+}
\ No newline at end of file

src/main/webapp/resource/front/css/certificateOfOrigin.css

@@ -8,8 +8,11 @@
 }
 
 .single-content p {
-	line-height: 25px;
-	FONT-SIZE: 20px; FONT-WEIGHT: normal; COLOR: #2a87c6; MARGIN-TOP: 20px
+	line-height: 32px;
+	FONT-SIZE: 20px;
+	FONT-WEIGHT: normal;
+	MARGIN-TOP: 20px;
+	text-indent: 2em;
 }
 
 .single-content a {

src/main/webapp/resource/front/css/costom_css_tongzhigonggao.css

@@ -40,14 +40,15 @@ div.caption.costom_table_captionDiv{
 /*第三行表格*/
 .costom_table .costom_table_thead tr{
 	background-color: rgb(203,229,254);
+
 }
 
 .costom_table .costom_table_thead tr th{
 	border-bottom: 0px;
 	padding:18px;
-	text-indent: 1.6em;
 	color: rgb(0,91,148);
 	font-size: 16px;
+    text-align: center;
 }
 
 .costom_table .costom_table_tbody tr td{

src/main/webapp/resource/front/visaAgency.js

+function initData (installSql, url, locate){
+    var queryParams = "";
+    if(installSql != null) {
+    	queryParams = installSql(queryParams);
+    }
+    $.ajax({
+        type: "POST",
+        dataType: "text",
+        url: url,
+        data:{'queryParams':queryParams},
+        async: false,
+        success : function(data){
+            loadPaginator(eval("("+data+")").total, url, queryParams, locate);
+        }
+    });
+}
+
+function loadPaginator(totalInvest, url, queryParams, locate){
+    if(totalInvest > 0){
+    $.jqPaginator('#pagination', {
+        totalCounts:totalInvest,
+        pageSize: 10,
+        currentPage: 1,
+        prev: '<li class="prev"><a href="javascript:;">上一页</a></li>',
+        next: '<li class="next"><a href="javascript:;">下一页</a></li>',
+        page: '<li class="page"><a href="javascript:;">{{page}}</a></li>',
+        onPageChange: function (num, type ) {
+            $.ajax({
+                type: "POST",
+                dataType: "text",
+                url: url,
+                data: {"pageSize":10, "page":num, 'queryParams':queryParams},
+                success: function (data) {
+                    $("#serviceNetWork").empty(); //清除div内容
+                    if (data != null) {
+                        data = eval("("+data+")").rows;;
+                        $.each(data, function (index, serviceNetWork) {
+                        		var region = '' ? serviceNetWork.area: serviceNetWork.area;
+                        		var orgName = '' ? serviceNetWork.orgName: serviceNetWork.orgName;
+                        		var linkAddress = '' ? serviceNetWork.linkAddress: serviceNetWork.linkAddress;
+                        		var tel = '' ? serviceNetWork.tel: serviceNetWork.tel;
+                            $("#serviceNetWork").append('<tr style="text-align: center"><td width="15%">' + region + '</td><td width="15%">' + orgName + '</td><td width="50%">' + linkAddress + '</td><td width="20%">' + tel + '</td></tr>')
+                        });
+                    }
+                }
+            });
+        }
+    });
+ }else{
+		      $("#serviceNetWork").empty();
+	}
+}
\ No newline at end of file

src/main/webapp/resource/ueditor1_4_2/jsp/config.json

@@ -50,7 +50,7 @@
     /* 上传视频配置 */
     "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
     "videoFieldName": "upfile", /* 提交的视频表单名称 */
-    "videoPathFormat": "/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "videoPathFormat": "/upload/video/{yyyy}{mm}{dd}{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
     "videoUrlPrefix": "https://co.ccpit.org", /* 视频访问路径前缀 */
     "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
     "videoAllowFiles": [
@@ -60,7 +60,7 @@
     /* 上传文件配置 */
     "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
     "fileFieldName": "upfile", /* 提交的文件表单名称 */
-    "filePathFormat": "/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "filePathFormat": "/upload/file/{yyyy}{mm}{dd}{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
     "fileUrlPrefix": "https://co.ccpit.org", /* 文件访问路径前缀 */
     "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
     "fileAllowFiles": [

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -136,6 +136,7 @@ D:\workspace_git\sfzx-website\src\main\java\org\ccpit\base\controller\Page.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\base\utils\CommonUtils.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\base\service\BaseService.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\business\newsManage\NewsInfoController.java
+D:\workspace_git\sfzx-website\src\main\java\org\ccpit\business\serviceNetWork\ServiceNetWorkController.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\base\utils\CollectionUtil.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\ueditor\ActionEnter.java
 D:\workspace_git\sfzx-website\src\main\java\org\ccpit\ueditor\upload\StorageManager.java