经费管理/全部费用申请/新加导出按钮

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1052,6 +1052,42 @@ public class StaBudgetapprovalController extends BaseController {
         return BaseResult.success(result);
     }
 
+/*    *//**
+     * 导出
+     *//*
+    @ResponseBody
+    @RequestMapping(value = "/getAll/{fromdata}",method = RequestMethod.POST)
+    public BaseResult getAll(@PathVariable(required = false) String fromdata) throws  Exception{
+        Map<String, Object> map = new HashMap<>();
+        if (fromdata == null){
+            List<StaBudgetapproval> list = staBudgetapprovalService.getAllApplyList(map);
+            return BaseResult.success("导出成功",list);
+        }
+        ObjectMapper objectMapper = new ObjectMapper();
+        StaBudgetapproval formDatas = objectMapper.readValue(fromdata, StaBudgetapproval.class);
+
+        map.put("sortName",formDatas.getSortName());
+        map.put("sortOrder", formDatas.getSortOrder());
+        map.put("bh", formDatas.getBh());
+        map.put("erpbh", formDatas.getErpbh());
+        map.put("xmlx", formDatas.getXmlx());
+        map.put("sfbyj", formDatas.getSfbyj());
+        map.put("xmmc", formDatas.getXmmc());
+        map.put("ssbmmc", formDatas.getSsbmmc());
+        map.put("spzt", formDatas.getSpzt());
+        map.put("sfbz", formDatas.getSfbz());
+        map.put("dkyfzr", formDatas.getDkyfzr());
+        map.put("sqsj1", formDatas.getSqsj1());
+        map.put("sqsj2", formDatas.getSqsj2());
+        map.put("fylb", formDatas.getFylb());
+        map.put("sqr", formDatas.getSqr());
+        map.put("nf",formDatas.getNf());
+        List<StaBudgetapproval> list = staBudgetapprovalService.getAllApplyList(map);
+
+        return BaseResult.success("导出成功",list);
+
+    }*/
+
     /**
      * 浏览数据
      *
@@ -1087,13 +1123,13 @@ public class StaBudgetapprovalController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/getAll/{fromdata}",method = RequestMethod.POST)
     public BaseResult getAll(@PathVariable(required = false) String fromdata) throws  Exception{
-        Map<String, String> paraMap = new HashMap<>();
+        Map<String, Object> paraMap = new HashMap<>();
         if (fromdata == null){
             List<StaBudgetapproval> list = staBudgetapprovalService.getApprovingList(paraMap);
             return BaseResult.success("导出成功",list);
         }
          ObjectMapper objectMapper = new ObjectMapper();
-        staBudgetapprovalutilEntity formDatas = objectMapper.readValue(fromdata, staBudgetapprovalutilEntity.class);
+        StaBudgetapproval formDatas = objectMapper.readValue(fromdata, StaBudgetapproval.class);
         if (formDatas.getNf() != null && ! formDatas.getNf().isEmpty()){
             String[] nfs = formDatas.getNf().split(",");
             if (nfs.length>1){

src/main/java/com/liang/entity/StaBudgetapproval.java

@@ -1,5 +1,7 @@
 package com.liang.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonAppend;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,6 +27,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 项目名称(任务书)
      */
+    @JsonProperty("xmmc")
     private String xmmc;
     /**
      * 项目ID
@@ -33,6 +36,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 编号
      */
+    @JsonProperty("bh")
     private String bh;
     /**
      * 申请说明
@@ -45,6 +49,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 费用类别
      */
+    @JsonProperty("fylb")
     private Integer fylb;
     private String fylbmc;
     private String fjmc;
@@ -63,6 +68,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 年份
      */
+    @JsonProperty("nf")
     private String nf;
     /**
      * 申请人
@@ -71,12 +77,15 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 申请人
      */
+    @JsonProperty("sqr")
     private Integer sqr;
     /**
      * 申请时间
      */
     private Date sqsj;
+    @JsonProperty("sqsj1")
     private Date sqsj1;
+    @JsonProperty("sqsj2")
     private Date sqsj2;
     /**
      * 申请名称
@@ -85,6 +94,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 审批状态
      */
+    @JsonProperty("spzt")
     private String spzt;
     /**
      * 可用费用信息
@@ -105,6 +115,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 是否备用金
      */
+    @JsonProperty("sfbyj")
     private Boolean sfbyj;
     /**
      * 项目名称(可研报告)
@@ -113,10 +124,12 @@ public class StaBudgetapproval implements Serializable {
     /**
      * ERP编号
      */
+    @JsonProperty("erpbh")
     private String erpbh;
     /**
      * 项目类型
      */
+    @JsonProperty("xmlx")
     private String xmlx;
     private String xmlxmc;
     /**
@@ -128,10 +141,12 @@ public class StaBudgetapproval implements Serializable {
      * 所属部门
      */
     private Integer ssbm;
+    @JsonProperty("ssbmmc")
     private String ssbmmc;
     /**
      * 是否报账
      */
+    @JsonProperty("sfbz")
     private Boolean sfbz;
     /**
      * 说明文件
@@ -148,6 +163,7 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 电科院负责人
      */
+    @JsonProperty("dkyfzr")
     private String dkyfzr;
     private String dkyfzrxm;
 
@@ -165,5 +181,10 @@ public class StaBudgetapproval implements Serializable {
      */
     private String operations;
 
+    @JsonProperty("sortName")
+    private String sortName;
+    @JsonProperty("sortOrder")
+    private String sortOrder;
+
 }
 

src/main/java/com/liang/entity/baobiao/staBudgetapprovalutilEntity.java

@@ -48,6 +48,17 @@ public class staBudgetapprovalutilEntity implements Serializable {
     @JsonProperty("xmfzr")
     private String xmfzr;
 
+    @JsonProperty("fylb")
+    private String fylb;
+
+    public String getFylb() {
+        return fylb;
+    }
+
+    public void setFylb(String fylb) {
+        this.fylb = fylb;
+    }
+
     public String getXmfzr() {
         return xmfzr;
     }

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -166,9 +166,16 @@
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
                 </button>
-               <!-- <button class="layui-btn layui-btn-sm" lay-event="exportExcel" style="background-color: black">
-                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
+                <!--<button class="layui-btn layui-bg-black iconfont layui-icon-export" lay-event="export">
+                    <i class="layui-icon" style="font-size: 10px;"></i>导出列表
                 </button>-->
+                <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: black">
+                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
+                </button>
+
+                <!-- <button class="layui-btn layui-btn-sm" lay-event="exportExcel" style="background-color: black">
+                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
+                 </button>-->
 
             </div>
         </script>
@@ -793,6 +800,27 @@
                         });
                     });
                 }
+            }else if (obj.event === 'export'){
+
+                var formData = form.val('search-form');
+                // 获取form 表单代码
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url:AjaxUtil.ctx +'staBudgetapproval/getAll/'+formDataString,
+                    contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
+                    success: function(res){
+                        console.log(res);
+                        table.exportFile('currentTableId',res.data,'xlsx');
+                    },
+                    error:function (error) {
+                        Message.error(error,2000)
+
+                    }
+                });
+
+
             }
         });