From d9a3f29203bf2cefeedb23766b79906d2b37abdc Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:28:38 +0800
Subject: [PATCH] 工时查询修改
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 2 +-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 16 +++++++++++++---
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java | 8 ++++----
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 22 +++++++++++-----------
performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java | 7 +++++++
5 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index 74d9b09..0074e0c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -354,7 +354,7 @@
}
// 娣诲姞鎵瑰噯浜哄悕绉�
if (detailsRecord.getRatifyUserId() != null) {
- User user = userMapper.selectById(SecurityUtils.getUserId().intValue());
+ User user = userMapper.selectById(detailsRecord.getRatifyUserId());
detailsRecord.setRatifyUserName(user.getName());
}
return detailsRecord;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 363eed0..64e4d1a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -155,9 +155,21 @@
spotCheckQuarterItemMapper.updateById(spotCheckQuarterItem);
}
-
// 鍒涘缓宸ユ椂鏆傚瓨
// 缂撳瓨鏍峰搧id, 缂栧彿map
+// addWorkingHoursTemporary(userId, insSamples, ids, order);
+
+ return 1;
+ }
+
+ /**
+ * 鍒涘缓宸ユ椂鏆傚瓨
+ * @param userId
+ * @param insSamples
+ * @param ids
+ * @param order
+ */
+ private void addWorkingHoursTemporary(Integer userId, List<InsSample> insSamples, List<Integer> ids, InsOrder order) {
Map<Integer, String> sampleMap = insSamples.stream().collect(Collectors.toMap(InsSample::getId, InsSample::getSampleCode));
List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
.in(InsProduct::getInsSampleId, ids)
@@ -189,8 +201,6 @@
return auxiliaryOutputWorkingHours;
}).collect(Collectors.toList());
auxiliaryOutputWorkingHoursTemporaryService.saveBatch(outputWorkingHours);
-
- return 1;
}
public static String getWeek(String dayStr) {
diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
index 8ccf68d..21cac48 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
@@ -23,4 +23,11 @@
@ApiModelProperty("缁撴潫鏃堕棿")
private String endDate;
+
+
+ @ApiModelProperty("杈呭姪宸ユ椂寮�濮嬫椂闂�")
+ private String assistBeginDate;
+
+ @ApiModelProperty("杈呭姪宸ユ椂缁撴潫鏃堕棿")
+ private String assistEndDate;
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index 2bacdd7..dd22d6c 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -226,10 +226,10 @@
DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String beginDate = previousMonth26th.atStartOfDay().format(outputFormatter);
String endDate = currentMonth25th.atStartOfDay().format(outputFormatter);
-// dto.setBeginDate(beginDate + " 00:00:00");
-// dto.setEndDate(endDate + " 23:59:59");
- dto.setBeginDate(beginDate);
- dto.setEndDate(endDate);
+ dto.setBeginDate(beginDate + " 00:00:00");
+ dto.setEndDate(endDate + " 23:59:59");
+ dto.setAssistBeginDate(beginDate);
+ dto.setAssistEndDate(endDate);
// 鏌ヨ浜ч噺宸ユ椂
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index c9df972..a82faab 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -144,16 +144,16 @@
u.name userName,
aowh.`check` userId,
#{dto.month} month
- from (SELECT *
- FROM auxiliary_output_working_hours
- GROUP BY CASE
- WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN man_hour_group
- ELSE id
- END
- , CASE
- WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN order_id
- ELSE id
- END) aowh
+ from (SELECT ao.*, ip.cable_tag
+ FROM auxiliary_output_working_hours ao
+ left join ins_product ip on ip.id = ao.ins_product_id
+ GROUP BY CASE
+ WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.man_hour_group
+ ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.sample_id ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.radius ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.cable_tag ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.order_id ELSE ao.id END) aowh
left join user u on u.id = aowh.`check`
where aowh.date_time between #{dto.beginDate} and #{dto.endDate}
<if test="userIds !=null and userIds.size() > 0">
@@ -171,7 +171,7 @@
#{dto.month} month
from auxiliary_working_hours_day awhd
left join user u on u.id = awhd.name_user
- where awhd.date_time between #{dto.beginDate} and #{dto.endDate}
+ where awhd.date_time between #{dto.assistBeginDate} and #{dto.assistEndDate}
and awhd.state = '宸叉壒鍑�'
<if test="userIds !=null and userIds.size() > 0">
and awhd.name_user in
--
Gitblit v1.9.3