From d1a09ac5cb4fb44ff21c349380109be1b49322c7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 13:13:12 +0800
Subject: [PATCH] 流程卡新增合并状态显示
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 b7d35c3..6be9263 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
@@ -3,10 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.dto.pp.DamageReportDTO;
-import com.example.erp.dto.pp.ScheduleProductionScheduleDTO;
-import com.example.erp.dto.pp.TeamOutputDTO;
-import com.example.erp.dto.pp.WorkInProgressDTO;
+import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
@@ -103,7 +100,7 @@
return map;
}
- public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, DamageDetails damageDetails) {
+ public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, CrossProcessBreakingDTO crossProcessBreakingDTO) {
Integer offset = (pageNum - 1) * pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
@@ -116,8 +113,8 @@
}
}
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
- map.put("total", reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, damageDetails));
+ map.put("data", reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, crossProcessBreakingDTO));
+ map.put("total", reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, crossProcessBreakingDTO));
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
@@ -410,6 +407,9 @@
}
public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
+ if (selectProcesses.equals("鍏ㄩ儴")){
+ selectProcesses="";
+ }
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
@@ -432,4 +432,13 @@
String process= (String) dates.get("processes");
return reportMapper.exportScheduleReportMp(date,process);
}
+
+ public List exportTeamOutputSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ String process= (String) dates.get("processes");
+ if (process.equals("鍏ㄩ儴")){
+ process="";
+ }
+ return reportMapper.exportTeamOutputMp(date,process);
+ }
}
--
Gitblit v1.8.0