From c816f2b9c72ed329fa9e6dbe8db1a0fcdcb3ac91 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 14 八月 2025 15:40:26 +0800
Subject: [PATCH] yys 新增劳保统计
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 606388c..7dea6df 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -8,6 +8,8 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
+import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
+import com.ruoyi.lavorissue.pojo.LaborIssue;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
@@ -33,6 +35,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.*;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
@@ -73,6 +77,9 @@
@Autowired
private PaymentRegistrationMapper paymentRegistrationMapper;
+
+ @Autowired
+ private LavorIssueMapper lavorIssueMapper;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -302,14 +309,35 @@
}
@Override
- public List<ApproveProcess> todos() {
+ public List<ApproveProcess> todos() throws ParseException {
LoginUser loginUser = SecurityUtils.getLoginUser();
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0)
.eq(ApproveProcess::getApproveUserCurrentId, loginUser.getUserId())
.ne(ApproveProcess::getApproveStatus, 2)
.eq(ApproveProcess::getTenantId, loginUser.getTenantId());
- return approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);
+ List<ApproveProcess> approveProcesses = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);
+ if(CollectionUtils.isEmpty(approveProcesses)){
+ approveProcesses = new ArrayList<>();
+ }
+ // 鏌ヨ鏈鐢ㄥ姵淇濊褰�
+ 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);
+ 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;
}
/**
--
Gitblit v1.9.3