导出功能bug 修改

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

@@ -1,8 +1,7 @@
 package com.liang.controller;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
@@ -17,7 +16,6 @@ import com.liang.common.utils.Tools;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
 import com.liang.entity.*;
 import com.liang.service.*;
-//import com.liang.vo.service.*;
 import com.liang.vo.PrjAnnualbudgetNfVo;
 import com.liang.vo.PrjAnnualbudgetYzxqkVo;
 import io.swagger.annotations.ApiOperation;
@@ -29,7 +27,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -888,10 +885,28 @@ public class PrjAnnualbudgetController extends BaseController {
      * @param response
      */
     @ApiOperation(value = "导出全部数据到excel", notes = "导出全部数据到excel")
-    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.GET)
     @ResponseBody
-    public void exportExcel(HttpServletResponse response) {
-        List<PrjAnnualbudget> annualBudgets = prjAnnualbudgetService.getNdysList(new HashMap<>());
+    public void exportExcel(HttpServletResponse response,@PathVariable(required = false) String fromdata) throws  Exception{
+
+        // 解析前台传过来
+        Map<String, Object> paraMap = new HashMap<>();
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        PrjAnnualbudget formDatas = objectMapper.readValue(fromdata, PrjAnnualbudget.class);
+        if (formDatas.getNf().equals("0")){
+
+            paraMap.put("nf","");
+            }else {
+                paraMap.put("nf",formDatas.getNf());
+            }
+        paraMap.put("xmmc", formDatas.getXmmc());
+        paraMap.put("erpbh", formDatas.getErpbh());
+        paraMap.put("xmlx", formDatas.getXmlx());
+        paraMap.put("ssbmmc", formDatas.getSsbmmc());
+        paraMap.put("spzt", formDatas.getSpzt());
+        paraMap.put("rwsmc", formDatas.getRwsmc());
+        List<PrjAnnualbudget> annualBudgets = prjAnnualbudgetService.getNdysList(paraMap);
 
         List<String> listName = Arrays.asList("名称", "审批状态", "ERP编号", "项目类型", "可研报告", "任务书", "年份", "创建人", "创建时间", "说明");
         List<Map<String, String>> list = new ArrayList<>();

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

@@ -130,18 +130,8 @@ public class StaBudgetapprovalController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.POST)
     public BaseResult exportExcel(@PathVariable(required = false) String fromdata)throws Exception{
-        SysUserInfo userInfo = getSysUserInfo();
-        List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         ObjectMapper objectMapper = new ObjectMapper();
         StaBudgetapproval formData = objectMapper.readValue(fromdata, StaBudgetapproval.class);
-        String post = "";
-        if (postName.size() > 0) {
-            for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
-                    post = "过";
-                }
-            }
-        }
 
         Map<String, Object> paraMap = new HashMap<>();
         paraMap.put("sqmc", formData.getSqmc());
@@ -153,14 +143,14 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("xmlx", formData.getXmlx());
         paraMap.put("ssbmmc",formData.getSsbmmc());
         paraMap.put("dkyfzr",formData.getDkyfzr());
-        paraMap.put("nf",formData.getNf());
 
-        if (!userInfo.getAccount().equals("admin")) {
-            if (!"过".equals(post)) {
-                paraMap.put("userId", userInfo.getUserId().toString());
-            }
+        paraMap.put("xmmc",formData.getXmmc());
+        if (formData.getNf().equals("0")){
+            paraMap.put("nf","");
+        }else {
+            paraMap.put("nf",formData.getNf());
         }
-        List<StaBudgetapproval> list = staBudgetapprovalService.getFysqList(paraMap);
+        List<StaBudgetapproval> list = staBudgetapprovalService.getByjsqList(paraMap);
 
         return BaseResult.success("导出完成！",list);
     }
