This commit is contained in:
钱涛 2023-07-20 14:05:19 +08:00
parent 6bb66d0520
commit 38f3461c64
14 changed files with 253 additions and 169 deletions

View File

@ -1,21 +1,21 @@
package com.engine.salary.entity.taxdeclaration.bo;
/**
* @description: 生成个税申报表
* @author: xiajun
* @modified By: xiajun
* @date: Created in 2022/12/1 4:47 PM
* @version:v1.0
*/
public interface TaxDeclarationStrategy {
/**
* 生成个税申报表
*
* @param taxDeclareContext
* @param employeeId
* @param tenantKey
* @return
*/
TaxDeclarationGenerateResult generate(TaxDeclareContext taxDeclareContext, Long employeeId, String tenantKey);
}
//package com.engine.salary.entity.taxdeclaration.bo;
//
///**
// * @description: 生成个税申报表
// * @author: xiajun
// * @modified By: xiajun
// * @date: Created in 2022/12/1 4:47 PM
// * @version:v1.0
// */
//public interface TaxDeclarationStrategy {
//
// /**
// * 生成个税申报表
// *
// * @param taxDeclareContext
// * @param employeeId
// * @param tenantKey
// * @return
// */
// TaxDeclarationGenerateResult generate(TaxDeclareContext taxDeclareContext, Long employeeId, String tenantKey);
//}

View File

@ -1,14 +1,11 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.weaver.common.component.table.type.WeaTableTypeEnum;
import com.weaver.hrm.salary.annotation.SalaryTable;
import com.weaver.hrm.salary.annotation.SalaryTableColumn;
import com.weaver.hrm.salary.enums.employeedeclare.DeclareStatusEnum;
import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.ser.std.ToStringSerializer;
/**
* @description: 个税申报-校验异常的人员列表
@ -19,7 +16,6 @@ import org.codehaus.jackson.map.ser.std.ToStringSerializer;
*/
@Data
@Accessors(chain = true)
@SalaryTable(tableType = WeaTableTypeEnum.NONE, pageUid = "abnormalEmployeeList")
public class AbnormalEmployeeListDTO {
@ApiModelProperty("主键id")
@ -33,46 +29,21 @@ public class AbnormalEmployeeListDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long employeeId;
@SalaryTableColumn(
label = "姓名",
labelId = 85429,
width = "150"
)
@ApiModelProperty("姓名")
private String employeeName;
@SalaryTableColumn(
label = "工号",
labelId = 86317,
width = "150"
)
@ApiModelProperty("工号")
private String jobNum;
@SalaryTableColumn(
label = "证件类型",
labelId = 105139,
width = "150"
)
@ApiModelProperty("证件类型")
private String cardType;
@SalaryTableColumn(
label = "证件号码",
labelId = 86318,
width = "150"
)
@ApiModelProperty("证件号码")
private String cardNum;
@ApiModelProperty("报送状态")
private DeclareStatusEnum declareStatus;
@SalaryTableColumn(
label = "报送状态",
labelId = 177862,
width = "150"
)
@ApiModelProperty("报送状态")
private String declareStatusDesc;
}

View File

@ -1,13 +1,10 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.weaver.common.component.table.type.WeaTableTypeEnum;
import com.weaver.hrm.salary.annotation.SalaryTable;
import com.weaver.hrm.salary.annotation.SalaryTableColumn;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.ser.std.ToStringSerializer;
/**
* @description: 个税申报-申报失败的人员列表
@ -18,18 +15,12 @@ import org.codehaus.jackson.map.ser.std.ToStringSerializer;
*/
@Data
@Accessors(chain = true)
@SalaryTable(tableType = WeaTableTypeEnum.NONE, pageUid = "failEmployeeList")
public class FailEmployeeListDTO {
@ApiModelProperty("主键id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@SalaryTableColumn(
label = "姓名",
labelId = 85429,
width = "150"
)
@ApiModelProperty("姓名")
private String employeeName;
@ -37,35 +28,15 @@ public class FailEmployeeListDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long taxAgentId;
@SalaryTableColumn(
label = "个税扣缴义务人名称",
labelId = 91558,
width = "150"
)
@ApiModelProperty("个税扣缴义务人名称")
private String taxAgentName;
@SalaryTableColumn(
label = "证件号码",
labelId = 86318,
width = "150"
)
@ApiModelProperty("证件号码")
private String cardNum;
@SalaryTableColumn(
label = "失败原因",
labelId = 156405,
width = "150"
)
@ApiModelProperty("失败原因")
private String errorMsg;
@SalaryTableColumn(
label = "所得项目",
labelId = 102786,
width = "150"
)
@ApiModelProperty("所得项目")
private String incomeCategory;
}

View File

