From bf95a5cbc547313780b37f837dab6b617bcc00e4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 18:17:24 +0800
Subject: [PATCH] fix: 修改查询名称
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 136 +++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 8aa7871..0143af4 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -18,11 +18,7 @@
import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
import com.ruoyi.account.pojo.sales.AccountSalesCollection;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
-import com.ruoyi.approve.mapper.ApprovalInstanceMapper;
-import com.ruoyi.approve.mapper.ApprovalTaskMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.pojo.ApprovalInstance;
-import com.ruoyi.approve.pojo.ApprovalTask;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
@@ -32,7 +28,6 @@
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.enums.ApproveTypeEnum;
-import com.ruoyi.common.enums.TypeEnums;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
@@ -66,6 +61,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
@@ -102,10 +98,6 @@
private final QualityInspectMapper qualityStatisticsMapper;
private final ApproveProcessMapper approveProcessMapper;
-
- private final ApprovalTaskMapper approvalTaskMapper;
-
- private final ApprovalInstanceMapper approvalInstanceMapper;
private final SysDeptMapper sysDeptMapper;
@@ -393,58 +385,40 @@
@Override
public List<ApproveProcess> todos() throws ParseException {
LoginUser loginUser = SecurityUtils.getLoginUser();
- List<ApproveProcess> approveProcesses = new ArrayList<>();
-
- // 鏌ヨ鏃у鎵硅〃锛坅pprove_process锛�
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0)
.eq(ApproveProcess::getApproveUserCurrentId, loginUser.getUserId())
.ne(ApproveProcess::getApproveStatus, 2);
- List<ApproveProcess> oldList = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);
- if (!CollectionUtils.isEmpty(oldList)) {
- oldList.forEach(a -> {
- if (a.getApproveType() != null) {
- a.setApproveTypeName(ApproveTypeEnum.getNameByCode(a.getApproveType()));
- }
- });
- approveProcesses.addAll(oldList);
+ // .eq(ApproveProcess::getTenantId, loginUser.getTenantId());
+ List<ApproveProcess> approveProcesses = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);
+ if (CollectionUtils.isEmpty(approveProcesses)) {
+ approveProcesses = new ArrayList<>();
}
- // 鏌ヨ鏂板鎵硅〃锛坅pproval_task + approval_instance锛�
- List<ApprovalTask> pendingTasks = approvalTaskMapper.selectList(new LambdaQueryWrapper<ApprovalTask>()
- .eq(ApprovalTask::getApproverId, loginUser.getUserId())
- .eq(ApprovalTask::getTaskStatus, "PENDING")
- .eq(ApprovalTask::getDeleted, 0));
- if (!CollectionUtils.isEmpty(pendingTasks)) {
- List<Long> instanceIds = pendingTasks.stream()
- .map(ApprovalTask::getInstanceId)
- .distinct()
- .collect(Collectors.toList());
- List<ApprovalInstance> instances = approvalInstanceMapper.selectList(new LambdaQueryWrapper<ApprovalInstance>()
- .in(ApprovalInstance::getId, instanceIds)
- .eq(ApprovalInstance::getDeleted, 0));
- Map<Long, ApprovalInstance> instanceMap = instances.stream()
- .collect(Collectors.toMap(ApprovalInstance::getId, i -> i, (a, b) -> a));
-
- for (ApprovalTask task : pendingTasks) {
- ApprovalInstance instance = instanceMap.get(task.getInstanceId());
- if (instance == null) {
- continue;
- }
- ApproveProcess ap = new ApproveProcess();
- ap.setId(instance.getId());
- ap.setApproveId(instance.getInstanceNo());
- ap.setApproveReason(instance.getTitle());
- ap.setApproveTime(instance.getApplyTime() != null ? java.sql.Timestamp.valueOf(instance.getApplyTime()) : null);
- ap.setApproveUserName(instance.getApplicantName());
- ap.setApproveDeptName(instance.getTemplateName());
- if (instance.getBusinessType() != null) {
- ap.setApproveType(instance.getBusinessType().intValue());
- ap.setApproveTypeName(TypeEnums.getLabelByValue(instance.getBusinessType()));
- }
- approveProcesses.add(ap);
+ approveProcesses.forEach(a -> {
+ if (a.getApproveType() != null) {
+ a.setApproveTypeName(ApproveTypeEnum.getNameByCode(a.getApproveType()));
}
- }
+ });
+ // // 鏌ヨ鏈鐢ㄥ姵淇濊褰�
+ // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ //
+ // LaborIssue laborIssue1 = new LaborIssue();
+ // laborIssue1.setAdoptedDate(new Date());
+ // laborIssue1.setIssueDate(sdf.parse(sdf.format(new Date())));
+ // List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue1);
+ // //staff_join_leave_record琛ㄨ鍒犻櫎
+ // if(!CollectionUtils.isEmpty(laborIssues)){
+ // for (LaborIssue laborIssue : laborIssues) {
+ // ApproveProcess approveProcess = new ApproveProcess();
+ // approveProcess.setApproveId(laborIssue.getOrderNo());
+ // approveProcess.setApproveDeptName(sysDeptMapper.selectDeptById(loginUser.getTenantId()).getDeptName());
+ // approveProcess.setApproveTime(laborIssue.getIssueDate());
+ // approveProcess.setApproveReason(laborIssue.getDictTypeName() + "-" +
+ // laborIssue.getDictName() + "瓒呮椂鏈鍙�");
+ // approveProcesses.add(approveProcess);
+ // }
+ // }
return approveProcesses;
}
@@ -497,23 +471,18 @@
@Override
public Map<String, Object> approveAndDeviceTodos() {
- // 鏃у鎵硅〃寰呭姙
- Long oldCount = approveProcessMapper.selectCount(new LambdaQueryWrapper<ApproveProcess>()
+ // 瀹℃壒鍗忓悓寰呭姙
+ Long aLong = approveProcessMapper.selectCount(new LambdaQueryWrapper<ApproveProcess>()
.eq(ApproveProcess::getApproveUserCurrentId, SecurityUtils.getUserId())
.eq(ApproveProcess::getApproveDelete, 0)
.in(ApproveProcess::getApproveStatus, 0, 1, 3));
- // 鏂板鎵硅〃寰呭姙
- Long newCount = approvalTaskMapper.selectCount(new LambdaQueryWrapper<ApprovalTask>()
- .eq(ApprovalTask::getApproverId, SecurityUtils.getUserId())
- .eq(ApprovalTask::getTaskStatus, "PENDING")
- .eq(ApprovalTask::getDeleted, 0));
// 璁惧鎶ヤ慨寰呭姙
Long aLong1 = deviceRepairMapper.selectCount(new LambdaQueryWrapper<DeviceRepair>()
.eq(DeviceRepair::getStatus, 0)
.eq(DeviceRepair::getRepairName, SecurityUtils.getLoginUser().getNickName()));
return new HashMap<String, Object>() {
{
- put("approveTodo", oldCount + newCount);
+ put("approveTodo", aLong);
put("deviceRepairTodo", aLong1);
}
};
@@ -529,9 +498,20 @@
@Override
public ProductionProgressDto productionProgress() {
+ LocalDateTime now = LocalDateTime.now();
+
+ LocalDateTime startOfMonth = now
+ .with(TemporalAdjusters.firstDayOfMonth())
+ .with(LocalTime.MIN);
+
+ LocalDateTime endOfMonth = now
+ .with(TemporalAdjusters.lastDayOfMonth())
+ .with(LocalTime.MAX);
+
+
ProductionProgressDto productionProgressDto = new ProductionProgressDto();
- List<ProductionProgressOrderDto> orderDetails = productionOrderMapper.selectProgressOrders(
- LocalDateTime.now().minusMonths(1), LocalDateTime.now());
+ List<ProductionProgressOrderDto> orderDetails = productionOrderMapper
+ .selectProgressOrders(startOfMonth, endOfMonth);
productionProgressDto.setCompletedOrderDetails(orderDetails);
long totalCount = orderDetails.size();
long count = orderDetails.stream().filter(
@@ -551,7 +531,7 @@
public ProductionTurnoverDto workInProcessTurnover() {
ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();
List<ProductionTaskStatisticsDto> taskList = productionOperationTaskMapper
- .selectTaskStatisticsByDate(LocalDate.now().minusMonths(1), LocalDate.now());
+ .selectTaskStatisticsByDate(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()), LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()));
long sum = taskList.stream()
.filter(task -> defaultDecimal(task.getPlanQuantity()).compareTo(defaultDecimal(task.getCompleteQuantity())) > 0)
.map(ProductionTaskStatisticsDto::getPlanQuantity)
@@ -1051,7 +1031,7 @@
public List<Map<String, Object>> productInOutAnalysis(Integer type) {
String targetName;
if (type == 1) {
- targetName = "鍘熸潗鏂�";
+ targetName = "鍘熸枡";
} else if (type == 2) {
targetName = "鎴愬搧";
} else if (type == 3) {
@@ -1377,15 +1357,15 @@
String endStr = endDate.atStartOfDay()
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-// List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
- List<Map<String, Object>> inputList = null;
+ List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
+ //List<Map<String, Object>> inputList = null;
List<Map<String, Object>> outputList = productionProductOutputMapper.selectDailyOutputStats(startStr, endStr);
Map<String, InputOutputAnalysisDto> dateMap = new HashMap<>();
if (!CollectionUtils.isEmpty(inputList)) {
for (Map<String, Object> map : inputList) {
- String date = (String) map.get("date");
+ String date = (String) map.get("statDate");
if (date == null)
continue;
InputOutputAnalysisDto dto = dateMap.getOrDefault(date, new InputOutputAnalysisDto());
@@ -1398,7 +1378,7 @@
if (!CollectionUtils.isEmpty(outputList)) {
for (Map<String, Object> map : outputList) {
- String date = (String) map.get("date");
+ String date = (String) map.get("statDate");
if (date == null)
continue;
InputOutputAnalysisDto dto = dateMap.getOrDefault(date, new InputOutputAnalysisDto());
@@ -1657,16 +1637,16 @@
@Override
public List<MapDto> orderCount() {
LocalDate now = LocalDate.now();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String currentStart = now.withDayOfMonth(1).atStartOfDay()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- String currentEnd = now.atTime(LocalTime.MAX).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ LocalDateTime startDateTime = now.with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay();
+ LocalDateTime endDateTime = now.with(TemporalAdjusters.lastDayOfMonth()).atTime(LocalTime.MAX);
- LocalDate lastMonthDate = now.minusMonths(1);
- String lastStart = lastMonthDate.withDayOfMonth(1).atStartOfDay()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- String lastEnd = lastMonthDate.withDayOfMonth(lastMonthDate.lengthOfMonth()).atTime(LocalTime.MAX)
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ String currentStart = startDateTime.format(dateTimeFormatter);
+ String currentEnd = endDateTime.format(dateTimeFormatter);
+
+ String lastStart = startDateTime.minusMonths(1).format(dateTimeFormatter);
+ String lastEnd = endDateTime.format(dateTimeFormatter);
int currentCreated = productionOrderMapper.countCreated(currentStart, currentEnd);
int lastCreated = productionOrderMapper.countCreated(lastStart, lastEnd);
--
Gitblit v1.9.3