显示修改

src/main/java/com/jeeplus/common/utils/DateUtils.java

@@ -202,7 +202,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static String long2string(long ldate){
 		SimpleDateFormat sdf= new SimpleDateFormat(DEFAULT_PATTERN);
 		//前面的ldate是秒数，先乘1000得到毫秒数，再转为java.util.Date类型
-		java.util.Date dt = new Date(ldate * 1000);  
+		Date dt = new Date(ldate * 1000);
 		String sDateTime = sdf.format(dt);  //得到精确到秒的表示
 		if(sDateTime.endsWith("00:00:00")){
 			sDateTime = sDateTime.substring(0,10);

src/main/java/com/jeeplus/common/utils/MyBeanUtils.java

@@ -83,7 +83,7 @@ public class MyBeanUtils
                       Object value = PropertyUtils.getSimpleProperty(orig, name);
                       getInstance().setSimpleProperty(dest, name, value);
                   }
-                  catch (java.lang.IllegalArgumentException ie) {
+                  catch (IllegalArgumentException ie) {
                       ; // Should not happen
                   }
                   catch (Exception e) {
@@ -122,7 +122,7 @@ public class MyBeanUtils
                 	  getInstance().setSimpleProperty(tobean, name, value);
                   }
               }
-              catch (java.lang.IllegalArgumentException ie) {
+              catch (IllegalArgumentException ie) {
                   ; // Should not happen
               }
               catch (Exception e) {

src/main/java/com/jeeplus/core/persistence/BaseMapper.java

@@ -3,11 +3,15 @@
  */
 package com.jeeplus.core.persistence;
 
-import org.apache.ibatis.annotations.*;
-
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Update;
+
 /**
  * DAO支持类实现
  * @author jeeplus
@@ -39,7 +43,7 @@ public interface BaseMapper<T> {
 	 */
 	public  T findUniqueByProperty(@Param(value = "propertyName") String propertyName, @Param(value = "value") Object value);
 
-
+	
 	/**
 	 * 查询数据列表，如果需要分页，请设置分页对象，如：entity.setPage(new Page<T>());
 	 * @param entity
@@ -48,14 +52,14 @@ public interface BaseMapper<T> {
 	public List<T> findList(T entity);
 
 	public List<T> findListBy(List<T> entity);
-
+	
 	/**
 	 * 查询所有数据列表
 	 * @param entity
 	 * @return
 	 */
 	public List<T> findAllList(T entity);
-
+	
 	/**
 	 * 查询所有数据列表
 	 * @see public List<T> findAllList(T entity)
@@ -63,21 +67,21 @@ public interface BaseMapper<T> {
 	 */
 	@Deprecated
 	public List<T> findAllList();
-
+	
 	/**
 	 * 插入数据
 	 * @param entity
 	 * @return
 	 */
 	public int insert(T entity);
-
+	
 	/**
 	 * 更新数据
 	 * @param entity
 	 * @return
 	 */
 	public int update(T entity);
-
+	
 	/**
 	 * 删除数据（物理删除，从数据库中彻底删除）
 	 * @param id
@@ -86,7 +90,7 @@ public interface BaseMapper<T> {
 	 */
 	@Deprecated
 	public int delete(String id);
-
+	
 	/**
 	 * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
 	 * @param id
@@ -95,21 +99,21 @@ public interface BaseMapper<T> {
 	 */
 	@Deprecated
 	public int deleteByLogic(String id);
-
+	
 	/**
 	 * 删除数据（物理删除，从数据库中彻底删除）
 	 * @param entity
 	 * @return
 	 */
 	public int delete(T entity);
-
+	
 	/**
 	 * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
 	 * @param entity
 	 * @return
 	 */
 	public int deleteByLogic(T entity);
-
+	
 	@Select("${sql}")
 	public List<Map<String, Object>>  execSelectSql(@Param(value = "sql") String sql);
 

src/main/java/com/jeeplus/core/persistence/Page.java

@@ -39,7 +39,7 @@ public class Page<T> {
 
 	protected int length = 8;// 显示页面长度
 	protected int slider = 1;// 前后显示页面长度
-	
+
 	private List<T> list = new ArrayList<T>();
 	
 	private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc
@@ -135,6 +135,8 @@ public class Page<T> {
 		this.pageSize = pageSize;
 		this.list = list;
 	}
+
+
 	
 	/**
 	 * 初始化参数

src/main/java/com/jeeplus/core/persistence/interceptor/SQLHelper.java

@@ -44,7 +44,7 @@ public class SQLHelper {
      * @param mappedStatement MappedStatement
      * @param boundSql        SQL
      * @param parameterObject 参数对象
-     * @throws java.sql.SQLException 数据库异常
+     * @throws SQLException 数据库异常
      */
     @SuppressWarnings("unchecked")
     public static void setParameters(PreparedStatement ps, MappedStatement mappedStatement, BoundSql boundSql, Object parameterObject) throws SQLException {

src/main/java/com/jeeplus/core/service/CrudService.java

@@ -3,16 +3,17 @@
  */
 package com.jeeplus.core.service;
 
-import com.jeeplus.core.persistence.BaseMapper;
-import com.jeeplus.core.persistence.DataEntity;
-import com.jeeplus.core.persistence.Page;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.DataEntity;
+import com.jeeplus.core.persistence.Page;
+
 /**
  * Service基类
  * @author jeeplus

src/main/java/com/jeeplus/core/web/BaseController.java

@@ -237,6 +237,12 @@ public abstract class BaseController {
 		map.put("total", page.getCount());
 		return map;
 	}
+
+	public <T> Map<String, Object> getBootstrapData(List<T> page){
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("total", page.size());
+		return map;
+	}
 	
 	
 }

src/main/java/com/jeeplus/modules/sg/information/mapper/InformationMapper.java

@@ -44,4 +44,6 @@ public interface InformationMapper extends BaseMapper<Information> {
     List<Information> exportInfor(List<Information> list);
 
     List<Information> export(List<Information> list);
+
+    List<Information> findIdByList(List<Information> list);
 }

src/main/java/com/jeeplus/modules/sg/information/mapper/xml/InformationMapper.xml

@@ -475,5 +475,33 @@
 
 	</select>
 
-
+	<select id="findIdByList" resultType="com.jeeplus.modules.sg.information.entity.Information">
+		SELECT
+		a.project_Id
+		FROM project_information as a
+		<where>
+			1=1
+			<foreach collection="list" item="items" index="index">
+				<if test="items.projectId != null and items.projectId != ''">
+					AND a.project_Id = #{items.projectId}
+				</if>
+				<if test="items.projectName != null and items.projectName != ''">
+					AND a.project_Name LIKE
+					concat('%',#{items.projectName},'%')
+				</if>
+				<if test="items.department != null and items.department != ''">
+					AND a.department = #{items.department}
+				</if>
+				<if test="items.secondUnits != null and items.secondUnits != '' ">
+					AND a.second_Units=#{items.secondUnits}
+				</if>
+				<if test="items.firstUnits != null and items.firstUnits != '' ">
+					AND a.first_Units=#{items.firstUnits}
+				</if>
+				<if test="items.projectType !=null and items.projectType != ''">
+					and a.project_type = #{items.projectType}
+				</if>
+			</foreach>
+		</where>
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/information/service/InformationService.java

@@ -225,4 +225,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 
 		return export;
 	}
+
+	public List<Information> findIdByList(List<Information> list) {
+		return informationMapper.findIdByList(list);
+	}
 }

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -270,6 +270,8 @@ public  class ImportInformation {
     }
 
 
+
+    //导入原因类型
     public static Map<String,Object> btnInReason(ImportExcel ei,int lastDataRowNum) {
         HashMap<String,Object> hashMap = new HashMap<String,Object>();
         List<Material> materialList = new ArrayList<>();
@@ -299,7 +301,7 @@ public  class ImportInformation {
                     material.setInforId(inforId.toString());
                     material.setStatus(status.toString());
                     if (info == null || info.equals("")) {
-                         infoW = "";
+                         infoW =" ";
                     } else {
                          infoW = info.toString();
                     }

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -243,6 +243,7 @@ public class InformationController extends BaseController {
 		return getBootstrapData(page);
 		}
 
+	//导出导出word
 	@ResponseBody
 	@RequestMapping(value = "btnInReason")
 	public AjaxJson btnInReason(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -409,7 +410,6 @@ public class InformationController extends BaseController {
 		String projectYear = "";
 		String firstUnits = "";
 		String secondUnits = "";
-
 		try {
 			projectId = request.getParameter("projectId");
 			projectName = request.getParameter("projectName");
@@ -422,7 +422,6 @@ public class InformationController extends BaseController {
 			firstUnits = new String(firstUnits.getBytes("iso8859-1"),"utf-8");
 			secondUnits= request.getParameter("secondUnits");
 			secondUnits = new String(secondUnits.getBytes("iso8859-1"),"utf-8");
-
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -481,11 +480,38 @@ public class InformationController extends BaseController {
 	}
 
 
+
+	//导出word
 	@ResponseBody
 	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
 	@RequestMapping(value = "exportInformation")
 	public void exportInformation(Information information,HttpServletRequest request, HttpServletResponse response) {
+		String projectId = "";
+		String projectName = "";
+		String projectType = "";
+		String projectYear = "";
+		String firstUnits = "";
+		String secondUnits = "";
+		try {
+			projectId = request.getParameter("projectId");
+			projectName = request.getParameter("projectName");
+			projectName = new String(projectName.getBytes("iso8859-1"),"utf-8");
+			projectType = request.getParameter("projectType");
+			projectType = new String(projectType.getBytes("iso8859-1"),"utf-8");
+			projectYear = request.getParameter("projectYear");
+			projectYear = new String(projectYear.getBytes("iso8859-1"),"utf-8");
+			firstUnits= request.getParameter("firstUnits");
+			firstUnits = new String(firstUnits.getBytes("iso8859-1"),"utf-8");
+			secondUnits= request.getParameter("secondUnits");
+			secondUnits = new String(secondUnits.getBytes("iso8859-1"),"utf-8");
+
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		HttpSession session = request.getSession();
+		Object pathSession = session.getAttribute("path");
 		AjaxJson j = new AjaxJson();
+
 		StringBuilder stringBuilder = new StringBuilder();
 		Template template=null;
 		File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
@@ -500,18 +526,58 @@ public class InformationController extends BaseController {
 			e.printStackTrace();
 		}
 		Map<String,Object> data  = new HashMap<>();
-		List<Material> proId = materialService.findProId();
-		List<Information> informationList = materialService.proIdName(proId);
-		for (int i = 0; i < informationList.size(); i++) {
-			stringBuilder.append(i+1 + "." +informationList.get(i).getProjectName()+"("+informationList.get(i).getProjectId()+")");
-			Information information1 = informationList.get(i);
-			List<Material> mateial = materialService.findMateial(information1);
-			for (int k = 0; k < mateial.size(); k++) {
+		List<Information> tList = new ArrayList<>();
+		if (pathSession != null && pathSession != "") {
+			BufferedReader bufferedReader = null;
+			try {
+				bufferedReader = new BufferedReader(new FileReader(pathSession.toString()));
+				String string;
+				while ((string = bufferedReader.readLine()) != null) {
+					Information information1 = new Information();
+					information1.setProjectId(string);
+					tList.add(information1);
+				}
+				bufferedReader.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			List<Material> proId = materialService.findProId(tList);
+			List<Information> informationList = materialService.proIdName(proId);
+			for (int i = 0; i < informationList.size(); i++) {
+				stringBuilder.append(i + 1 + "." + informationList.get(i).getProjectName() + "(" + informationList.get(i).getProjectId() + ")");
+				Information information1 = informationList.get(i);
+				List<Material> mateial = materialService.findMateial(information1);
+				for (int k = 0; k < mateial.size(); k++) {
+					stringBuilder.append("<w:p></w:p>");
+					stringBuilder.append(k + 1 + "." + mateial.get(k).getMaterialName() + "(" + mateial.get(k).getInforId() + ")，出库数量为" + mateial.get(k).getOutboundNumber() + ",审定数量为" + mateial.get(k).getAuthorizedNumber() + ",由于原因" + mateial.get(k).getStatus() + ":" + mateial.get(k).getInfo() + ",已完成甲供物资领退料。");
+				}
+				stringBuilder.append("<w:p></w:p>");
 				stringBuilder.append("<w:p></w:p>");
-				stringBuilder.append(k+1 + "." +mateial.get(k).getMaterialName()+"("+mateial.get(k).getInforId()+")，出库数量为"+mateial.get(k).getOutboundNumber()+",审定数量为"+mateial.get(k).getAuthorizedNumber()+",由于原因"+mateial.get(k).getStatus()+":"+mateial.get(k).getInfo()+",已完成甲供物资领退料。");
 			}
-			stringBuilder.append("<w:p></w:p>");
-			stringBuilder.append("<w:p></w:p>");
+		} else {
+			Information infor = new Information();
+			infor.setProjectId(projectId);
+			infor.setProjectName(projectName);
+			infor.setProjectType(projectType);
+			infor.setProjectYear(projectYear);
+			infor.setFirstUnits(firstUnits);
+			infor.setSecondUnits(secondUnits);
+			tList.add(infor);
+			List<Information> idByList = informationService.findIdByList(tList);
+			List<Material> proId = materialService.findProId(idByList);
+			List<Information> informationList = materialService.proIdName(proId);
+			for (int i = 0; i < informationList.size(); i++) {
+				stringBuilder.append(i + 1 + "." + informationList.get(i).getProjectName() + "(" + informationList.get(i).getProjectId() + ")");
+				Information information1 = informationList.get(i);
+				List<Material> mateial = materialService.findMateial(information1);
+				for (int k = 0; k < mateial.size(); k++) {
+					stringBuilder.append("<w:p></w:p>");
+					stringBuilder.append(k + 1 + "." + mateial.get(k).getMaterialName() + "(" + mateial.get(k).getInforId() + ")，出库数量为" + mateial.get(k).getOutboundNumber() + ",审定数量为" + mateial.get(k).getAuthorizedNumber() + ",由于原因" + mateial.get(k).getStatus() + ":" + mateial.get(k).getInfo() + ",已完成甲供物资领退料。");
+				}
+				stringBuilder.append("<w:p></w:p>");
+				stringBuilder.append("<w:p></w:p>");
+			}
+
 		}
 		data.put("mb",stringBuilder);
 		File docFile = new File("D:/甲供物资超欠供说明.doc");

src/main/java/com/jeeplus/modules/sg/material/mapper/MaterialMapper.java

@@ -38,7 +38,7 @@ public interface MaterialMapper extends BaseMapper<Material> {
 
     List<Material> findIsBack(List<Material> list);
 
-    List<Material> findProId();
+    List<Material> findProId(List<Information> list);
 
     List<Information> proIdName(List<Material> list);
 

src/main/java/com/jeeplus/modules/sg/material/mapper/xml/MaterialMapper.xml

@@ -279,7 +279,13 @@
     </select>
     
     <select id="findProId" resultType="com.jeeplus.modules.sg.material.entity.Material">
-        SELECT project_id from material_information where status is not null or status != '' GROUP BY project_id
+        SELECT project_id from material_information where (status is not null or status != '')
+         and project_id in(
+         <foreach collection="list" item="item" separator=",">
+             #{item.projectId}
+         </foreach>
+         )
+         GROUP BY project_id
     </select>
     
     <select id="proIdName" resultType="com.jeeplus.modules.sg.information.entity.Information">

src/main/java/com/jeeplus/modules/sg/material/service/MaterialService.java

@@ -106,8 +106,8 @@ public class MaterialService extends CrudService<MaterialMapper, Material> {
 		return materialMapper.findIsBack(list);
 	}
 
-	public  List<Material> findProId() {
-		return materialMapper.findProId();
+	public  List<Material> findProId(List<Information> list) {
+		return materialMapper.findProId(list);
 	}
 
 

src/main/java/com/jeeplus/modules/sys/mapper/MenuMapper.java

@@ -29,9 +29,9 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	
 	public List<Menu> getChildren(String parentId);
 	
-	public void deleteMenuRole(@Param(value="menu_id")String menu_id);
+	public void deleteMenuRole(@Param(value = "menu_id") String menu_id);
 	
-	public void deleteMenuDataRule(@Param(value="menu_id")String menu_id);
+	public void deleteMenuDataRule(@Param(value = "menu_id") String menu_id);
 	
 	public List<Menu> findAllDataRuleList(Menu menu);
 

src/main/java/com/jeeplus/modules/sys/mapper/UserMapper.java

@@ -77,16 +77,16 @@ public interface UserMapper extends BaseMapper<User> {
 	/**
 	 * 插入好友
 	 */
-	public int insertFriend(@Param("id")String id, @Param("userId")String userId, @Param("friendId")String friendId);
+	public int insertFriend(@Param("id") String id, @Param("userId") String userId, @Param("friendId") String friendId);
 	
 	/**
 	 * 查找好友
 	 */
-	public User findFriend(@Param("userId")String userId, @Param("friendId")String friendId);
+	public User findFriend(@Param("userId") String userId, @Param("friendId") String friendId);
 	/**
 	 * 删除好友
 	 */
-	public void deleteFriend(@Param("userId")String userId, @Param("friendId")String friendId);
+	public void deleteFriend(@Param("userId") String userId, @Param("friendId") String friendId);
 	
 	/**
 	 * 

src/main/java/com/jeeplus/modules/test/onetomany/dialog/web/TestDataMain1Controller.java

@@ -173,7 +173,6 @@ public class TestDataMain1Controller extends BaseController {
 
 	/**
 	 * 导入Excel数据
-
 	 */
 	@ResponseBody
 	@RequiresPermissions("test:onetomany:dialog:testDataMain1:import")

src/main/java/net/oschina/j2cache/Cache.java

@@ -76,7 +76,7 @@ public interface Cache {
 	 *
 	 * @param keys Cache key
 	 */
-	void evict(String...keys);
+	void evict(String... keys);
 
 	/**
 	 * Clear the cache

src/main/java/net/oschina/j2cache/ClusterPolicy.java

@@ -35,7 +35,7 @@ public interface ClusterPolicy {
      * @param region 区域名称
      * @param keys   缓存键值
      */
-    void sendEvictCmd(String region, String...keys);
+    void sendEvictCmd(String region, String... keys);
 
     /**
      * 发送清除整个缓存区域的命令

src/main/java/net/oschina/j2cache/Level2Cache.java

@@ -55,7 +55,7 @@ public interface Level2Cache extends Cache {
      * 同时设置多个数据
      * @param bytes
      */
-    void setBytes(Map<String,byte[]> bytes);
+    void setBytes(Map<String, byte[]> bytes);
 
     /**
      * 判断缓存数据是否存在
@@ -78,7 +78,7 @@ public interface Level2Cache extends Cache {
      *
      * @param keys Cache key
      */
-    void evict(String...keys);
+    void evict(String... keys);
 
     /**
      * Clear the cache

src/main/java/net/oschina/j2cache/ehcache/EhCache.java

@@ -33,7 +33,7 @@ import net.sf.ehcache.event.CacheEventListener;
  */
 public class EhCache implements Level1Cache, CacheEventListener {
 	
-	private net.sf.ehcache.Cache cache;
+	private Cache cache;
 	private CacheExpiredListener listener;
 
 	/**

src/main/resources/j2cache/j2cache.properties

@@ -88,7 +88,7 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 192.168.2.4:6379
+redis.hosts = 127.0.0.1:6379
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,7 +14,7 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
 jdbc.password=root
 jdbc.testSql=SELECT 'x'
@@ -38,84 +38,84 @@ jdbc.pool.maxActive=20
 #===== System settings ======#
 #============================#
 
-#\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
-productName=JeePlus \u5FEB\u901F\u5F00\u53D1\u5E73\u53F0
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=JeePlus \u5feb\u901f\u5f00\u53d1\u5e73\u53f0
 copyrightYear=2017
 version=V3.0
 
 #\u9ED8\u8BA4\u4E3B\u9898(\u53EF\u9009\u503C jp\uFF0Cdefault\uFF0C  jp\u662F\u9ED8\u8BA4\u6A2A\u5411\u83DC\u5355\uFF0Cdefault\u9ED8\u8BA4\u662F\u5DE6\u4FA7\u83DC\u5355\u7ECF\u5178\u98CE\u683C)
 defaultTheme = jp
 
-#\u6F14\u793A\u6A21\u5F0F: \u4E0D\u80FD\u64CD\u4F5C\u548C\u4FDD\u5B58\u7684\u6A21\u5757\uFF1A sys: area/office/user/role/menu/dict, cms: site/category
+#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#\u7BA1\u7406\u57FA\u7840\u8DEF\u5F84, \u9700\u540C\u6B65\u4FEE\u6539\uFF1Aweb.xml
+#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/a
 
-#\u524D\u7AEF\u57FA\u7840\u8DEF\u5F84
+#\u524d\u7aef\u57fa\u7840\u8def\u5f84
 frontPath=/f
 
-#\u7F51\u7AD9URL\u540E\u7F00
+#\u7f51\u7ad9URL\u540e\u7f00
 urlSuffix=.html
 
-#\u662F\u5426\u4E0D\u5141\u8BB8\u5237\u65B0\u4E3B\u9875\uFF0C\u4E0D\u5141\u8BB8\u60C5\u51B5\u4E0B\uFF0C\u5237\u65B0\u4E3B\u9875\u4F1A\u5BFC\u81F4\u91CD\u65B0\u767B\u5F55
+#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
 notAllowRefreshIndex=false
 
-#\u662F\u5426\u5141\u8BB8\u591A\u8D26\u53F7\u540C\u65F6\u767B\u5F55
+#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
 user.multiAccountLogin=true
 
-#\u5206\u9875\u914D\u7F6E
+#\u5206\u9875\u914d\u7f6e
 page.pageSize=10
 
-#\u7855\u6B63\u7EC4\u4EF6\u662F\u5426\u4F7F\u7528\u7F13\u5B58
+#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
 supcan.useCache=false
 
-#\u901A\u77E5\u95F4\u9694\u65F6\u95F4\u8BBE\u7F6E, \u5355\u4F4D\uFF1A\u6BEB\u79D2, 30s=30000ms, 60s=60000ms
+#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#\u4F1A\u8BDD\u8D85\u65F6\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#\u4F1A\u8BDD\u6E05\u7406\u95F4\u9694\u65F6\u95F4\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C2m=120000ms\u3002
+#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#\u7D22\u5F15\u9875\u8DEF\u5F84
+#\u7d22\u5f15\u9875\u8def\u5f84
 web.view.index=/a
 
-#\u89C6\u56FE\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
+#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
 web.view.prefix=/webpage/
 web.view.suffix=.jsp
 
 #\u6587\u4EF6\u7BA1\u7406\u7CFB\u7EDF\u5141\u8BB8\u4E0A\u4F20\u7684\u6700\u5927\u6587\u4EF6
 web.maxUploadSize=1073741824
 
-#\u65E5\u5FD7\u62E6\u622A\u8BBE\u7F6E\uFF0C\u6392\u9664\u7684URI\uFF1B\u5305\u542B @RequestMapping\u6CE8\u89E3\u7684value\u3002\uFF08\u5DF2\u4F5C\u5E9F\uFF09
+#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#\u9759\u6001\u6587\u4EF6\u540E\u7F00
+#\u9759\u6001\u6587\u4ef6\u540e\u7f00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#\u5355\u70B9\u767B\u5F55CAS\u8BBE\u7F6E
+#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
 cas.server.url=e
 cas.project.url=http://127.0.0.1:8080/jeeplus
 
-#\u5DE5\u4F5C\u6D41\u8BBE\u7F6E
+#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: \u5B8B\u4F53  linux font: simsun)
-activiti.diagram.activityFontName=\u5B8B\u4F53
-activiti.diagram.labelFontName=\u5B8B\u4F53
-#activiti\u5916\u90E8\u8868\u5355\u6839\u5730\u5740\u914D\u7F6E
+#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
+activiti.diagram.activityFontName=\u5b8b\u4f53
+activiti.diagram.labelFontName=\u5b8b\u4f53
+#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
 activiti.form.server.url=
 
-#\u4E0A\u4F20\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84, \u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8\u5305\u542B\u201Cuserfiles\u201D
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
 #userfiles.basedir=D:/jeeplus
 
-#\u5DE5\u7A0B\u8DEF\u5F84\uFF0C\u5728\u4EE3\u7801\u751F\u6210\u65F6\u83B7\u53D6\u4E0D\u5230\u5DE5\u7A0B\u8DEF\u5F84\u65F6\uFF0C\u53EF\u518D\u6B64\u6307\u5B9A\u7EDD\u5BF9\u8DEF\u5F84\u3002
+#\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
 projectPath=D:\\jeeplus\\jeeplus-ani-menu-big\\jeeplus-maven
 #======================================#\u6587\u4EF6\u4E0A\u4F20\u9650\u5236#======================================#
 spring.http.multipart.max-file-size=100MB

src/main/webapp/webpage/modules/sg/information/informationList.js

@@ -420,8 +420,14 @@ $(document).ready(function() {
 	});
 
 
-	$("#exportInformation").click(function(){//导出项目清单
-		jp.downloadFile('${ctx}/sg/information/exportInformation');
+	$("#exportInformation").click(function(){//导出word
+		var projectId = $("#projectId").val();
+		var projectName = $("#projectName").val();
+		var projectType = $("#projectType").val();
+		var projectYear = $("#projectYear").val();
+		var firstUnits = $("#firstUnits").val();
+		var secondUnits = $("#secondUnits").val();
+		jp.downloadFile('${ctx}/sg/information/exportInformation?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits);
 	});
 
 

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -13,8 +13,8 @@
 	<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
 	<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
 
-	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
-	<%@ include file="/webpage/include/layIM-init.jsp"%>
+<%--	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
+	<%@ include file="/webpage/include/layIM-init.jsp"%>--%>
 <style>
 	.push-right #sidebar-nav{
 	  display:block;

src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -10,8 +10,8 @@
 	<meta name="decorator" content="ani"/>
 	<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
 	<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
-	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
-	<%@ include file="/webpage/include/layIM-init.jsp"%>
+<%--	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
+	<%@ include file="/webpage/include/layIM-init.jsp"%>--%>
 </head>
 
 <body class="">

src/main/webapp/webpage/modules/test/onetomany/dialog/testDataMain1List.jsp

@@ -99,8 +99,8 @@
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 			 </shiro:hasPermission>
-	                 <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
-				<button id="view" class="btn btn-default" disabled onclick="view()">
+			<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
+				<button id="view" class="btn btn-default" onclick="view()">
 					<i class="fa fa-search-plus"></i> 查看
 				</button>
 			</shiro:hasPermission>

src/main/webapp/webpage/modules/test/onetomany/form/testDataMain2List.js

@@ -205,6 +205,7 @@ $(document).ready(function() {
 	    	       }
 			}); 
 		});
+
 	  $("#export").click(function(){//导出Excel文件
 			jp.downloadFile('${ctx}/test/onetomany/form/testDataMain2/export');
 	  });