From 7a681887e5a8e1aab49acc886974d354c69a280e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 13:10:38 +0800
Subject: [PATCH] feat(mes): 新增质检指标分组树和平行测量功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java | 110 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 20 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
index 6591f43..6e5a382 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
@@ -13,8 +13,10 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcIndicatorItemTypeEnum;
import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
+import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcReportService;
import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcLineService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcLineService;
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcLineService;
@@ -30,6 +32,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -44,6 +47,8 @@
@Resource
private MesQcIndicatorResultService resultService;
+ @Resource
+ private MesQcReportService reportService;
@Resource
private MesQcIqcLineService iqcLineService;
@Resource
@@ -117,12 +122,29 @@
return success(voPageResult);
}
+ @GetMapping("/report")
+ @Operation(summary = "鑾峰緱妫�楠屾姤鍛婂崟鏁版嵁锛堟墦鍗扮敤锛氳〃澶� + 妫�楠岄」鏍� + 骞宠娴嬮噺 + 绛惧瓧鍖猴級")
+ @Parameters({
+ @Parameter(name = "qcId", description = "璐ㄦ鍗旾D", required = true, example = "1"),
+ @Parameter(name = "qcType", description = "璐ㄦ绫诲瀷", required = true, example = "1"),
+ @Parameter(name = "resultId", description = "妫�楠岀粨鏋滐紙鏍峰搧锛夌紪鍙凤紝鍙笉浼狅紱澶氭牱鍝佹椂鐢ㄤ簬閫夋嫨", example = "1")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')")
+ public CommonResult<MesQcQcReportRespVO> getQcReportData(
+ @RequestParam("qcId") Long qcId,
+ @RequestParam("qcType") Integer qcType,
+ @RequestParam(value = "resultId", required = false) Long resultId) {
+ return success(reportService.getQcReportData(qcId, qcType, resultId));
+ }
+
// ==================== 鎷兼帴 VO ====================
/**
- * 鏋勫缓鏄庣粏 Item 鍒楄〃
+ * 鏋勫缓鏄庣粏 Item 鏍戯紙鏀寔鍒嗙粍灞傜骇 + 骞宠娴嬮噺澶氭壒娆★級
*
- * <p>鍓嶇琛ㄥ崟浠呴渶锛歩ndicatorId銆乮ndicatorName銆乿alueType銆乿alueSpecification + 宸叉湁缁撴灉锛坕d銆乿alue銆乺emark锛�</p>
+ * <p>杩斿洖鏍戝舰鍒楄〃锛氶《绾т负鍒嗙粍椤规垨鐙珛褰曞叆椤癸紝鍒嗙粍椤� children 鎸傚瓙椤癸紱
+ * 姣忎釜褰曞叆椤圭殑骞宠娴嬮噺鍊兼斁鍦� measures锛堟寜 measureNo 鍗囧簭锛夛紱
+ * 鍏煎瀛楁 id/value/remark 鍙栫涓�鎵瑰�硷紝渚涙棫鏁版嵁鐩存帴灞曠ず</p>
*
* @param details 宸叉湁缁撴灉鏄庣粏锛堢┖鍒楄〃琛ㄧず鑾峰彇绌哄�兼ā鏉匡級
* @param qcId 璐ㄦ鍗� ID
@@ -155,30 +177,78 @@
return Collections.emptyList();
}
- // 1.2 鎵归噺鏌ヨ妫�娴嬫寚鏍�
+ // 1.2 鎵归噺鏌ヨ妫�娴嬫寚鏍囷紱瀛愰」鐨勭埗鍒嗙粍鏈寕鍦ㄨ涓婃椂鑷姩琛ュ叏锛屼繚璇佹爲瀹屾暣
Map<Long, MesQcIndicatorDO> indicatorMap = indicatorService.getIndicatorMap(new HashSet<>(indicatorIds));
- // 1.3 鏋勫缓宸叉湁鏄庣粏 Map锛堟寜 indicatorId 绱㈠紩锛�
- Map<Long, MesQcIndicatorResultDetailDO> detailMap = CollUtil.isEmpty(details)
- ? Collections.emptyMap()
- : convertMap(details, MesQcIndicatorResultDetailDO::getIndicatorId);
+ Set<Long> missingParentIds = indicatorMap.values().stream()
+ .filter(ind -> ind.getParentId() != null && ind.getParentId() > 0
+ && !indicatorMap.containsKey(ind.getParentId()))
+ .map(MesQcIndicatorDO::getParentId).collect(Collectors.toSet());
+ if (CollUtil.isNotEmpty(missingParentIds)) {
+ indicatorMap.putAll(indicatorService.getIndicatorMap(missingParentIds));
+ }
- // 2. 閬嶅巻鎸囨爣 ID锛岀粍瑁� VO
- List<MesQcIndicatorResultRespVO.Item> voList = new ArrayList<>(indicatorIds.size());
- for (Long indicatorId : indicatorIds) {
+ // 1.3 宸叉湁鏄庣粏鍒嗙粍锛坕ndicatorId -> 澶氭壒娆″垪琛級
+ Map<Long, List<MesQcIndicatorResultDetailDO>> detailMap = CollUtil.isEmpty(details)
+ ? Collections.emptyMap()
+ : details.stream().collect(Collectors.groupingBy(MesQcIndicatorResultDetailDO::getIndicatorId));
+
+ // 2. 鏋勫缓鑺傜偣
+ Map<Long, MesQcIndicatorResultRespVO.Item> nodeMap = new LinkedHashMap<>();
+ for (Map.Entry<Long, MesQcIndicatorDO> entry : indicatorMap.entrySet()) {
+ Long indicatorId = entry.getKey();
+ MesQcIndicatorDO indicator = entry.getValue();
MesQcIndicatorResultRespVO.Item vo = new MesQcIndicatorResultRespVO.Item()
- .setIndicatorId(indicatorId);
- // 鏉ヨ嚜 indicator
- findAndThen(indicatorMap, indicatorId, indicator -> vo
+ .setIndicatorId(indicatorId)
.setIndicatorName(indicator.getName())
.setValueType(indicator.getResultType())
- .setValueSpecification(indicator.getResultSpecification()));
- // 鏉ヨ嚜宸叉湁缁撴灉鏄庣粏锛堝鏈夛級
- findAndThen(detailMap, indicatorId, detail -> vo
- .setId(detail.getId()).setResultId(detail.getResultId())
- .setValue(detail.getValue()).setRemark(detail.getRemark()));
- voList.add(vo);
+ .setValueSpecification(indicator.getResultSpecification())
+ .setParentId(Objects.requireNonNullElse(indicator.getParentId(), 0L))
+ .setItemType(Objects.requireNonNullElse(indicator.getItemType(),
+ MesQcIndicatorItemTypeEnum.RECORD.getType()))
+ .setFormulaText(indicator.getFormulaText())
+ .setUnitText(indicator.getUnitText())
+ .setSortOrder(Objects.requireNonNullElse(indicator.getSortOrder(), 0));
+ List<MesQcIndicatorResultDetailDO> itemDetails = detailMap.getOrDefault(indicatorId, Collections.emptyList());
+ List<MesQcIndicatorResultRespVO.Measure> measures = new ArrayList<>(itemDetails.size());
+ itemDetails.stream()
+ .sorted(Comparator.comparing(d -> Objects.requireNonNullElse(d.getMeasureNo(), 1)))
+ .forEach(detail -> measures.add(new MesQcIndicatorResultRespVO.Measure()
+ .setDetailId(detail.getId()).setResultId(detail.getResultId())
+ .setMeasureNo(Objects.requireNonNullElse(detail.getMeasureNo(), 1))
+ .setValue(detail.getValue()).setRemark(detail.getRemark())));
+ vo.setMeasures(measures);
+ // 鍏煎鏃у瓧娈碉細鍙栫涓�鎵规祴閲忓��
+ if (CollUtil.isNotEmpty(measures)) {
+ MesQcIndicatorResultRespVO.Measure first = measures.get(0);
+ vo.setId(first.getDetailId()).setResultId(first.getResultId())
+ .setValue(first.getValue()).setRemark(first.getRemark());
+ }
+ nodeMap.put(indicatorId, vo);
}
- return voList;
+
+ // 3. 鎸傛爲锛氱埗涓嶅湪闆嗗悎鍐呯殑瀛愰」鎻愬崌涓洪《绾э紱鍚岀骇鎸夋帓搴忓彿
+ Comparator<MesQcIndicatorResultRespVO.Item> byOrder =
+ Comparator.comparing(MesQcIndicatorResultRespVO.Item::getSortOrder)
+ .thenComparing(MesQcIndicatorResultRespVO.Item::getIndicatorId);
+ List<MesQcIndicatorResultRespVO.Item> roots = new ArrayList<>();
+ for (MesQcIndicatorResultRespVO.Item node : nodeMap.values()) {
+ MesQcIndicatorResultRespVO.Item parent = node.getParentId() > 0 ? nodeMap.get(node.getParentId()) : null;
+ if (parent == null) {
+ roots.add(node);
+ } else {
+ if (parent.getChildren() == null) {
+ parent.setChildren(new ArrayList<>());
+ }
+ parent.getChildren().add(node);
+ }
+ }
+ roots.sort(byOrder);
+ roots.forEach(root -> {
+ if (root.getChildren() != null) {
+ root.getChildren().sort(byOrder);
+ }
+ });
+ return roots;
}
}
--
Gitblit v1.9.3