知行同德v6.0

mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/controller/ZxtdReportConroller.java

@@ -113,5 +113,11 @@ public class ZxtdReportConroller {
         return McR.success();
     }
 
+    @GetMapping("/updateTest")
+    public McR updateTest() {
+        zxtdReportService.updateTest();
+        return McR.success();
+    }
+
 
 }

mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/entity/Profit.java

@@ -50,7 +50,7 @@ public class Profit {
     }
 
     public Profit buildTotalBudget(){
-        this.totalBudget= NumberUtil.add(quarterAmt1,quarterBudget2,quarterBudget3,quarterBudget4).setScale(2,RoundingMode.HALF_UP).toString();
+        this.totalBudget= NumberUtil.add(quarterBudget1,quarterBudget2,quarterBudget3,quarterBudget4).setScale(2,RoundingMode.HALF_UP).toString();
         return this;
     }
 

mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/service/ZxtdReportService.java

@@ -79,4 +79,7 @@ public interface ZxtdReportService {
      * @param month
      */
     void uploadToDingTalk2(HttpServletResponse response, String userId, String month);
+
+    void updateTest();
+
 }

mjava-zhixingtongde/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 # 环境配置
 server:
-  port: 9013
+  port: 8020
   servlet:
     context-path: /api/zxtd
 

mjava/src/main/java/com/malk/utils/UtilExcel.java

@@ -250,18 +250,18 @@ public class UtilExcel {
      * 列表与主表进行填充 [格式: 模板主表 {字段}, 列表 {.字段}]
      */
     @SneakyThrows
-    public static void exportAllSheetByTemplate(HttpServletResponse response, List<Object> dataMainList, List<List> dataLists,String year, @Nullable String fileName, String templateName) {
+    public static void exportAllSheetByTemplate(HttpServletResponse response, List<Object> dataMainList, List<List> dataLists, @Nullable String fileName,@Nullable String filePath, String templateName) {
         InputStream inputStream = UtilFile.readPackageResource("templates/" + templateName);
-
+        System.out.println("filePath:"+filePath);
         if (dataMainList.size() == dataLists.size()){
-            //删除本地磁盘中"D:\\" + fileName + "-" + year + ".xlsx"的文件
-            File file = new File("D:\\" + fileName + "-" + year + ".xlsx");
+            //删除本地磁盘中fileName + "-" + year + ".xlsx"的文件
+            File file = new File(filePath);
             if (file.exists()) {
                 file.delete();
             }
 
 //            UtilExcel.setResponseHeader(response, fileName, ".xlsx");
-            ExcelWriter workBook = EasyExcel.write("D:\\" + fileName + "-" + year + ".xlsx").withTemplate(inputStream).build();
+            ExcelWriter workBook = EasyExcel.write(filePath).withTemplate(inputStream).build();
             for (int i = 0; i < dataMainList.size(); i++) {
                 WriteSheet sheet = EasyExcel.writerSheet(i).build();
                 // 先单组数据填充，再多组数据填充