销售汇总表

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -238,15 +238,21 @@ public class ReportController  {
      * @author : 王英杰
      * @date   : 2024/4/26 16:43
      */
-    @PostMapping("get_salesum_report")
-    public List<Map<String, Object>> getSalesumReport(
-            @RequestParam int param1,
-            @RequestParam int param2,
-            @RequestParam int param3,
-            @RequestParam String startDate,
-            @RequestParam String endDate) {
-        return reportService.getSalesumReport(param1, param2, param3, startDate, endDate);
+    @PostMapping("get_order_summary")
+    public ResponseResultVO<Map<String, Object>> getOrderSummary(@RequestBody  Map<String, Object> param) {
+        return reportService.getOrderSummary(param);
     }
+
+    /**
+     * @desc   : 销售汇总表明细
+     * @author : 付斌
+     * @date   : 2024-07-04 12:59
+     */
+    @PostMapping("get_order_summary_item")
+    public ResponseResultVO<Map<String, Object>> getOrderSummaryItem(@RequestBody  Map<String, Object> param) {
+        return reportService.getOrderSummaryItem(param);
+    }
+
     /**
      * @desc   : 销售简报
      * @date   : 2024/5/6 8:42

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -341,4 +341,18 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      * @date   : 2024/7/2 8:55
      */
     Map<String, Object> getBusinessOverview(Map param);
+
+    /**
+     * @desc   : 销售汇总
+     * @author : 付斌
+     * @date   : 2024-07-04 11:34
+     */
+    Map<String, Object> getOrderSummary(Map param);
+
+    /**
+     * @desc   : 销售汇总明细
+     * @author : 付斌
+     * @date   : 2024-07-04 11:34
+     */
+    Map<String, Object> getOrderSummaryItem(Map param);
 }

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3357,5 +3357,15 @@
         select dkic_b.f_query_business_overview(#{cpId}, #{querys, typeHandler=JsonTypeHandler})
     </select>
 
+    <!-- 销售汇总 -->
+    <select id="getOrderSummary" resultType="java.util.Map">
+        select dkic_b.f_get_order_summary(#{cpId}, #{querys, typeHandler=JsonTypeHandler})
+    </select>
+
+    <!-- 销售汇总明细 -->
+    <select id="getOrderSummaryItem" resultType="java.util.Map">
+        select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler})
+    </select>
+
     <!--endregion-->
 </mapper>

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -68,13 +68,33 @@ public class ReportService {
     private JdbcTemplate jdbcTemplate;
 
     /**
-     * @desc   : 销售汇总表
+     * @desc : 销售汇总表
      * @author : 王英杰
-     * @date   : 2024/4/26 16:43
+     * @date : 2024/4/26 16:43
      */
-    public List<Map<String, Object>> getSalesumReport(int param1, int param2, int param3, String startDate, String endDate) {
-        String sql = "SELECT * FROM dkic_b.f_get_order_summary(?, ?, ?, ?, ?)";
-        return jdbcTemplate.queryForList(sql, param1, param2, param3, startDate, endDate);
+    public ResponseResultVO<Map<String, Object>> getOrderSummary(Map<String, Object> param) {
+        if (param.get("querys") != null) {
+            JSONObject querys = JSONObject.parseObject(param.get("querys").toString());
+            param.put("querys", querys);
+        }
+        Map<String, Object> m = reportMapper.getOrderSummary(param);
+        JSONObject jObject = JSONObject.parseObject(m.get("f_get_order_summary").toString());
+        return ResponseResultUtil.success(jObject);
+    }
+
+    /**
+     * @desc : 销售汇总表明细
+     * @author : 付斌
+     * @date : 2024/4/26 16:43
+     */
+    public ResponseResultVO<Map<String, Object>> getOrderSummaryItem(Map<String, Object> param) {
+        if (param.get("querys") != null) {
+            JSONObject querys = JSONObject.parseObject(param.get("querys").toString());
+            param.put("querys", querys);
+        }
+        Map<String, Object> m = reportMapper.getOrderSummaryItem(param);
+        JSONObject jObject = JSONObject.parseObject(m.get("f_get_order_summary_item").toString());
+        return ResponseResultUtil.success(jObject);
     }
 
     /**
@@ -778,8 +798,8 @@ public class ReportService {
 //            map.put("item", userArrearsItem);
             map.put("arrears", total);
         }
-        if(params.get("sort") != null) {
-            switch (String.valueOf(params.get("sort"))){
+        if (params.get("sort") != null) {
+            switch (String.valueOf(params.get("sort"))) {
                 case "order":
                     arrears = arrears.stream()
                             .sorted(Comparator.comparingDouble((Map map) -> Double.valueOf(String.valueOf(map.get("arrears")))))
@@ -812,7 +832,7 @@ public class ReportService {
             overviewList.add(debt);
             overviewList.addAll(arrears);
             return ResponseResultUtil.success(overviewList);
-        }else {
+        } else {
             return ResponseResultUtil.success(arrears);
         }
     }
@@ -997,9 +1017,9 @@ public class ReportService {
     }
 
     /**
-     * @desc   : 查询销售利润
+     * @desc : 查询销售利润
      * @author : 洪旭东
-     * @date   : 2024-06-07 16:48
+     * @date : 2024-06-07 16:48
      */
     public ResponseResultVO<Map<String, Object>> getSaleProfit(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
@@ -1022,9 +1042,9 @@ public class ReportService {
 //    }
 
     /**
-     * @desc   : 查询部门利润
+     * @desc : 查询部门利润
      * @author : 洪旭东
-     * @date   : 2024-06-07 16:48
+     * @date : 2024-06-07 16:48
      */
     public ResponseResultVO<Map<String, Object>> getSaleProfitGroupByOrg(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
@@ -1034,9 +1054,9 @@ public class ReportService {
     }
 
     /**
-     * @desc   : 查询业务员利润
+     * @desc : 查询业务员利润
      * @author : 洪旭东
-     * @date   : 2024-06-07 16:48
+     * @date : 2024-06-07 16:48
      */
     public ResponseResultVO<Map<String, Object>> getSaleProfitGroupByStaff(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
@@ -1046,9 +1066,9 @@ public class ReportService {
     }
 
     /**
-     * @desc   : 查询商品利润
+     * @desc : 查询商品利润
      * @author : 洪旭东
-     * @date   : 2024-06-07 16:48
+     * @date : 2024-06-07 16:48
      */
     public ResponseResultVO<Map<String, Object>> getSaleProfitGroupBySku(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
@@ -1058,9 +1078,9 @@ public class ReportService {
     }
 
     /**
-     * @desc   : 经营概况
+     * @desc : 经营概况
      * @author : 常皓宁
-     * @date   : 2024/7/2 8:55
+     * @date : 2024/7/2 8:55
      */
     public ResponseResultVO<Map<String, Object>> getBusinessOverview(Map<String, Object> param) {
         if (param.get("querys") != null) {