导出名称，显示修改

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveManagementService.java

@@ -96,6 +96,20 @@ public class ReserveManagementService extends CrudService<ReserveManagementMappe
         //如果存在则修改信息
         if (null != byProjectId && 1 == byProjectId) {
             scheme.preUpdate();
+            scheme.setWhetherFinishDisclosure(returnStatus(scheme.getWhetherFinishDisclosure()));
+            scheme.setCapitalEquipment(returnStatus(scheme.getCapitalEquipment()));
+            scheme.setSubstationNewLine(returnStatus(scheme.getSubstationNewLine()));
+            scheme.setWhetherImplement(returnStatus(scheme.getWhetherImplement()));
+            scheme.setNecessaryOfImplementation(returnStatus(scheme.getNecessaryOfImplementation()));
+            scheme.setPrecondition(returnStatus(scheme.getPrecondition()));
+            scheme.setConstructionSchemeProblem(returnStatus(scheme.getConstructionSchemeProblem()));
+            scheme.setExistingSecurityThreat(returnStatus(scheme.getExistingSecurityThreat()));
+            scheme.setCustomizedMaterials(returnStatus(scheme.getCustomizedMaterials()));
+            scheme.setDismantlingTheOldMaterial(returnStatus(scheme.getDismantlingTheOldMaterial()));
+            scheme.setCivilWork(returnStatus(scheme.getCivilWork()));
+            scheme.setVerticalRodWorkload(returnStatus(scheme.getVerticalRodWorkload()));
+            scheme.setProjectApproval(returnStatus(scheme.getProjectApproval()));
+            scheme.setCourseEvaluationProcedures(returnStatus(scheme.getCourseEvaluationProcedures()));
             mapper.updateScheme(scheme);
             schedule.preUpdate();
             schedule.setConclusionDisclosure(format);
@@ -104,6 +118,14 @@ public class ReserveManagementService extends CrudService<ReserveManagementMappe
         }
     }
 
+    private String returnStatus(String scheme) {
+        if ("是".equals(scheme)) {
+            return "1";
+        } else {
+            return "0";
+        }
+    }
+
     /**
      * 专职修改方法
      * @param reserveManagement

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/PersonnelTurnoverController.java

@@ -232,15 +232,15 @@ public class PersonnelTurnoverController extends BaseController {
     public AjaxJson exportFile(PersonnelTurnover personnelTurnover, HttpServletRequest request, HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
         try {
-            String fileName = "项目规模信息"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "人员流转信息"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<PersonnelTurnover> page = service.findPage(new Page<PersonnelTurnover>(request, response, -1), personnelTurnover);
-            new ExportExcel("项目规模信息", PersonnelTurnover.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("人员流转信息", PersonnelTurnover.class).setDataList(page.getList()).write(response, fileName).dispose();
             j.setSuccess(true);
             j.setMsg("导出成功！");
             return j;
         } catch (Exception e) {
             j.setSuccess(false);
-            j.setMsg("导出项目规模信息记录失败！失败信息："+e.getMessage());
+            j.setMsg("导出人员流转信息记录失败！失败信息："+e.getMessage());
         }
         return j;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/StandardController.java

@@ -186,7 +186,7 @@ public class StandardController extends BaseController {
         AjaxJson j = new AjaxJson();
         try {
             String fileName = "物料规范信息"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<Standard> page = standardService.findPage(new Page<Standard>(request, response, -1), standard);
+            Page<Standard> page = standardService.findChildPage(new Page<Standard>(request, response, -1), standard);
             new ExportExcel("物料规范信息", Standard.class).setDataList(page.getList()).write(response, fileName).dispose();
             j.setSuccess(true);
             j.setMsg("导出成功！");

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/allUploadList.jsp

@@ -13,7 +13,7 @@
 <div class="wrapper wrapper-content">
     <div class="panel panel-primary">
         <div class="panel-heading">
-            <h3 class="panel-title">财务项目概预算信息管理</h3>
+            <h3 class="panel-title">储备文件管理</h3>
         </div>
         <div class="panel-body">
 

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/personnelTurnoverList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>方案交底结论</title>
+	<title>人员流转管理</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -25,7 +25,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">人员流转信息</h3>
+		<h3 class="panel-title">人员流转管理</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->
@@ -55,7 +55,7 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:reserve:personnelTurnover:import">
 				<button id="import" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 导入方案交底结论
+					<i class="fa fa-folder-open-o"></i> 导入人员流转信息
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:reserve:personnelTurnover:export">

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>人员流转信息</title>
+	<title>储备项目进度</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -25,7 +25,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">人员流转信息</h3>
+		<h3 class="panel-title">储备项目进度</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/standardList.js

@@ -178,7 +178,7 @@
 
 
         $("#export").click(function () {//导出Excel文件
-            jp.downloadFile('${ctx}/sg/managementCenter/standard/template');
+            jp.downloadFile('${ctx}/sg/managementCenter/standard/export');
         });
 
         $("#search").click("click", function () {// 绑定查询按扭

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/standardList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-    <title>财务项目概预算信息</title>
+    <title>物料规范管理</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <meta name="decorator" content="ani"/>
     <%@ include file="/webpage/include/bootstraptable.jsp" %>
@@ -28,7 +28,7 @@
 <div class="wrapper wrapper-content">
     <div class="panel panel-primary">
         <div class="panel-heading">
-            <h3 class="panel-title">财务项目概预算信息管理</h3>
+            <h3 class="panel-title">物料规范管理</h3>
         </div>
         <div class="panel-body">