From b691a8f51b4d0eb6fe0901160b03e8be2f2f463b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 30 七月 2025 09:36:38 +0800
Subject: [PATCH] 提交app记录显示修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 10 ++++++++--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java | 2 ++
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
index 2963310..52c4b3a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
@@ -26,4 +26,6 @@
Integer selectInventory(@Param("processId") String processId, @Param("orderNumber") Integer orderNumber, @Param("technologyNumber") Integer technologyNumber, String thisProcess);
+
+ String getGlassPliesCount(String reportingWorkId);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 0bb3950..aeaf1d6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1204,14 +1204,20 @@
date.add(startDate);
date.add(endDate);
Map<String, Object> result = new HashMap<>();
- result.put("data",reportingWorkMapper.selectList(
+ List<ReportingWork> reportingWorkList = reportingWorkMapper.selectList(
new QueryWrapper<ReportingWork>().nested(
reportingWork.get("process")!=null,
wrapper-> wrapper.eq("creator_id",reportingWork.get("userId"))//褰撳伐搴忎负绌烘椂锛屾煡璇㈡墍鏈夋姤宸ヤ俊鎭�
)
.gt("reviewed_state",-1)
.between("date(reporting_work_time)",startDate,endDate)
- .orderByDesc("id")));
+ .orderByDesc("id"));
+ reportingWorkList.forEach(reportingWork1 -> {
+ String Plies = reportingWorkDetailMapper.getGlassPliesCount(reportingWork1.getReportingWorkId());
+ reportingWork1.setProcessId(reportingWork1.getProcessId()+'/'+Plies);
+ });
+
+ result.put("data",reportingWorkList);
result.put("date",date);
return result;
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
index 6509338..b8a6891 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
@@ -262,6 +262,10 @@
`b`.`available` = 1)
</select>-->
+ <select id="getGlassPliesCount">
+ select group_concat(technology_number) from (SELECT technology_number from pp.reporting_work_detail
+ where reporting_work_id = #{reportingWorkId} group by technology_number) a
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0