1

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/RptFinancialMonthSummaryController.java

@@ -2,6 +2,7 @@ package com.ruoyi.logistics.controller;
 
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -81,6 +82,17 @@ public class RptFinancialMonthSummaryController extends BaseController
         return toAjax(rptFinancialMonthSummaryService.insertRptFinancialMonthSummary(rptFinancialMonthSummary));
     }
 
+    /**
+     * 月度账单汇总生成
+     */
+
+/*    @PostMapping("/creatMontSummary")
+    public AjaxResult creatMontSummary(@RequestBody Map param)
+    {
+        return toAjax(rptFinancialMonthSummaryService.creatMontSummary(param));
+    }*/
+
+
     /**
      * 修改财务月度汇总
      */

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/RptFinancialMonthSummaryServiceImpl.java

@@ -49,12 +49,7 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
         return rptFinancialMonthSummaryMapper.selectRptFinancialMonthSummaryList(rptFinancialMonthSummary);
     }
 
-    /**
-     * 新增财务月度汇总
-     * 1.定时任务执行所有供应商生成财务月度汇总    传值汇总月份
-     * 2.每次调整流水后需要对供应商进行重新生成汇总覆盖   传值部门id
-     *  部门Id和 账单月份必传其一  分别代表以上两种情况
-     */
+
     @Override
     public int insertRptFinancialMonthSummary(RptFinancialMonthSummary rptFinancialMonthSummary)
     {
@@ -108,4 +103,26 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
     {
         return rptFinancialMonthSummaryMapper.deleteRptFinancialMonthSummaryBySummaryId(summaryId);
     }
+
+
+
+    /**
+     * 新增财务月度汇总
+     * 1.定时任务执行所有供应商生成财务月度汇总    传值汇总月份  monthCode
+     * 2.每次调整流水后需要对供应商进行重新生成汇总覆盖   传值部门id    deptId
+     *  部门Id和 账单月份必传其一  分别代表以上两种情况
+     */
+    @Override
+    public int creatMontSummary(Map param) {
+        LocalDate today = LocalDate.now();
+        LocalDate lastMonth = today.minusMonths(1);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM");
+        // 格式化上个月日期为字符串
+        String formattedDate = lastMonth.format(formatter);
+        //按照传值条件查询统计账单情况
+
+        param.put("deptId",formattedDate);
+        List<Map<String,Object>> monthSummaryList=rptFinancialMonthSummaryMapper.selectMonthSummaryList(param);
+        return rptFinancialMonthSummaryMapper.insertBachRptFinancialMonthSummary(monthSummaryList);
+    }
 }