From 73be6b08f5a94e71550fe788c5d74705daa91be0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 22 三月 2024 16:48:07 +0800
Subject: [PATCH] 订单首页右键查询流程卡进度
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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
index 11d24f4..0bcecbb 100644
--- 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
@@ -7,24 +7,50 @@
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("sd")
+@DS("pp")
public class ReportService {
- @Autowired
- ReportMapper reportMapper;
+ 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, FlowCard flowCard) {
+ public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.processCardProgressMp(orderId, flowCard));
+ 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