songyang 1 год назад
Родитель
Сommit
521de97f21

+ 20 - 0
src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -257,6 +257,26 @@ public class ReportController  {
         return reportService.getMacRecCurrentItemReport(param);
     }
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:19
+     */
+    @PostMapping("get_mac_pay_current_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacPayCurrentReport(param);
+    }
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:20
+     */
+    @PostMapping("get_mac_pay_current_item_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentItemReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacPayCurrentItemReport(param);
+    }
+
 }
 
 

+ 13 - 0
src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -245,4 +245,17 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
     List<Map<String, Object>> getMacRecCurrentItemReport(Map param);
 
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:37
+     */
+    List<Map<String, Object>> getMacPayCurrentReport(Map param);
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:37
+     */
+    List<Map<String, Object>> getMacPayCurrentItemReport(Map param);
 }

+ 11 - 0
src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -2647,4 +2647,15 @@
                    ,#{accDateEnd} ::date,#{i18n} ,#{currentPage},#{pageSize})
     </select>
 
+    <!-- 客户往来账 -->
+    <select id="getMacPayCurrentReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_pay_current(#{cpId},#{currentPage},#{pageSize}, #{querys, typeHandler=JsonTypeHandler})
+    </select>
+
+    <!-- 客户往来账明细 -->
+    <select id="getMacPayCurrentItemReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_pay_current_item(#{cpId},#{objectId} ::uuid,#{orgId} ::uuid,#{macType},#{accDateStart} ::date
+                   ,#{accDateEnd} ::date,#{i18n} ,#{currentPage},#{pageSize})
+    </select>
+
 </mapper>

+ 58 - 0
src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -565,5 +565,63 @@ public class ReportService {
         }
     }
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentReport(Map<String, Object> param) {
+        if (param.get("querys") != null) {
+            JSONObject querys = JSONObject.parseObject(param.get("querys").toString());
+            param.put("querys",querys);
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacPayCurrentReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_pay_current").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentItemReport(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacPayCurrentItemReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_pay_current_item").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
 
 }