From 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 22 三月 2024 16:48:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
new file mode 100644
index 0000000..0bcecbb
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -0,0 +1,56 @@
+
+package com.example.erp.service.pp;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.mapper.pp.ReportMapper;
+import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("pp")
+public class ReportService {
+ private final ReportMapper reportMapper;
+
+ private final OrderProcessDetailMapper orderProcessDetailMapper;
+
+ public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper) {
+ this.reportMapper = reportMapper;
+ this.orderProcessDetailMapper = orderProcessDetailMapper;
+ }
+
+
+ public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.processCardProgressMp(orderId));
+ map.put("title", orderProcessDetailMapper.filterOrderProcess(orderId));
+ List<Map<String,Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ List<Map<String,Integer>> rowCount = new ArrayList<>();
+ columns.forEach(col ->{
+ getRowCount.forEach(row ->{
+ Map<String,Integer> getRow = new HashMap<>();
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ getRow.put("row",row.get("RowNum"));
+ getRow.put("col",col);
+ getRow.put("rowspan",row.get("rowCount"));
+ getRow.put("colspan",0);
+ rowCount.add(getRow);
+ });
+ });
+
+
+ map.put("mergeCells",rowCount);
+
+ return map;
+ }
+}
--
Gitblit v1.8.0