DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

薪资接口的新要求

Browse Source
This commit is contained in:
Joshi
2025-06-26 13:56:07 +08:00
parent 5dda61bda6
commit c9f7131f04
13 changed files with 272 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaEmployeeTemplateBinding.java
View File

@@ -1,14 +1,13 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 员工模板绑定及月度发放记录对象 oa_employee_template_binding
@@ -21,7 +20,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
@TableName("oa_employee_template_binding")
public class OaEmployeeTemplateBinding extends BaseEntity {
private static final long serialVersionUID=1L;
private static final long serialVersionUID = 1L;
/**
* 记录ID
@@ -32,10 +31,12 @@ public class OaEmployeeTemplateBinding extends BaseEntity {
* 员工ID → oa_employee.employee_id
*/
private Long employeeId;
/**
* 保险模板ID → oa_insurance_template.insurance_template_id
*/
private Long insuranceTemplateId;
// /**
// * 保险模板ID → oa_insurance_template.insurance_template_id
// */
// private Long insuranceTemplateId;
private Long personalInsuranceTemplateId;
private Long companyInsuranceTemplateId;
/**
* 薪资模板ID → oa_salary_template.salary_template_id
*/

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaInsuranceTemplate.java
View File

@@ -31,6 +31,10 @@ public class OaInsuranceTemplate extends BaseEntity {
* 模板名称
*/
private String templateName;
/**
* 模板类型'0个税1企业'
*/
private int type;
/**
* 删除标志 0=未删,1=已删
*/

1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
View File

@@ -89,6 +89,7 @@ public class SysOaFinance extends BaseEntity {
/**
* 一对一关联项目表
*/
@TableField(exist = false)
private SysOaProject project;
/**

19
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaEmployeeTemplateBindingBo.java
View File

@@ -35,11 +35,20 @@ public class OaEmployeeTemplateBindingBo extends BaseEntity {
*/
private Long employeeId;
private List<Long> employeeIds;
//
// /**
// * 保险模板ID → oa_insurance_template.insurance_template_id
// */
// private Long insuranceTemplateId;
/**
* 保险模板ID → oa_insurance_template.insurance_template_id
* personal_insurance_template_id bigint not null comment '个人保险模板ID → oa_insurance_template.insurance_template_id',
*/
private Long insuranceTemplateId;
private Long personalInsuranceTemplateId;
/*
* company_insurance_template_id bigint not null comment '企业保险模板ID → oa_insurance_temp
* */
private Long companyInsuranceTemplateId;
/**
* 薪资模板ID → oa_salary_template.salary_template_id
@@ -75,7 +84,9 @@ public class OaEmployeeTemplateBindingBo extends BaseEntity {
* 备注
*/
private String remark;
private Long defaultInsuranceTemplateId; // 新增：默认社保模板ID
// private Long defaultInsuranceTemplateId; // 新增：默认社保模板ID
private Long defaultPersonalInsuranceTemplateId;
private Long defaultCompanyInsuranceTemplateId;
private Long defaultSalaryTemplateId; // 新增：默认薪资模板ID

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaInsuranceTemplateBo.java
View File

@@ -35,6 +35,10 @@ public class OaInsuranceTemplateBo extends BaseEntity {
* 备注
*/
private String remark;
/**
* 模板类型type'0个税1企业',
*/
private int type;
}

20
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaEmployeeTemplateBindingVo.java
View File

@@ -34,11 +34,15 @@ public class OaEmployeeTemplateBindingVo {
@ExcelProperty(value = "员工ID → oa_employee.employee_id")
private Long employeeId;
/**
* 保险模板ID → oa_insurance_template.insurance_template_id
*/
@ExcelProperty(value = "保险模板ID → oa_insurance_template.insurance_template_id")
private Long insuranceTemplateId;
// /**
// * 保险模板ID → oa_insurance_template.insurance_template_id
// */
// @ExcelProperty(value = "保险模板ID → oa_insurance_template.insurance_template_id")
// private Long insuranceTemplateId;
@ExcelProperty(value = "个人保险模板ID")
private Long personalInsuranceTemplateId;
@ExcelProperty(value = "企业保险模板ID")
private Long companyInsuranceTemplateId;
/**
* 薪资模板ID → oa_salary_template.salary_template_id
@@ -61,7 +65,7 @@ public class OaEmployeeTemplateBindingVo {
/**
* 实发工资
*/
@ExcelProperty(value = "实发工资")
@ExcelProperty(value = "预计发放工资")
private BigDecimal netSalary;
/**
@@ -85,5 +89,9 @@ public class OaEmployeeTemplateBindingVo {
@ExcelProperty(value = "实发工资")
private BigDecimal totalSalary;
private BigDecimal totalPersonalInsurance;
private BigDecimal totalCompanyInsurance;
private String company; // 所属公司
private String deptName; // 所属部门名称
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaInsuranceTemplateVo.java
View File

@@ -38,6 +38,11 @@ public class OaInsuranceTemplateVo {
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 模板类型type'0个税1企业',
*/
@ExcelProperty(value = "模板类型'0个税1企业'")
private int type;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain.vo;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -118,6 +119,7 @@ public class SysOaFinanceVo extends SysOaFinance {
/**
* 一对一关联项目表
*/
@TableField(exist = false)
private SysOaProject project;
/**