储备项目各审批人可单独下载甲供材清册数据

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ReserveProcessMapper.java

@@ -44,6 +44,11 @@ public interface ReserveProcessMapper extends BaseMapper<ReserveProcess> {
     List<MaterialInfo> findMaterialExport(List<String> projectName);
 
     /**
+     * 通过项目名称导出符合条件的数据
+     * */
+    List<MaterialInfo> findMaterialActiviti(String projectName);
+
+    /**
      * 插入对应的项目甲供材信息
      * */
     void insertList(@Param("list") List<MaterialInfo> list);

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ReserveProcessMapper.xml

@@ -254,6 +254,26 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="findMaterialActiviti"
+            resultType="com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo">
+        select
+        projectName,
+        materialCode,
+        materialName,
+        extendDescription,
+        unit,
+        totalCount,
+        weightKg,
+        weightTon,
+        supplyType,
+        note,
+        state
+        from
+        cb_material_data
+        where projectName = #{projectName}
+    </select>
+
     <select id="findReserveById"
             resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess">
         select id,

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

@@ -163,6 +163,13 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
     }
 
     /**
+     * 通过项目名称导出符合条件的数据
+     */
+    public List<MaterialInfo> findMaterialActiviti(String projectName) {
+        return mapper.findMaterialActiviti(projectName);
+    }
+
+    /**
      * 通过流程定义号修改项目的金额数据
      */
     @Transactional(readOnly = false)

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

@@ -360,7 +360,26 @@ public class ReserveProcessController extends BaseController {
         return j;
     }
 
-   
+
+    @ResponseBody
+    @RequestMapping(value = "exportAct")
+    public AjaxJson exportAct(String projectName,ReserveProcess reserveProcess, HttpServletRequest request, HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String fileName = "甲供材清册"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            List<MaterialInfo> list = reserveProcessService.findMaterialActiviti(projectName);
+            new ExportExcel("甲供材清册", MaterialInfo.class).setDataList(list).write(response, fileName).dispose();
+            j.setSuccess(true);
+            j.setMsg("导出成功！");
+            return j;
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导出甲供材清册失败！失败信息："+e.getMessage());
+        }
+        return j;
+    }
+
+
     /**
      * 下载导入模板
      */

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

@@ -263,9 +263,11 @@ $(document).ready(function() {
             $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
         });
 
-	 $("#export").click(function(){//导出Excel文件
-			jp.downloadFile('${ctx}/test/pic/testPic/export');
-	  });
+	$("#export").click(function(){//导出甲供材清册
+		var projectName = $("#projectName").val();
+		jp.downloadFile('${ctx}/sg/reserveProcess/exportAct?projectName=' + projectName);
+	});
+
 
 
 	  $("#search").click("click", function() {// 绑定查询按扭

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

@@ -459,6 +459,11 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<div id="toolbar">
+							<button id="export" class="btn btn-warning">
+								<i class="fa fa-file-excel-o"></i> 导出甲供材清册
+							</button>
+						</div>
 						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>

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

@@ -255,9 +255,11 @@ $(document).ready(function() {
             $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
         });
 
-	 $("#export").click(function(){//导出Excel文件
-			jp.downloadFile('${ctx}/test/pic/testPic/export');
-	  });
+	$("#export").click(function(){//导出甲供材清册
+		var projectName = $("#projectName").val();
+		jp.downloadFile('${ctx}/sg/reserveProcess/exportAct?projectName=' + projectName);
+	});
+
 
 
 	  $("#search").click("click", function() {// 绑定查询按扭

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

@@ -592,6 +592,11 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<div id="toolbar">
+							<button id="export" class="btn btn-warning">
+								<i class="fa fa-file-excel-o"></i> 导出甲供材清册
+							</button>
+						</div>
 						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>

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

@@ -256,9 +256,10 @@ $(document).ready(function() {
             $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
         });
 
-	 $("#export").click(function(){//导出Excel文件
-			jp.downloadFile('${ctx}/test/pic/testPic/export');
-	  });
+	$("#export").click(function(){//导出甲供材清册
+		var projectName = $("#projectName").val();
+		jp.downloadFile('${ctx}/sg/reserveProcess/exportAct?projectName=' + projectName);
+	});
 
 
 	  $("#search").click("click", function() {// 绑定查询按扭

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

@@ -556,6 +556,11 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<div id="toolbar">
+							<button id="export" class="btn btn-warning">
+								<i class="fa fa-file-excel-o"></i> 导出甲供材清册
+							</button>
+						</div>
 						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>