@@ -1124,25 +1114,12 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "/getAll/{fromdata}",method = RequestMethod.POST)
     public BaseResult getAll(@PathVariable(required = false) String fromdata) throws  Exception{
         Map<String, Object> paraMap = new HashMap<>();
-        if (fromdata == null){
-            List<StaBudgetapproval> list = staBudgetapprovalService.getApprovingList(paraMap);
-            return BaseResult.success("导出成功",list);
-        }
-         ObjectMapper objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = new ObjectMapper();
         StaBudgetapproval formDatas = objectMapper.readValue(fromdata, StaBudgetapproval.class);
-        if (formDatas.getNf() != null && ! formDatas.getNf().isEmpty()){
-            String[] nfs = formDatas.getNf().split(",");
-            if (nfs.length>1){
-                if (nfs[1].equals("0")){
-                    paraMap.put("nf","");
-
-                }else {
-                    paraMap.put("nf", nfs[1]);
-                }
-
-            }else {
-                paraMap.put("nf",formDatas.getNf());
-            }
+        if (formDatas.getNf().equals("0")){
+            paraMap.put("nf","");
+        }else {
+            paraMap.put("nf",formDatas.getNf());
         }
         paraMap.put("bh", formDatas.getBh());
         paraMap.put("erpbh", formDatas.getErpbh());
@@ -1153,7 +1130,9 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("dkyfzr", formDatas.getDkyfzr());
         paraMap.put("sqsj1", formDatas.getSqsj1());
         paraMap.put("sqsj2", formDatas.getSqsj2());
-        List<StaBudgetapproval> list = staBudgetapprovalService.getApprovingList(paraMap);
+        paraMap.put("xmfzrxm",formDatas.getXmfzrxm());
+        List<FeeManagemant> list = prjProjectService.getFyglList(paraMap);
+
 
         return BaseResult.success("导出成功",list);
 
@@ -1225,6 +1204,41 @@ public class StaBudgetapprovalController extends BaseController {
         return BaseResult.success(result);
     }
 
+
+    @ResponseBody
+    @RequestMapping(value = "/getAlls/{fromdata}",method = RequestMethod.POST)
+    public BaseResult getAlls(@PathVariable(required = false) String fromdata) throws  Exception{
+        Map<String, Object> paraMap = new HashMap<>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        StaBudgetapproval formDatas = objectMapper.readValue(fromdata, StaBudgetapproval.class);
+        if (formDatas.getNf().equals("0")){
+            paraMap.put("nf","");
+        }else {
+            paraMap.put("nf",formDatas.getNf());
+        }
+        paraMap.put("bh", formDatas.getBh());
+        paraMap.put("erpbh", formDatas.getErpbh());
+        paraMap.put("xmlx", formDatas.getXmlx());
+        paraMap.put("xmmc", formDatas.getXmmc());
+        paraMap.put("ssbmmc", formDatas.getSsbmmc());
+        paraMap.put("spzt", formDatas.getSpzt());
+        paraMap.put("dkyfzr", formDatas.getDkyfzr());
+        paraMap.put("sqsj1", formDatas.getSqsj1());
+        paraMap.put("sqsj2", formDatas.getSqsj2());
+        paraMap.put("xmfzrxm",formDatas.getXmfzrxm());
+        paraMap.put("sfbyj", formDatas.getSfbyj());
+
+        paraMap.put("sqsj1", formDatas.getSqsj1());
+        paraMap.put("sqsj2", formDatas.getSqsj2());
+        List<StaBudgetapproval> list = staBudgetapprovalService.getApprovingList(paraMap);
+
+
+
+        return BaseResult.success("导出成功",list);
+
+    }
+
+
     /**
      * 新建数据(提交审批)
      *

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

@@ -1,5 +1,6 @@
 package com.liang.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
@@ -641,11 +642,27 @@ public class StaPayapprovalController extends BaseController {
      * @param response
      */
     @ApiOperation(value = "导出全部数据到excel", notes = "导出全部数据到excel")
-    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.GET)
     @ResponseBody
-    public void exportExcel(HttpServletResponse response) {
-        List<StaPayapproval> payapprovalList = staPayapprovalService.getFksqList(new HashMap());
-
+    public void exportExcel(HttpServletResponse response,@PathVariable(required = false)String fromdata)throws Exception {
+        HashMap<String, Object> paraMap = new HashMap<>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        StaPayapproval fromData = objectMapper.readValue(fromdata,StaPayapproval.class);
+        if (fromData.getNf().equals("0")){
+            paraMap.put("nf","");
+            }else {
+                paraMap.put("nf",fromData.getNf());
+            }
+        paraMap.put("fysqmc", fromData.getFysqmc());
+        paraMap.put("erpbh", fromData.getErpbh());
+        paraMap.put("bh", fromData.getBh());
+        paraMap.put("spzt", fromData.getSpzt());
+        paraMap.put("cjsj1", fromData.getCjsj1());
+        paraMap.put("cjsj2", fromData.getCjsj2());
+        paraMap.put("cjr", fromData.getCjr());
+        paraMap.put("rwsmc", fromData.getRwsmc());
+        paraMap.put("xmmc", fromData.getXmmc());
+        List<StaPayapproval> payapprovalList = staPayapprovalService.getFksqList(paraMap);
         List<String> listName = Arrays.asList("审批状态", "合同", "费用申请", "本次付款金额(万元)", "付款计划", "创建人", "创建时间", "合同金额(万元)");
         List<Map<String, String>> list = new ArrayList<>();
         for (StaPayapproval payapproval : payapprovalList) {
@@ -660,7 +677,7 @@ public class StaPayapprovalController extends BaseController {
             list.add(map);
         }
 
-        ExcelPoiUtil.excelPort("报账", listName, list, null, response);
+        ExcelPoiUtil.excelPort("付款", listName, list, null, response);
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.liang.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
@@ -683,11 +684,24 @@ public class StaReimbursementController extends BaseController {
      * @param response
      */
     @ApiOperation(value = "导出全部数据到excel", notes = "导出全部数据到excel")
-    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.GET)
     @ResponseBody
-    public void exportExcel(HttpServletResponse response) {
-        List<StaReimbursement> reimburseList = staReimbursementService.getReimburseList(new HashMap());
-
+    public void exportExcel(HttpServletResponse response,@PathVariable(required = false) String fromdata)throws  Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
+        StaReimbursement formData = objectMapper.readValue(fromdata, StaReimbursement.class);
+        Map<String, Object> paraMap = new HashMap<>();
+        if (formData.getNf().equals("0")){
+                    paraMap.put("nf","");
+            }else {
+                paraMap.put("nf",formData.getNf());
+            }
+        paraMap.put("fysqbh", formData.getFysqbh());
+        paraMap.put("spzt", formData.getSpzt());
+        paraMap.put("mc", formData.getMc());
+        paraMap.put("bzr", formData.getBzr());
+        paraMap.put("xmmc",formData.getXmmc());
+        paraMap.put("erpbh",formData.getErpbh());
+        List<StaReimbursement> reimburseList = staReimbursementService.getReimburseList(paraMap);
         List<String> listName = Arrays.asList("名称", "审批状态", "费用申请编号", "报账金额(元)", "不含税金额(元)", "税费(元)", "报账人", "创建时间", "费用申请");
         List<Map<String, String>> list = new ArrayList<>();
         for (StaReimbursement reimbursement : reimburseList) {

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

@@ -51,6 +51,17 @@ public class staBudgetapprovalutilEntity implements Serializable {
     @JsonProperty("fylb")
     private String fylb;
 
+    @JsonProperty("sqr")
+    private String sqr;
+
+    public String getSqr() {
+        return sqr;
+    }
+
+    public void setSqr(String sqr) {
+        this.sqr = sqr;
+    }
+
     public String getFylb() {
         return fylb;
     }

src/main/resources/templates/annualbudget/list.html

@@ -622,8 +622,12 @@
                 if (dataBudget.length == 0)
                     return;
 
+                var formData = form.val('search-form');
+                // 获取form 表单代码
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
                 let a = document.createElement('a');
-                a.href = AjaxUtil.ctx + 'prjAnnualbudget/exportExcel';
+                a.href = AjaxUtil.ctx + 'prjAnnualbudget/exportExcel/'+formDataString;
                 a.click();
                 a.parentNode.removeChild(a);
             }

src/main/resources/templates/payapply/list.html

@@ -492,9 +492,12 @@
                 var dataBudget = table.cache["currentTableId"];
                 if (dataBudget.length == 0)
                     return;
-
+                var formData = form.val('search-form');
+                // 获取form 表单代码
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
                 let a = document.createElement('a');
-                a.href = AjaxUtil.ctx + 'staPayapproval/exportExcel';
+                a.href = AjaxUtil.ctx + 'staPayapproval/exportExcel/'+formDataString;
                 a.click();
                 a.parentNode.removeChild(a);
             }

src/main/resources/templates/reimburse/list.html

@@ -563,8 +563,12 @@
                 if (projects.length == 0)
                     return;
 
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+
                 let a = document.createElement('a');
-                a.href = AjaxUtil.ctx + 'staReimbursement/exportExcel';
+                a.href = AjaxUtil.ctx + 'staReimbursement/exportExcel/'+formDataString;
                 a.click();
                 a.parentNode.removeChild(a);
             }

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

@@ -744,7 +744,7 @@
                 console.log(formData);
                 var formDataString = JSON.stringify(formData);
                 AjaxUtil.post({
-                    url:AjaxUtil.ctx +'staBudgetapproval/getAll/'+formDataString,
+                    url:AjaxUtil.ctx +'staBudgetapproval/getAlls/'+formDataString,
                     contentType: "application/json",
                     timeout: 15000, //大批量导出时会出现超时问题
                     success: function(res){

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

@@ -91,9 +91,10 @@
 <!--        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view">
             <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
         </button>-->
-        <button class="layui-btn layui-bg-black iconfont layui-icon-export" lay-event="export">
-            <i class="layui-icon" style="font-size: 10px;"></i>导出列表
+        <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>
+
     </div>
 </script>