From b938f236181f5636dcc4b6089c1270d0f138ad23 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 10:43:50 +0800
Subject: [PATCH] feat: 部门报废详情、明细

---
 consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java |  135 +++++++++++++++++++++++++-------------------
 1 files changed, 77 insertions(+), 58 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index fe0d734..c7a8918 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -13,6 +13,7 @@
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,12 +27,8 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -188,61 +185,83 @@
         }
     }
 
-    public static void main(String[] args) {
-        TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\浣庡�兼槗鑰楀搧\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
-        exportParams.setHeadingStartRow(2);
+    @GetMapping("/deptListByModel")
+    public ResponseValue export() {
+        LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
+        LDeptFormScrappedQry query = new LDeptFormScrappedQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
 
-        List<Map<String, Object>> export = new ArrayList<>();
-
-        // 鍒涘缓绗竴鏉℃暟鎹�
-        Map<String, Object> data1 = new HashMap<>();
-        data1.put("agencyName", 1);
-        data1.put("baseGoodsTemplateName", "Bob");
-        data1.put("scrappedName", "Bob");
-        data1.put("bz", "Bob");
-        data1.put("baseGoodsModelsName", 30);
-        data1.put("counts", 30);
-        data1.put("totalPrice", 30);
-        export.add(data1);
-
-        // 鍒涘缓绗簩鏉℃暟鎹�
-        Map<String, Object> data2 = new HashMap<>();
-        data2.put("agencyName", 2);
-        data2.put("baseGoodsTemplateName", "Bob");
-        data2.put("scrappedName", "Bob");
-        data2.put("bz", "Bob");
-        data2.put("baseGoodsModelsName", 30);
-        data2.put("counts", 30);
-        data2.put("totalPrice", 30);
-        export.add(data2);
-
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("code", "2023");
-        map.put("date", "2023");
-        map.put("name", "operatorName");
-        map.put("countNum", 0);
-        map.put("totalAmount", 0);
-        map.put("maplist", export);
-
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
-
-        File file = new File("C:\\Users\\cy\\Desktop\\鏂板缓鏂囦欢澶�");
-        OutputStream stream = null;
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy_MM_dd");
-            stream = new FileOutputStream(new File(file, "鏈烘瀯瀹㈡埛淇℃伅琛�.xls"));
-            //document.write(stream);
-            workbook.write(stream);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (stream != null) ;
-            try {
-                stream.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        FinSysTenantUser sysInfo = getSysInfo();
+        if (sysInfo == null) {
+            throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        String tenantId = sysInfo.getTenantId();
+        String paramAgencyId = param.getAgencyId();
+        if (StringUtils.isEmpty(paramAgencyId) || !paramAgencyId.startsWith(tenantId)) {
+            param.setAgencyId(tenantId);
+        }
+
+        List<Map<String, Object>> export = depFormScrappedService.listByModel(param);
+        return ResponseValue.success(export);
     }
+
+//    public static void main(String[] args) {
+//        TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\浣庡�兼槗鑰楀搧\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
+//        exportParams.setHeadingStartRow(2);
+//
+//        List<Map<String, Object>> export = new ArrayList<>();
+//
+//        // 鍒涘缓绗竴鏉℃暟鎹�
+//        Map<String, Object> data1 = new HashMap<>();
+//        data1.put("agencyName", 1);
+//        data1.put("baseGoodsTemplateName", "Bob");
+//        data1.put("scrappedName", "Bob");
+//        data1.put("bz", "Bob");
+//        data1.put("baseGoodsModelsName", 30);
+//        data1.put("counts", 30);
+//        data1.put("totalPrice", 30);
+//        export.add(data1);
+//
+//        // 鍒涘缓绗簩鏉℃暟鎹�
+//        Map<String, Object> data2 = new HashMap<>();
+//        data2.put("agencyName", 2);
+//        data2.put("baseGoodsTemplateName", "Bob");
+//        data2.put("scrappedName", "Bob");
+//        data2.put("bz", "Bob");
+//        data2.put("baseGoodsModelsName", 30);
+//        data2.put("counts", 30);
+//        data2.put("totalPrice", 30);
+//        export.add(data2);
+//
+//
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("code", "2023");
+//        map.put("date", "2023");
+//        map.put("name", "operatorName");
+//        map.put("countNum", 0);
+//        map.put("totalAmount", 0);
+//        map.put("maplist", export);
+//
+//        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
+//
+//        File file = new File("C:\\Users\\cy\\Desktop\\鏂板缓鏂囦欢澶�");
+//        OutputStream stream = null;
+//        try {
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy_MM_dd");
+//            stream = new FileOutputStream(new File(file, "鏈烘瀯瀹㈡埛淇℃伅琛�.xls"));
+//            //document.write(stream);
+//            workbook.write(stream);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        } finally {
+//            if (stream != null) ;
+//            try {
+//                stream.close();
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
 }

--
Gitblit v1.9.1