From f50da3afc73bc458640677c198bb7c99de5b2fe5 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 09 三月 2026 17:33:45 +0800
Subject: [PATCH] fix(mybatis): 修正createUser和updateUser填充值类型空值处理
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
new file mode 100644
index 0000000..f299b95
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -0,0 +1,142 @@
+package com.ruoyi.staff.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
+import com.ruoyi.staff.pojo.SchemeApplicableStaff;
+import com.ruoyi.staff.pojo.StaffSalaryDetail;
+import com.ruoyi.staff.pojo.StaffSalaryMain;
+import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
+import com.ruoyi.staff.service.StaffSalaryDetailService;
+import com.ruoyi.staff.service.StaffSalaryMainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヨ祫涓昏〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 01:22:05
+ */
+@Service
+public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
+
+ @Autowired
+ private StaffSalaryMainMapper staffSalaryMainMapper;
+
+ @Autowired
+ private StaffSalaryDetailService staffSalaryDetailService;
+
+ @Autowired
+ private StaffSalaryDetailMapper staffSalaryDetailMapper;
+
+ @Autowired
+ private SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
+
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Override
+ public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ LambdaQueryWrapper<StaffSalaryMain> staffSalaryMainLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(staffSalaryMain != null){
+ if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryTitle())){
+ staffSalaryMainLambdaQueryWrapper.like(StaffSalaryMain::getSalaryTitle, staffSalaryMain.getSalaryTitle());
+ }
+ if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryMonth())){
+ staffSalaryMainLambdaQueryWrapper.like(StaffSalaryMain::getSalaryMonth, staffSalaryMain.getSalaryMonth());
+ }
+ if(staffSalaryMain.getStatus() != null){
+ staffSalaryMainLambdaQueryWrapper.eq(StaffSalaryMain::getStatus, staffSalaryMain.getStatus());
+ }
+ }
+ Page<StaffSalaryMain> page1 = staffSalaryMainMapper.selectPage(page, staffSalaryMainLambdaQueryWrapper);
+ page1.getRecords().forEach(main -> {
+ List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
+ main.setStaffSalaryDetailList(staffSalaryDetailList);
+ });
+ return AjaxResult.success(page1);
+ }
+
+ @Override
+ public AjaxResult add(StaffSalaryMain staffSalaryMain) {
+ staffSalaryMainMapper.insert(staffSalaryMain);
+ staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
+ detail.setMainId(staffSalaryMain.getId());
+ });
+ staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
+ return AjaxResult.success("鏂板鎴愬姛");
+ }
+
+ @Override
+ public AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
+ if(staffSalaryMain == null){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
+ if(staffSalaryMain1 == null){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ // 寰呭鏍镐笉鍙紪杈�
+ if(staffSalaryMain1.getStatus() > 2){
+ return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
+ }
+ staffSalaryMainMapper.updateById(staffSalaryMain);
+ staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, staffSalaryMain.getId()));
+ staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
+ detail.setMainId(staffSalaryMain.getId());
+ });
+ staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
+ return AjaxResult.success("淇敼鎴愬姛");
+ }
+
+ @Override
+ public AjaxResult delete(List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ staffSalaryMainMapper.deleteBatchIds(ids);
+ staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().in(StaffSalaryDetail::getMainId, ids));
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+
+ @Override
+ public AjaxResult calculateSalary(List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(ids); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
+ if(CollectionUtils.isEmpty(longs)){
+ return AjaxResult.error("鏃犲憳宸�");
+ }
+ for (Map<String, Object> id : longs) {
+ schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id);
+ }
+ return AjaxResult.success(longs);
+ }
+
+ public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return new ArrayList<>();
+ }
+ // 閫氳繃閮ㄩ棬鑾峰彇浜哄憳id
+ return sysUserDeptMapper.setSchemeApplicableStaffUserInfo(ids);
+ }
+}
--
Gitblit v1.9.3