From 0735bdf99b673cea535bd1cea27b4464bc78f394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 7 Apr 2022 09:50:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/SalaryItemAdjustRecordListDTO.java | 12 ++++ .../SingleTaxAgentAdjustRecordListDTO.java | 71 +++++-------------- .../dto/TaxAgentAdjustRecordListDTO.java | 11 +++ .../service/SalaryAcctRecordService.java | 2 - .../wrapper/SalaryAcctRecordWrapper.java | 27 +++---- 5 files changed, 52 insertions(+), 71 deletions(-) diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java index 8af78946f..181337569 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryarchive.dto; +import com.engine.salary.annotation.TableTitle; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -42,6 +43,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85429, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "姓名", dataIndex = "username", key = "username") private String username; //部门") @@ -50,6 +52,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 86185, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") private String departmentName; //员工状态") @@ -58,6 +61,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 86187, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "员工状态", dataIndex = "employeeStatus", key = "employeeStatus") private String employeeStatus; //调整项目") @@ -66,6 +70,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85432, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "调整项目", dataIndex = "adjustItem", key = "adjustItem") private String adjustItem; //调整前") @@ -74,6 +79,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85433, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "调整前", dataIndex = "adjustBefore", key = "adjustBefore") private String adjustBefore; //调整后") @@ -82,6 +88,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85434, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "调整后", dataIndex = "adjustAfter", key = "adjustAfter") private String adjustAfter; //调整原因") @@ -90,6 +97,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85431, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "调整原因", dataIndex = "adjustReason", key = "adjustReason") private String adjustReason; //生效日期") @@ -99,6 +107,7 @@ public class SalaryItemAdjustRecordListDTO { // tableColumn = @TableColumn(width = "100") // ) @JsonFormat(pattern = "yyyy-MM-dd") + @TableTitle(title = "生效日期", dataIndex = "effectiveTime", key = "effectiveTime") private Date effectiveTime; //操作人") @@ -107,6 +116,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 85435, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "操作人", dataIndex = "operator", key = "operator") private String operator; //操作时间") @@ -116,6 +126,7 @@ public class SalaryItemAdjustRecordListDTO { // tableColumn = @TableColumn(width = "150") // ) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableTitle(title = "操作时间", dataIndex = "operateTime", key = "operateTime") private Date operateTime; //备注") @@ -124,6 +135,7 @@ public class SalaryItemAdjustRecordListDTO { // labelId = 84961, // tableColumn = @TableColumn(width = "100") // ) + @TableTitle(title = "备注", dataIndex = "description", key = "description") private String description; /** diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SingleTaxAgentAdjustRecordListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SingleTaxAgentAdjustRecordListDTO.java index 079cb5405..63233e300 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SingleTaxAgentAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SingleTaxAgentAdjustRecordListDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryarchive.dto; +import com.engine.salary.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -22,74 +23,40 @@ import java.util.Date; // @Operates(index = 1, text = "删除" ,labelId = 59942) //}, tableType = WeaTableTypeEnum.NONE) public class SingleTaxAgentAdjustRecordListDTO { -// //主键id") + // //主键id") // @JsonSerialize(using = ToStringSerializer.class) private Long id; -// -// //调整前") -// @WeaFormat( -// label = "调整前", -// labelId = 85433, -// tableColumn = @TableColumn(width = "20%") -// ) + + @TableTitle(title = "调整前", dataIndex = "adjustBefore", key = "adjustBefore") private String adjustBefore; -// -// //调整后") -// @WeaFormat( -// label = "调整后", -// labelId = 85434, -// tableColumn = @TableColumn(width = "20%") -// ) + + @TableTitle(title = "调整后", dataIndex = "adjustAfter", key = "adjustAfter") private String adjustAfter; -// -// //调整原因") -// @WeaFormat( -// label = "调整原因", -// labelId = 85431, -// tableColumn = @TableColumn(width = "10%") -// ) + + @TableTitle(title = "调整原因", dataIndex = "adjustReason", key = "adjustReason") private String adjustReason; -// -// //生效日期") -// @WeaFormat( -// label = "生效日期", -// labelId = 85430, -// tableColumn = @TableColumn(width = "15%") -// ) + // @JsonFormat(pattern = "yyyy-MM-dd") + @TableTitle(title = "生效日期", dataIndex = "effectiveTime", key = "effectiveTime") private Date effectiveTime; -// -// //操作人") -// @WeaFormat( -// label = "操作人", -// labelId = 85435, -// tableColumn = @TableColumn(width = "10%") -// ) + + @TableTitle(title = "操作人", dataIndex = "operator", key = "operator") private String operator; -// -// //操作时间") -// @WeaFormat( -// label = "操作时间", -// labelId = 85436, -// tableColumn = @TableColumn(width = "20%") -// ) + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableTitle(title = "操作时间", dataIndex = "operateTime", key = "operateTime") private Date operateTime; -// -// //备注") -// @WeaFormat( -// label = "备注", -// labelId = 84961, -// tableColumn = @TableColumn(width = "10%") -// ) + // + + @TableTitle(title = "备注", dataIndex = "description", key = "description") private String description; -// + // // /** // * 薪资档案id // */ // @JsonIgnore private Long salaryArchiveId; -// + // // /** // * 个税扣缴义务人id // */ diff --git a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentAdjustRecordListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentAdjustRecordListDTO.java index fa9e9f5b2..468d0bc40 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentAdjustRecordListDTO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.salaryarchive.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; +import com.engine.salary.annotation.TableTitle; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -40,34 +41,44 @@ public class TaxAgentAdjustRecordListDTO { private Long employeeId; @SalaryTableColumn(text = "姓名", width = "10%", column = "username") + @TableTitle(title = "姓名",dataIndex = "username",key = "username") private String username; @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") + @TableTitle(title = "部门",dataIndex = "departmentName",key = "departmentName") private String departmentName; @SalaryTableColumn(text = "员工状态", width = "10%", column = "employeeStatus") + @TableTitle(title = "员工状态",dataIndex = "employeeStatus",key = "employeeStatus") private String employeeStatus; @SalaryTableColumn(text = "调整前", width = "10%", column = "adjustBefore") + @TableTitle(title = "调整前",dataIndex = "adjustBefore",key = "adjustBefore") private String adjustBefore; @SalaryTableColumn(text = "调整后", width = "10%", column = "adjustAfter") + @TableTitle(title = "调整后",dataIndex = "adjustAfter",key = "adjustAfter") private String adjustAfter; @SalaryTableColumn(text = "调整原因", width = "10%", column = "adjustReason") + @TableTitle(title = "调整原因",dataIndex = "adjustReason",key = "adjustReason") private String adjustReason; @SalaryTableColumn(text = "生效日期", width = "10%", column = "effectiveTime") + @TableTitle(title = "生效日期",dataIndex = "effectiveTime",key = "effectiveTime") private Date effectiveTime; @SalaryTableColumn(text = "操作人", width = "10%", column = "operator") + @TableTitle(title = "操作人",dataIndex = "operator",key = "operator") private String operator; @SalaryTableColumn(text = "操作时间", width = "10%", column = "operateTime") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableTitle(title = "操作时间",dataIndex = "operateTime",key = "operateTime") private Date operateTime; @SalaryTableColumn(text = "备注", width = "10%", column = "description") + @TableTitle(title = "备注",dataIndex = "description",key = "description") private String description; /** diff --git a/src/com/engine/salary/service/SalaryAcctRecordService.java b/src/com/engine/salary/service/SalaryAcctRecordService.java index a14e96bd8..a7a305cd3 100644 --- a/src/com/engine/salary/service/SalaryAcctRecordService.java +++ b/src/com/engine/salary/service/SalaryAcctRecordService.java @@ -82,7 +82,6 @@ public interface SalaryAcctRecordService { * 根据薪资账套ID查询薪资核算记录 * * @param salarySobIds 薪资账套id - * @param tenantKey 租户key * @return */ List listBySalarySobIds(Collection salarySobIds); @@ -99,7 +98,6 @@ public interface SalaryAcctRecordService { * 薪资核算记录所用的薪资账套薪资周期、考勤周期…… * * @param id 薪资核算记录的id - * @param tenantKey 租户key * @return */ SalarySobCycleDTO getSalarySobCycleById(Long id); diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java index f1f887f1a..73fe78b18 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java @@ -1,35 +1,32 @@ //package com.engine.salary.wrapper; // +//import com.cloudstore.eccom.pc.table.WeaTable; //import com.engine.core.impl.Service; -//import com.weaver.common.cache.tablecache.impl.ComInfoCache; +//import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO; +//import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam; +//import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; +//import com.engine.salary.service.SalaryAcctEmployeeService; +//import com.engine.salary.service.SalaryAcctRecordService; +//import com.engine.salary.service.SalarySobService; //import com.weaver.common.component.form.WeaForm; //import com.weaver.common.component.form.item.WeaFormOption; -//import com.weaver.common.component.table.WeaTable; //import com.weaver.common.component.table.page.Page; //import com.weaver.common.component.table.permission.Permission; //import com.weaver.common.hrm.cache.HrmEmployeeComInfo; //import com.weaver.hrm.salary.entity.salaryacct.bo.SalaryAcctRecordBO; //import com.weaver.hrm.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO; //import com.weaver.hrm.salary.entity.salaryacct.dto.SalaryAcctRecordFormDTO; -//import com.weaver.hrm.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO; -//import com.weaver.hrm.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam; //import com.weaver.hrm.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam; -//import com.weaver.hrm.salary.entity.salaryacct.po.SalaryAcctRecordPO; //import com.weaver.hrm.salary.entity.salarysob.dto.SalarySobCycleDTO; //import com.weaver.hrm.salary.entity.salarysob.po.SalarySobPO; //import com.weaver.hrm.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; //import com.weaver.hrm.salary.exception.SalaryRunTimeException; -//import com.weaver.hrm.salary.service.SalaryAcctEmployeeService; -//import com.weaver.hrm.salary.service.SalaryAcctRecordService; -//import com.weaver.hrm.salary.service.SalarySobService; //import com.weaver.hrm.salary.util.SalaryDateUtil; //import com.weaver.hrm.salary.util.SalaryEntityUtil; //import com.weaver.hrm.salary.util.SalaryFormatUtil; //import com.weaver.hrm.salary.util.SalaryI18nUtil; //import org.apache.commons.collections4.CollectionUtils; //import org.apache.commons.lang3.math.NumberUtils; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; // //import java.util.*; //import java.util.stream.Collectors; @@ -44,18 +41,14 @@ // **/ //public class SalaryAcctRecordWrapper extends Service { // -// @Autowired // private SalaryAcctRecordService salaryAcctRecordService; -// @Autowired // private SalarySobService salarySobService; -// @Autowired // private SalaryAcctEmployeeService salaryAcctEmployeeService; -// @Autowired -// private ComInfoCache comInfoCache; +//// private ComInfoCache comInfoCache; // -// public WeaTable listPage(SalaryAcctRecordQueryParam queryParam, String tenantKey) { +// public WeaTable listPage(SalaryAcctRecordQueryParam queryParam) { // // 查询薪资核算记录（分页） -// Page page = salaryAcctRecordService.listPageByParam(queryParam, tenantKey); +// Page page = salaryAcctRecordService.listPageByParam(queryParam); // Page dtoPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal(), page.isSearchCount()); // if (CollectionUtils.isNotEmpty(page.getRecords())) { // // 查询薪资账套