From a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 13:34:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 abbcc7c..a6cbc14 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
@@ -1,6 +1,8 @@
package com.example.erp.service.pp;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -136,7 +138,8 @@
public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
Map<String, Object> map = new HashMap<>();
//鑾峰彇琛ㄦ牸鍐呭鏁版嵁
- map.put("data", reportMapper.processCardProgressMp(orderId));
+ List<Map<String, String>> dataList = reportMapper.processCardProgressMp(orderId);
+
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
List<Map<String, String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
@@ -180,14 +183,21 @@
}
}
map.put("title", uniqueList);
+ Map<String,Integer> clos = new HashMap<>();
for (int i=0;i<uniqueList.size();i++){
+ //鏍规嵁娴佺▼鏌ヨ鍩虹鏁版嵁
BasicData basicData = basicDataMapper.selectOne(
new QueryWrapper<BasicData>()
.eq("basic_category","process")
.eq("basic_name",uniqueList.get(i).get("process"))
.last("limit 1")
);
- if(basicData!=null && (Objects.equals(basicData.getNickname(), "stepB") || (Objects.equals(basicData.getNickname(), "stepD")))){
+ //鍒ゆ柇纾ㄨ竟鍜岀（杈瑰悗宸ュ簭
+ if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
+ clos.put(uniqueList.get(i).get("process"), 15+i);
+ }
+ //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
columns.add(15+i);
}
}
@@ -206,8 +216,46 @@
rowCount.add(getRow);
});
});
+ if(!clos.isEmpty()){
+ //寰幆缁撴灉
+ for (int i=0;i<dataList.size();i++ ) {
+ Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
+ new TypeReference<Map<String, String>>() {
+ });
+ for (String key : clos.keySet()) {
+ if(data.get(key) != null){
+ Integer max = orderGlassDetailMapper
+ .getMaxTechnologyNumberByGroup(dataList.get(i).get("order_id"),
+ String.valueOf(dataList.get(i).get("order_number")),
+ String.valueOf(dataList.get(i).get("group"))
+ );
+ Integer min = orderGlassDetailMapper
+ .getMinTechnologyNumberByGroup(dataList.get(i).get("order_id"),
+ String.valueOf(dataList.get(i).get("order_number")),
+ String.valueOf(dataList.get(i).get("group"))
+ );
+ if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) ){
+ Map<String, Integer> getRow = new HashMap<>();
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ getRow.put("row", i );
+ getRow.put("col", clos.get(key));
+ getRow.put("rowspan", max-min+1);
+ getRow.put("colspan", 0);
+ rowCount.add(getRow);
+ }else{
+ data.put(key,"0");
+ }
+
+ }
+ }
+ dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));
+
+ }
+ }
+
+ map.put("data",dataList );
map.put("mergeCells", rowCount);
return map;
--
Gitblit v1.8.0