From 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 11:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/system/SysUserDeptMapper.xml | 3 ++-
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 22 +++++++++++++++++-----
src/main/java/com/ruoyi/staff/pojo/StaffLeave.java | 1 +
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
index 3f5532c..619bbc3 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
@@ -33,6 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index c2d8519..3093c63 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -12,12 +12,10 @@
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
-import com.ruoyi.staff.pojo.SchemeApplicableStaff;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.pojo.StaffSalaryDetail;
-import com.ruoyi.staff.pojo.StaffSalaryMain;
+import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
@@ -61,6 +59,9 @@
@Autowired
private StaffOnJobMapper staffOnJobMapper;
+
+ @Autowired
+ private StaffLeaveMapper staffLeaveMapper;
@Autowired
private AccountExpenseMapper accountExpenseMapper;
@@ -155,10 +156,21 @@
if(CollectionUtils.isEmpty(longs)){
return AjaxResult.error("鏃犲憳宸�");
}
+ List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
+ // 鍒ゆ柇鍛樺伐鏄惁涓哄綋鏈堢鑱�
+ if((Integer) id.get("staffState") == 0){
+ StaffLeave id1 = staffLeaveMapper.selectOne(new LambdaQueryWrapper<StaffLeave>()
+ .eq(StaffLeave::getStaffOnJobId, id.get("id"))
+ .like(StaffLeave::getCreateTime, calculateSalaryDto.getDate()));
+ if(id1 == null){
+ continue;
+ }
+ }
schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
+ mapList.add(id);
}
- return AjaxResult.success(longs);
+ return AjaxResult.success(mapList);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 498442d..34d669f 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -9,7 +9,8 @@
T1.staff_no as staffNo,
T1.staff_name as staffName,
T2.dept_id as deptId,
- T2.dept_name as deptName
+ T2.dept_name as deptName,
+ T1.staff_state as staffState
FROM
staff_on_job T1
LEFT JOIN sys_dept T2 ON T1.sys_dept_id = T2.dept_id
--
Gitblit v1.9.3