Merge branch 'main' of https://gitee.com/hdka/fad_oa

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.OaSalaryVo;
+import com.ruoyi.oa.domain.bo.OaSalaryBo;
+import com.ruoyi.oa.service.IOaSalaryService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 薪资管理
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/salary")
+public class OaSalaryController extends BaseController {
+
+    private final IOaSalaryService iOaSalaryService;
+
+    /**
+     * 查询薪资管理列表
+     */
+    @SaCheckPermission("oa:salary:list")
+    @GetMapping("/list-staff")
+    public TableDataInfo<OaSalaryVo> list(OaSalaryBo bo, PageQuery pageQuery) {
+        return iOaSalaryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出薪资管理列表
+     */
+    @SaCheckPermission("oa:salary:export")
+    @Log(title = "薪资管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OaSalaryBo bo, HttpServletResponse response) {
+        List<OaSalaryVo> list = iOaSalaryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "薪资管理", OaSalaryVo.class, response);
+    }
+
+    /**
+     * 获取薪资管理详细信息
+     *
+     * @param salaryId 主键
+     */
+    @SaCheckPermission("oa:salary:query")
+    @GetMapping("/{salaryId}")
+    public R<OaSalaryVo> getInfo(@NotNull(message = "主键不能为空")
+                                 @PathVariable Long salaryId) {
+        return R.ok(iOaSalaryService.queryById(salaryId));
+    }
+
+    /**
+     * 新增薪资管理
+     */
+    @SaCheckPermission("oa:salary:add")
+    @Log(title = "薪资管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OaSalaryBo bo) {
+        return toAjax(iOaSalaryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改薪资管理
+     */
+    @SaCheckPermission("oa:salary:edit")
+    @Log(title = "薪资管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaSalaryBo bo) {
+        return toAjax(iOaSalaryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除薪资管理
+     *
+     * @param salaryIds 主键串
+     */
+    @SaCheckPermission("oa:salary:remove")
+    @Log(title = "薪资管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{salaryIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] salaryIds) {
+        return toAjax(iOaSalaryService.deleteWithValidByIds(Arrays.asList(salaryIds), true));
+    }
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryItemController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.OaSalaryItemVo;
+import com.ruoyi.oa.domain.bo.OaSalaryItemBo;
+import com.ruoyi.oa.service.IOaSalaryItemService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 薪水详情
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/salaryItem")
+public class OaSalaryItemController extends BaseController {
+
+    private final IOaSalaryItemService iOaSalaryItemService;
+
+    /**
+     * 查询薪水详情列表
+     */
+    @SaCheckPermission("oa:salaryItem:list")
+    @GetMapping("/list")
+    public TableDataInfo<OaSalaryItemVo> list(OaSalaryItemBo bo, PageQuery pageQuery) {
+        return iOaSalaryItemService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出薪水详情列表
+     */
+    @SaCheckPermission("oa:salaryItem:export")
+    @Log(title = "薪水详情", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OaSalaryItemBo bo, HttpServletResponse response) {
+        List<OaSalaryItemVo> list = iOaSalaryItemService.queryList(bo);
+        ExcelUtil.exportExcel(list, "薪水详情", OaSalaryItemVo.class, response);
+    }
+
+    /**
+     * 获取薪水详情详细信息
+     *
+     * @param salaryItemId 主键
+     */
+    @SaCheckPermission("oa:salaryItem:query")
+    @GetMapping("/{salaryItemId}")
+    public R<OaSalaryItemVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long salaryItemId) {
+        return R.ok(iOaSalaryItemService.queryById(salaryItemId));
+    }
+
+    /**
+     * 新增薪水详情
+     */
+    @SaCheckPermission("oa:salaryItem:add")
+    @Log(title = "薪水详情", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OaSalaryItemBo bo) {
+        return toAjax(iOaSalaryItemService.insertByBo(bo));
+    }
+
+    /**
+     * 修改薪水详情
+     */
+    @SaCheckPermission("oa:salaryItem:edit")
+    @Log(title = "薪水详情", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaSalaryItemBo bo) {
+        return toAjax(iOaSalaryItemService.updateByBo(bo));
+    }
+
+    /**
+     * 删除薪水详情
+     *
+     * @param salaryItemIds 主键串
+     */
+    @SaCheckPermission("oa:salaryItem:remove")
+    @Log(title = "薪水详情", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{salaryItemIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] salaryItemIds) {
+        return toAjax(iOaSalaryItemService.deleteWithValidByIds(Arrays.asList(salaryItemIds), true));
+    }
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalary.java

@@ -0,0 +1,58 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 薪资管理对象 oa_salary
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_salary")
+public class OaSalary extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "salary_id")
+    private Long salaryId;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 实际工资
+     */
+    private Double realSalary;
+    /**
+     * 涉及时间
+     */
+    private Date payTime;
+    /**
+     * 基础日薪
+     */
+    private Double baseSalary;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalaryItem.java

@@ -0,0 +1,66 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 薪水详情对象 oa_salary_item
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_salary_item")
+public class OaSalaryItem extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "salary_item_id")
+    private Long salaryItemId;
+    /**
+     * 奖惩类型
+     */
+    private Long type;
+    /**
+     * 加/减理由
+     */
+    private String reason;
+    /**
+     * 涉及金额
+     */
+    private Double price;
+    /**
+     * 奖罚记号1奖0罚
+     */
+    private Long flag;
+    /**
+     * 外键id
+     */
+    private Long salaryId;
+    /**
+     * 设计日期
+     */
+    private Date signTime;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryBo.java

@@ -0,0 +1,60 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 薪资管理业务对象 oa_salary
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaSalaryBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long salaryId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 实际工资
+     */
+    private Double realSalary;
+
+    /**
+     * 涉及时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date payTime;
+
+    /**
+     * 基础日薪
+     */
+    private Double baseSalary;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryItemBo.java

@@ -0,0 +1,74 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 薪水详情业务对象 oa_salary_item
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaSalaryItemBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long salaryItemId;
+
+    /**
+     * 奖惩类型
+     */
+    @NotNull(message = "奖惩类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long type;
+
+    /**
+     * 理由
+     */
+    private String reason;
+
+    /**
+     * 涉及金额
+     */
+    @NotNull(message = "涉及金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Double price;
+
+    /**
+     * 奖罚记号1奖0罚
+     */
+    @NotNull(message = "奖罚记号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long flag;
+
+    /**
+     * 外键id
+     */
+    private Long salaryId;
+
+    /**
+     * 涉及日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date signTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryItemVo.java

@@ -0,0 +1,76 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 薪水详情视图对象 oa_salary_item
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaSalaryItemVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long salaryItemId;
+
+    /**
+     * 奖惩类型
+     */
+    @ExcelProperty(value = "奖惩类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "oa_salary_type")
+    private Long type;
+
+    /**
+     * 加/减理由
+     */
+    @ExcelProperty(value = "加/减理由")
+    private String reason;
+
+    /**
+     * 涉及金额
+     */
+    @ExcelProperty(value = "涉及金额")
+    private Double price;
+
+    /**
+     * 奖罚记号1奖0罚
+     */
+    @ExcelProperty(value = "奖罚记号1奖0罚")
+    private Long flag;
+
+    /**
+     * 外键id
+     */
+    @ExcelProperty(value = "外键id")
+    private Long salaryId;
+
+    /**
+     * 设计日期
+     */
+    @ExcelProperty(value = "设计日期")
+    private Date signTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryVo.java

@@ -0,0 +1,72 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.oa.domain.OaSalary;
+import com.ruoyi.oa.domain.bo.OaSalaryBo;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 薪资管理视图对象 oa_salary
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaSalaryVo extends OaSalary {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long salaryId;
+
+
+    /**
+     * 人名
+     */
+    @ExcelProperty(value = "姓名")
+    private String nickName;
+
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 实际工资
+     */
+    @ExcelProperty(value = "实际工资")
+    private Double realSalary;
+
+    /**
+     * 涉及时间
+     */
+    @ExcelProperty(value = "涉及时间")
+    private Date payTime;
+
+    /**
+     * 基础日薪
+     */
+    @ExcelProperty(value = "基础日薪")
+    private Double baseSalary;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostAllVo.java

@@ -29,15 +29,15 @@ public class SysOaCostAllVo {
 
     private Long materialId;
 
-    private Object materialVo;
+    private Object materialCost;
 
     private Long userId;
 
-    private Object userVo;
+    private Object userCost;
 
     private Long claimId;
 
-    private Object claimVo;
+    private Object claimCost;
 
     private Long financeId;
 

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaSalaryItemMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.OaSalaryItem;
+import com.ruoyi.oa.domain.vo.OaSalaryItemVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 薪水详情Mapper接口
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+public interface OaSalaryItemMapper extends BaseMapperPlus<OaSalaryItemMapper, OaSalaryItem, OaSalaryItemVo> {
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaSalaryMapper.java

@@ -0,0 +1,21 @@
+package com.ruoyi.oa.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.oa.domain.OaSalary;
+import com.ruoyi.oa.domain.vo.OaSalaryVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 薪资管理Mapper接口
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+public interface OaSalaryMapper extends BaseMapperPlus<OaSalaryMapper, OaSalary, OaSalaryVo> {
+
+    Page<OaSalaryVo> selectStaffVoPage(Page<Object> build,@Param(Constants.WRAPPER) Wrapper<OaSalary> lqw);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java

@@ -32,4 +32,10 @@ public interface SysOaAttendanceMapper extends BaseMapperPlus<SysOaAttendanceMap
                                             @Param("startTime") Date startTime,
                                             @Param("endTime") Date endTime);
 
+    /**
+     * 计算人天数
+     */
+    Double getAttendanceDay(@Param("userId") Long userId,
+                            @Param("projectId") Long projectId );
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaClaimMapper.java

@@ -23,4 +23,6 @@ public interface SysOaClaimMapper extends BaseMapperPlus<SysOaClaimMapper, SysOa
     Page<SysOaClaimVo> selectPageVo(Page<Object> build, @Param(Constants.WRAPPER) Wrapper<SysOaClaim> lqw);
 
     SysOaClaimVo selectSysOaClaimVoByProcInsId(String procInsId);
+
+    Double getClaimCost(Long claimId);
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaSalaryItemService.java

@@ -0,0 +1,49 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.OaSalaryItem;
+import com.ruoyi.oa.domain.vo.OaSalaryItemVo;
+import com.ruoyi.oa.domain.bo.OaSalaryItemBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 薪水详情Service接口
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+public interface IOaSalaryItemService {
+
+    /**
+     * 查询薪水详情
+     */
+    OaSalaryItemVo queryById(Long salaryItemId);
+
+    /**
+     * 查询薪水详情列表
+     */
+    TableDataInfo<OaSalaryItemVo> queryPageList(OaSalaryItemBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询薪水详情列表
+     */
+    List<OaSalaryItemVo> queryList(OaSalaryItemBo bo);
+
+    /**
+     * 新增薪水详情
+     */
+    Boolean insertByBo(OaSalaryItemBo bo);
+
+    /**
+     * 修改薪水详情
+     */
+    Boolean updateByBo(OaSalaryItemBo bo);
+
+    /**
+     * 校验并批量删除薪水详情信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaSalaryService.java

@@ -0,0 +1,49 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.OaSalary;
+import com.ruoyi.oa.domain.vo.OaSalaryVo;
+import com.ruoyi.oa.domain.bo.OaSalaryBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 薪资管理Service接口
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+public interface IOaSalaryService {
+
+    /**
+     * 查询薪资管理
+     */
+    OaSalaryVo queryById(Long salaryId);
+
+    /**
+     * 查询薪资管理列表
+     */
+    TableDataInfo<OaSalaryVo> queryPageList(OaSalaryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询薪资管理列表
+     */
+    List<OaSalaryVo> queryList(OaSalaryBo bo);
+
+    /**
+     * 新增薪资管理
+     */
+    Boolean insertByBo(OaSalaryBo bo);
+
+    /**
+     * 修改薪资管理
+     */
+    Boolean updateByBo(OaSalaryBo bo);
+
+    /**
+     * 校验并批量删除薪资管理信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryItemServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.domain.bo.OaSalaryItemBo;
+import com.ruoyi.oa.domain.vo.OaSalaryItemVo;
+import com.ruoyi.oa.domain.OaSalaryItem;
+import com.ruoyi.oa.mapper.OaSalaryItemMapper;
+import com.ruoyi.oa.service.IOaSalaryItemService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 薪水详情Service业务层处理
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@RequiredArgsConstructor
+@Service
+public class OaSalaryItemServiceImpl implements IOaSalaryItemService {
+
+    private final OaSalaryItemMapper baseMapper;
+
+    /**
+     * 查询薪水详情
+     */
+    @Override
+    public OaSalaryItemVo queryById(Long salaryItemId){
+        return baseMapper.selectVoById(salaryItemId);
+    }
+
+    /**
+     * 查询薪水详情列表
+     */
+    @Override
+    public TableDataInfo<OaSalaryItemVo> queryPageList(OaSalaryItemBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<OaSalaryItem> lqw = buildQueryWrapper(bo);
+        Page<OaSalaryItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询薪水详情列表
+     */
+    @Override
+    public List<OaSalaryItemVo> queryList(OaSalaryItemBo bo) {
+        LambdaQueryWrapper<OaSalaryItem> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<OaSalaryItem> buildQueryWrapper(OaSalaryItemBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OaSalaryItem> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getType() != null, OaSalaryItem::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getReason()), OaSalaryItem::getReason, bo.getReason());
+        lqw.eq(bo.getPrice() != null, OaSalaryItem::getPrice, bo.getPrice());
+        lqw.eq(bo.getFlag() != null, OaSalaryItem::getFlag, bo.getFlag());
+        lqw.eq(bo.getSalaryId() != null, OaSalaryItem::getSalaryId, bo.getSalaryId());
+        lqw.eq(bo.getSignTime() != null, OaSalaryItem::getSignTime, bo.getSignTime());
+        return lqw;
+    }
+
+    /**
+     * 新增薪水详情
+     */
+    @Override
+    public Boolean insertByBo(OaSalaryItemBo bo) {
+        OaSalaryItem add = BeanUtil.toBean(bo, OaSalaryItem.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setSalaryItemId(add.getSalaryItemId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改薪水详情
+     */
+    @Override
+    public Boolean updateByBo(OaSalaryItemBo bo) {
+        OaSalaryItem update = BeanUtil.toBean(bo, OaSalaryItem.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(OaSalaryItem entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除薪水详情
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryServiceImpl.java

@@ -0,0 +1,112 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.domain.bo.OaSalaryBo;
+import com.ruoyi.oa.domain.vo.OaSalaryVo;
+import com.ruoyi.oa.domain.OaSalary;
+import com.ruoyi.oa.mapper.OaSalaryMapper;
+import com.ruoyi.oa.service.IOaSalaryService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 薪资管理Service业务层处理
+ *
+ * @author hdka
+ * @date 2025-03-06
+ */
+@RequiredArgsConstructor
+@Service
+public class OaSalaryServiceImpl implements IOaSalaryService {
+
+    private final OaSalaryMapper baseMapper;
+
+    /**
+     * 查询薪资管理
+     */
+    @Override
+    public OaSalaryVo queryById(Long salaryId){
+        return baseMapper.selectVoById(salaryId);
+    }
+
+    /**
+     * 查询薪资管理列表
+     */
+    @Override
+    public TableDataInfo<OaSalaryVo> queryPageList(OaSalaryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<OaSalary> lqw = buildQueryWrapper(bo);
+        Page<OaSalaryVo> result = baseMapper.selectStaffVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询薪资管理列表
+     */
+    @Override
+    public List<OaSalaryVo> queryList(OaSalaryBo bo) {
+        LambdaQueryWrapper<OaSalary> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<OaSalary> buildQueryWrapper(OaSalaryBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OaSalary> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, OaSalary::getUserId, bo.getUserId());
+        lqw.eq(bo.getRealSalary() != null, OaSalary::getRealSalary, bo.getRealSalary());
+        lqw.eq(bo.getPayTime() != null, OaSalary::getPayTime, bo.getPayTime());
+        lqw.eq(bo.getBaseSalary() != null, OaSalary::getBaseSalary, bo.getBaseSalary());
+        return lqw;
+    }
+
+    /**
+     * 新增薪资管理
+     */
+    @Override
+    public Boolean insertByBo(OaSalaryBo bo) {
+        OaSalary add = BeanUtil.toBean(bo, OaSalary.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setSalaryId(add.getSalaryId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改薪资管理
+     */
+    @Override
+    public Boolean updateByBo(OaSalaryBo bo) {
+        OaSalary update = BeanUtil.toBean(bo, OaSalary.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(OaSalary entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除薪资管理
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.oa.domain.SysOaAttendance;
 import com.ruoyi.oa.domain.SysOaProject;
 import com.ruoyi.oa.domain.vo.*;
 import com.ruoyi.oa.mapper.*;
@@ -22,6 +23,7 @@ import com.ruoyi.oa.domain.SysOaCost;
 import com.ruoyi.oa.service.ISysOaCostService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 项目成本分析Service业务层处理
@@ -42,6 +44,8 @@ public class SysOaCostServiceImpl implements ISysOaCostService {
 
     private final SysOaWarehouseMapper warehouseMapper;
 
+    private final SysOaAttendanceMapper attendanceMapper;
+
 
     /**
      * 查询项目成本分析
@@ -134,32 +138,73 @@ public class SysOaCostServiceImpl implements ISysOaCostService {
      */
 
     @Override
-    public TableDataInfo<SysOaCostAllVo> AllList(String projectName, String createTime) {
+    public TableDataInfo<SysOaCostAllVo> AllList(String projectName, String createTime) {  //  包括每个项目的成本分析，每个都有这几种类型，即每个项目返回几列数据
+
 
         List<SysOaCostAll> alls = baseMapper.AllList(projectName,createTime);
+        log.info("alls:{}",alls);
         List<SysOaCostAllVo> allVos = new java.util.ArrayList<>(Collections.emptyList());
         if (alls.isEmpty()) return TableDataInfo.build(allVos);
         for (SysOaCostAll all : alls) {
             SysOaCostAllVo allVo = BeanUtil.toBean(all, SysOaCostAllVo.class);
+            log.info("allVo:{}", allVo);
 
+            if (allVo.getCostType() == null) allVo.setCost(0.0);
                 // 车间用工
-            if (allVo.getCostType() == 1) {
+            else {if (allVo.getCostType() == 1) { //根据出勤，计算人天数
-                allVo.setUserVo(userMapper.selectUserById(allVo.getUserId()));
+                Double days = attendanceMapper.getAttendanceDay(allVo.getUserId(), allVo.getProjectId());
-            } else if (allVo.getCostType() == 2) { // 差旅花费
+                Long laborCost = userMapper.selectUserById(allVo.getUserId()).getLaborCost();
-                allVo.setClaimVo(claimMapper.selectSysOaClaimVoById(allVo.getClaimId()));
+                if (days == null || laborCost == null) allVo.setUserCost(0.0);
+                else allVo.setUserCost(days * laborCost);
+            } else if (allVo.getCostType() == 2) { // 差旅花费 差旅花费 = 该项目下的所有差旅费用
+                allVo.setClaimCost(claimMapper.getClaimCost(allVo.getClaimId()));
 
-            } else if (allVo.getCostType() == 3) { // 库房物料
+            } else if (allVo.getCostType() == 3) { // 库房物料 物料花费 =物料价格*数量
-                allVo.setMaterialVo(warehouseMapper.selectVoById(allVo.getMaterialId()));
+                SysOaWarehouseVo warehouseVo = warehouseMapper.selectVoById(allVo.getMaterialId());
+                if (warehouseVo == null) allVo.setMaterialCost(0.0);
+                else allVo.setMaterialCost(warehouseVo.getInventory() * warehouseVo.getPrice());
 
             } else if (allVo.getCostType() == 4) { // 其他
 
 
             } else if (allVo.getCostType() == 5) { // 接待
 
-            }
+            }}
             allVos.add(allVo);
+
         }
-        return TableDataInfo.build(allVos);
+
+// 假设原始数据列表为 allVos
+        List<SysOaCostAllVo> resVos = allVos.stream()
+                .collect(Collectors.groupingBy(SysOaCostAllVo::getProjectId))
+                .values().stream()
+                .map(group -> {
+                    Double userCostSum = group.stream().mapToDouble(x -> Optional.ofNullable((Double)x.getUserCost()).orElse(0.0)).sum();
+
+                    Double claimCostSum = group.stream().mapToDouble(x ->  Optional.ofNullable((Double)x.getUserCost()).orElse(0.0)).sum();
+                    Double materialCostSum = group.stream().mapToDouble(x ->  Optional.ofNullable((Double)x.getUserCost()).orElse(0.0)).sum();
+                    Double totalCost = userCostSum + claimCostSum + materialCostSum;
+
+                    return new SysOaCostAllVo(
+                            group.get(0).getProjectId(),
+                            group.get(0).getProjectName(),
+                            totalCost,
+                            null,
+                            "汇总数据",  // 备注
+                            null,
+                            null,      // materialId
+                            materialCostSum,
+                            null,      // userId
+                            userCostSum,
+                            null,      // claimId
+                            claimCostSum,
+                            null// financeId
+                    );
+                })
+                .collect(Collectors.toList());
+
+
+        return TableDataInfo.build(resVos);
     }
 
     /**
@@ -167,12 +212,12 @@ public class SysOaCostServiceImpl implements ISysOaCostService {
      */
     @Override
     public TableDataInfo<SysOaCostRow> getDetail(Long projectId) {
-        log.info("查询projectId = {}", projectId);
+//        log.info("查询projectId = {}", projectId);
 //        LambdaQueryWrapper<SysOaCost> lqw = Wrappers.lambdaQuery(SysOaCost.class);
 //        lqw.eq(SysOaCost::getProjectId,projectId);
 //        List<SysOaCost> costs = baseMapper.selectList(lqw);
         List<SysOaCost> costs = baseMapper.getListByProjectId(projectId);
-        log.info("查询costs = {}", costs);
+//        log.info("查询costs = {}", costs);
 
         if (costs.isEmpty()) {
             return TableDataInfo.build();
@@ -188,15 +233,15 @@ public class SysOaCostServiceImpl implements ISysOaCostService {
             log.info("sysOaCostList = {}", sysOaCostList);
 
             if(cost.getCostType() == 1) {
-                log.info("查询useVo = {}", userMapper.selectUserById(cost.getUserId()));
+//                log.info("查询useVo = {}", userMapper.selectUserById(cost.getUserId()));
                 sysOaCostList.setUserVo(userMapper.selectUserById(cost.getUserId()));
                 sysOaCostRow.getUserCostList().add(sysOaCostList);
             } else if(cost.getCostType() == 2) {
-                log.info("查询claimMapperVo = {}", claimMapper.selectSysOaClaimVoById(cost.getClaimId()));
+//                log.info("查询claimMapperVo = {}", claimMapper.selectSysOaClaimVoById(cost.getClaimId()));
                 sysOaCostList.setClaimVo(claimMapper.selectSysOaClaimVoById(cost.getClaimId()));
                 sysOaCostRow.getClaimList().add(sysOaCostList);
             } else if(cost.getCostType() == 3) {
-                log.info("查询warehouseMapperVo = {}",warehouseMapper.selectVoById(cost.getMaterialId()));
+//                log.info("查询warehouseMapperVo = {}",warehouseMapper.selectVoById(cost.getMaterialId()));
                 sysOaCostList.setMaterialVo(warehouseMapper.selectVoById(cost.getMaterialId()));
                 sysOaCostRow.getMaterialList().add(sysOaCostList);
             } else{
@@ -204,7 +249,7 @@ public class SysOaCostServiceImpl implements ISysOaCostService {
             }
 
         }
-        log.info("sysOaCostRow = {}", sysOaCostRow);
+//        log.info("sysOaCostRow = {}", sysOaCostRow);
         List<SysOaCostRow> rows = new java.util.ArrayList<>(Collections.singletonList(sysOaCostRow));
         return TableDataInfo.build(rows);
 

ruoyi-oa/src/main/resources/mapper/oa/OaSalaryItemMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.OaSalaryItemMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.OaSalaryItem" id="OaSalaryItemResult">
+        <result property="salaryItemId" column="salary_item_id"/>
+        <result property="type" column="type"/>
+        <result property="reason" column="reason"/>
+        <result property="price" column="price"/>
+        <result property="flag" column="flag"/>
+        <result property="salaryId" column="salary_id"/>
+        <result property="signTime" column="sign_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.OaSalaryMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.vo.OaSalaryVo" id="OaSalaryResult">
+        <result property="salaryId" column="salary_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="realSalary" column="real_salary"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="baseSalary" column="base_salary"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+        <result property="nickName" column="nick_name"/>
+    </resultMap>
+
+
+    <select id="selectStaffVoPage" resultMap="OaSalaryResult">
+        SELECT
+            os.salary_id,
+            os.user_id,
+            os.pay_time,
+            os.base_salary,
+            (os.base_salary * DAY(LAST_DAY(#{payTime})) +
+             COALESCE(SUM(CASE
+                              WHEN osi.flag = 1 THEN osi.price
+                              WHEN osi.flag = 0 AND osi.type = 3 THEN -2 * osi.price
+                              WHEN osi.flag = 0 THEN -osi.price
+                              ELSE 0
+                 END), 0)
+                ) AS real_salary,
+            osi.salary_item_id,
+            osi.sign_time,
+            su.nick_name
+        FROM oa_salary os
+                 LEFT JOIN oa_salary_item osi ON osi.salary_id = os.salary_id
+            AND YEAR(osi.sign_time) = YEAR(#{payTime})
+            AND MONTH(osi.sign_time) = MONTH(#{payTime})
+                LEFT JOIN sys_user su on os.user_id = su.user_id
+        WHERE YEAR(os.pay_time) = YEAR(#{payTime})
+          AND MONTH(os.pay_time) = MONTH(#{payTime})
+        GROUP BY os.salary_id, os.user_id, os.pay_time, os.base_salary, osi.salary_item_id, osi.type, osi.reason, osi.price, osi.sign_time;
+        ${ew.getCustomSqlSegment}
+    </select>
+
+
+</mapper>

ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml

@@ -151,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND attendance_day = #{attendanceDay}
     </select>
 
+
     <delete id="delOaAttendanceAll">
         delete from sys_oa_attendance where
                                           attendance_day = #{day}
@@ -158,4 +159,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                         and create_time > #{firstDay}
     </delete>
 
+
+
+    <select id="getAttendanceDay" resultType="java.lang.Double">
+    select sum(day_length)
+    from sys_oa_attendance
+    where user_id = #{userId} and project_id = #{projectId} and del_flag = '0'
+    </select>
+
 </mapper>

ruoyi-oa/src/main/resources/mapper/oa/SysOaClaimMapper.xml

@@ -168,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join sys_oa_project sop on soc.project_id = sop.project_id
         where soc.proc_ins_id = #{procInsId}
     </select>
+    <select id="getClaimCost" resultType="java.lang.Double">
+            SELECT SUM(cost) FROM sys_oa_claim WHERE claim_id = #{claimId} and del_flag = '0'
+    </select>
 
 
 </mapper>