@ -1,8 +1,8 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.weaver.hrm.salary.enums.salarysob.IncomeCategoryEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.weaver.common.component.table.column.WeaTableColumn;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import lombok.Data;
import lombok.experimental.Accessors;

View File

@ -1,9 +1,6 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.weaver.common.component.form.item.WeaFormItemType;
import com.weaver.hrm.salary.annotation.SalaryForm;
import com.weaver.hrm.salary.annotation.SalaryFormItem;
import com.weaver.hrm.salary.enums.taxdeclaration.TaxAgentRangeEnum;
import com.engine.salary.enums.taxdeclaration.TaxAgentRangeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -29,36 +26,15 @@ import java.util.Map;
@ApiModel("个税申报记录表单")
public class TaxDeclareRecordFormDTO {
@SalaryForm(
label = "薪资所属月",
labelId = 87614,
items = @SalaryFormItem(itemType = WeaFormItemType.DATEPICKER, required = true)
)
@ApiModelProperty("薪资所属月")
private YearMonth salaryMonth;
@SalaryForm(
label = "个税扣缴义务人范围",
labelId = 160476,
items = @SalaryFormItem(itemType = WeaFormItemType.RADIO, required = true, optionsEnum = TaxAgentRangeEnum.class)
)
@ApiModelProperty("个税扣缴义务人范围")
private TaxAgentRangeEnum taxAgentRange;
@SalaryForm(
label = "个税扣缴义务人",
labelId = 86184,
items = @SalaryFormItem(itemType = WeaFormItemType.BROWSER, required = true, browserModule = "hrmsalary",
browserType = "TaxAgentBrowser", browserMultiple = true)
)
@ApiModelProperty("个税扣缴义务人id")
private List<Map<String, Object>> taxAgentIds;
@SalaryForm(
label = "备注",
labelId = 84961,
items = @SalaryFormItem(itemType = WeaFormItemType.INPUT, maxLength = "30")
)
@ApiModelProperty("备注")
private String description;
}

View File

@ -1,13 +1,9 @@
package com.engine.salary.entity.taxdeclaration.dto;
import com.engine.salary.enums.taxdeclaration.TaxDeclareStatusEnum;
import com.engine.salary.enums.taxdeclaration.TaxDeclareTypeEnum;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.weaver.common.component.table.type.WeaTableTypeEnum;
import com.weaver.hrm.salary.annotation.SalaryTable;
import com.weaver.hrm.salary.annotation.SalaryTableColumn;
import com.weaver.hrm.salary.annotation.SalaryTableOperate;
import com.weaver.hrm.salary.enums.taxdeclaration.TaxDeclareStatusEnum;
import com.weaver.hrm.salary.enums.taxdeclaration.TaxDeclareTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ -21,10 +17,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@SalaryTable(value = {
@SalaryTableOperate(index = 0, text = "查看详情", labelId = 93216, outer = true),
@SalaryTableOperate(index = 1, text = "删除", labelId = 87061, outer = true)
}, tableType = WeaTableTypeEnum.NONE, pageUid = "taxAgentDeclareList")
public class TaxDeclareRecordListDTO {
@JsonSerialize(using = ToStringSerializer.class)
@ -34,57 +26,27 @@ public class TaxDeclareRecordListDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long taxAgentId;
@SalaryTableColumn(
label = "个税扣缴义务人",
labelId = 86184,
width = "15%"
)
@ApiModelProperty("个税扣缴义务人名称")
private String taxAgentName;
@SalaryTableColumn(
label = "薪资所属月",
labelId = 87614,
width = "10%"
)
@ApiModelProperty("薪资所属月")
private String salaryMonth;
@SalaryTableColumn(
label = "税款所属期",
labelId = 86176,
width = "10%"
)
@ApiModelProperty("税款所属期")
private String taxCycle;
@ApiModelProperty("申报类型")
private TaxDeclareTypeEnum taxDeclareType;
@SalaryTableColumn(
label = "申报类型",
labelId = 177641,
width = "10%"
)
@ApiModelProperty("申报类型")
private String taxDeclareTypeDesc;
@ApiModelProperty("申报状态")
private TaxDeclareStatusEnum taxDeclareStatus;
@SalaryTableColumn(
label = "申报状态",
labelId = 156414,
width = "10%"
)
@ApiModelProperty("申报状态")
private String taxDeclareStatusDesc;
@SalaryTableColumn(
label = "已缴金额",
labelId = 179035,
width = "10%"
)
@ApiModelProperty("已缴金额")
private String taxPaidAmount;
@ -92,27 +54,12 @@ public class TaxDeclareRecordListDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long operateEmployeeId;
@SalaryTableColumn(
label = "操作人",
labelId = 85435,
width = "10%"
)
@ApiModelProperty("操作人名称")
private String operateEmployeeName;
@SalaryTableColumn(
label = "操作时间",
labelId = 85436,
width = "15%"
)
@ApiModelProperty("操作时间")
private String operateTime;
@SalaryTableColumn(
label = "备注",
labelId = 84961,
width = "10%"
)
@ApiModelProperty("备注")
private String description;

View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.taxdeclaration.param;
import com.engine.salary.common.BaseQueryParam;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.weaver.hrm.salary.common.BaseQueryParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.taxdeclaration.param;
import com.weaver.hrm.salary.common.BaseQueryParam;
import com.weaver.hrm.salary.enums.salarysob.IncomeCategoryEnum;
import com.engine.salary.common.BaseQueryParam;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

View File

@ -0,0 +1,42 @@
package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
/**
* @description: 证件类型
* @author: xiajun
* @modified By: xiajun
* @date: Created in 9/6/22 1:56 PM
* @version:v1.0
*/
public enum CardTypeEnum implements BaseEnum<Integer> {
RESIDENT_IDENTITY_CARDS(0, "居民身份证", 105564);
CardTypeEnum(int value, String defaultLabel, int labelId) {
this.value = value;
this.defaultLabel = defaultLabel;
this.labelId = labelId;
}
private int value;
private String defaultLabel;
private int labelId;
@Override
public Integer getValue() {
return value;
}
@Override
public String getDefaultLabel() {
return defaultLabel;
}
@Override
public Integer getLabelId() {
return labelId;
}
}

View File

@ -0,0 +1,45 @@
package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
/**
* @description: 人员报送状态
* @author: xiajun
* @modified By: xiajun
* @date: Created in 9/5/22 10:29 AM
* @version:v1.0
*/
public enum DeclareStatusEnum implements BaseEnum<Integer> {
NOT_DECLARE(1, "待报送", 158772),
DECLARING(2, "报送中", 158773),
DECLARE_FAIL(3, "报送失败", 158770),
DECLARE_SUCCESS(4, "报送成功", 158774);
DeclareStatusEnum(int value, String defaultLabel, int labelId) {
this.value = value;
this.defaultLabel = defaultLabel;
this.labelId = labelId;
}
private int value;
private String defaultLabel;
private int labelId;
@Override
public Integer getValue() {
return value;
}
@Override
public String getDefaultLabel() {
return defaultLabel;
}
@Override
public Integer getLabelId() {
return labelId;
}
}

View File

@ -0,0 +1,43 @@
package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
/**
* @description: 人员状态
* @author: xiajun
* @modified By: xiajun
* @date: Created in 9/6/22 10:57 AM
* @version:v1.0
*/
public enum EmploymentStatusEnum implements BaseEnum<Integer> {
NORMAL(0, "正常", 160477),
ABNORMAL(1, "非正常", 160478);
EmploymentStatusEnum(int value, String defaultLabel, int labelId) {
this.value = value;
this.defaultLabel = defaultLabel;
this.labelId = labelId;
}
private int value;
private String defaultLabel;
private int labelId;
@Override
public Integer getValue() {
return value;
}
@Override
public String getDefaultLabel() {
return defaultLabel;
}
@Override
public Integer getLabelId() {
return labelId;
}
}

View File

@ -0,0 +1,46 @@
package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
/**
* @description: 任职受雇从业类型
* @author: xiajun
* @modified By: xiajun
* @date: Created in 9/6/22 10:59 AM
* @version:v1.0
*/
public enum EmploymentTypeEnum implements BaseEnum<Integer> {
EMPLOYEE(0, "雇员", 160479),
INSURANCE_SALESMAN(1, "保险营销员", 160480),
SECURITIES_BROKER(2, "证券经纪人", 160481),
INTERNSHIP_STUDENTS(3, "实习学生(全日制学历教育)", 181935),
OTHER(4, "其他", 102799);
EmploymentTypeEnum(int value, String defaultLabel, int labelId) {
this.value = value;
this.defaultLabel = defaultLabel;
this.labelId = labelId;
}
private int value;
private String defaultLabel;
private int labelId;
@Override
public Integer getValue() {
return value;
}
@Override
public String getDefaultLabel() {
return defaultLabel;
}
@Override
public Integer getLabelId() {
return labelId;
}
}

View File

@ -0,0 +1,43 @@
package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
/**
* @description: 性别
* @author: xiajun
* @modified By: xiajun
* @date: Created in 9/6/22 10:33 AM
* @version:v1.0
*/
public enum GenderEnum implements BaseEnum<Integer> {
MALE(0, "", 102440),
FEMALE(1, "", 102442);
GenderEnum(int value, String defaultLabel, int labelId) {
this.value = value;
this.defaultLabel = defaultLabel;
this.labelId = labelId;
}
private int value;
private String defaultLabel;
private int labelId;
@Override
public Integer getValue() {
return value;
}
@Override
public String getDefaultLabel() {
return defaultLabel;
}
@Override
public Integer getLabelId() {
return labelId;
}
}