From bb665500aeb4442854865022a1c7cd4816a52fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 1 Jun 2022 19:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/dto/AddUpDeductionDTO.java | 1 + .../dto/AddUpDeductionRecordDTO.java | 14 ++++++++++ .../datacollection/dto/AddUpSituationDTO.java | 27 +++++++++++++++++++ .../dto/AddUpSituationRecordDTO.java | 24 +++++++++++++++++ .../impl/AddUpDeductionServiceImpl.java | 2 +- .../impl/SalaryArchiveServiceImpl.java | 18 ++++++++++--- .../service/impl/TaxAgentServiceImpl.java | 15 +++-------- .../salary/util/page/SalaryPageUtil.java | 3 +++ .../salary/wrapper/AddUpDeductionWrapper.java | 7 ----- 9 files changed, 87 insertions(+), 24 deletions(-) diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index f618c3f1c..b51211ea3 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -33,6 +33,7 @@ public class AddUpDeductionDTO { * 主键id */ @SalaryTableColumn(column = "id", display = false) + @TableTitle(title = "id", dataIndex = "id", key = "id", display = false) private Long id; /** diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java index df67bda86..96d7167e7 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.datacollection.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.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -23,6 +24,7 @@ public class AddUpDeductionRecordDTO { //主键id @SalaryTableColumn(column = "id", display = false) + @TableTitle(title = "id", dataIndex = "id", key = "id", display = false) private Long id; //员工id @@ -34,11 +36,13 @@ public class AddUpDeductionRecordDTO { //申报月份 @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") @SalaryTableColumn(text = "申报月份", width = "10%", column = "declareMonth", transmethod = "com.engine.salary.transmethod.TransMethod.timeToMoth") + @TableTitle(title = "申报月份", dataIndex = "declareMonth", key = "declareMonth") @ExcelProperty(index = 1) private Date declareMonth; //个税扣缴义务人 @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") + @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") @ExcelProperty(index = 2) private String taxAgentName; @@ -50,15 +54,18 @@ public class AddUpDeductionRecordDTO { //部门 @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 3) private String departmentName; //手机号 @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile") + @TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile") private String mobile; //工号 @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") + @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") @ExcelProperty(index = 4) private String jobNum; @@ -67,6 +74,7 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 5) @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") + @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") private String addUpChildEducation; /** @@ -74,6 +82,7 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 6) @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") private String addUpContinuingEducation; /** @@ -81,6 +90,7 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 7) @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") + @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") private String addUpHousingLoanInterest; /** @@ -88,6 +98,7 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 8) @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") + @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") private String addUpHousingRent; /** @@ -95,14 +106,17 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 9) @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") + @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") private String addUpSupportElderly; @ExcelProperty(index = 10) @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") private String addUpIllnessMedical; @ExcelProperty(index = 11) @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") private String addUpInfantCare; } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index 084d2c485..5ea09014e 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -4,6 +4,7 @@ import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.SalaryTableOperate; +import com.engine.salary.annotation.TableTitle; import com.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -26,6 +27,7 @@ public class AddUpSituationDTO { //主键id @JsonSerialize(using = ToStringSerializer.class) @SalaryTableColumn(column = "id", display = false) + @TableTitle(title = "id", dataIndex = "id", key = "id", display = false) private Long id; //员工id @@ -39,6 +41,7 @@ public class AddUpSituationDTO { //姓名 @SalaryTableColumn(text = "姓名", width = "10%", column = "username") + @TableTitle(title = "姓名", dataIndex = "username", key = "username") @ExcelProperty(index = 0) private String username; // @@ -47,6 +50,7 @@ public class AddUpSituationDTO { //个税扣缴义务人 @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") + @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") @ExcelProperty(index = 1) private String taxAgentName; @@ -57,114 +61,137 @@ public class AddUpSituationDTO { //部门 @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 2) private String departmentName; //手机号 @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile") + @TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile") @ExcelProperty(index = 3) private String mobile; //工号 @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") + @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") @ExcelProperty(index = 4) private String jobNum; //证件号码 @SalaryTableColumn(text = "证件号码", width = "10%", column = "idNo") + @TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo") @ExcelProperty(index = 5) private String idNo; //入职日期 @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate") + @TableTitle(title = "入职日期", dataIndex = "hiredate", key = "hiredate") @ExcelProperty(index = 6) private String hiredate; //累计收入额 @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome") + @TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome") @ExcelProperty(index = 7) private String addUpIncome; //累计减除费用 @SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction") + @TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction") @ExcelProperty(index = 8) private String addUpSubtraction; //累计社保个人合计 @SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal") + @TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal") @ExcelProperty(index = 9) private String addUpSocialSecurityTotal; //累计公积金个人合计 @SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal") + @TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal") @ExcelProperty(index = 10) private String addUpAccumulationFundTotal; //累计子女教育 @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") + @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") @ExcelProperty(index = 11) private String addUpChildEducation; //累计继续教育 @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") @ExcelProperty(index = 12) private String addUpContinuingEducation; //累计住房贷款利息 @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") + @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") @ExcelProperty(index = 13) private String addUpHousingLoanInterest; //累计住房租金 @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") + @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") @ExcelProperty(index = 14) private String addUpHousingRent; //累计赡养老人 @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") + @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") @ExcelProperty(index = 15) private String addUpSupportElderly; //累计大病医疗 @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") @ExcelProperty(index = 16) private String addUpIllnessMedical; //累计企业（职业）年金及其他福利 @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") + @TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther") @ExcelProperty(index = 17) private String addUpEnterpriseAndOther; //累计其他扣除 @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") + @TableTitle(title = "累计其他扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction") @ExcelProperty(index = 18) private String addUpOtherDeduction; //累计免税收入 @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome") + @TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome") @ExcelProperty(index = 19) private String addUpTaxExemptIncome; //累计准予扣除的捐赠额 @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation") + @TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation") @ExcelProperty(index = 20) private String addUpAllowedDonation; //累计减免税额 @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings") + @TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings") @ExcelProperty(index = 21) private String addUpTaxSavings; //累计已预扣预缴税额 @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax") + @TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax") @ExcelProperty(index = 22) private String addUpAdvanceTax; //累计婴幼儿照护 @ExcelProperty(index = 23) @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") private String addUpInfantCare; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") + @TableTitle(title = "操作", dataIndex = "operate", key = "operate") private String operate; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java index decbfe679..4c04f002c 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.datacollection.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.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -29,6 +30,7 @@ import java.util.Date; public class AddUpSituationRecordDTO { @SalaryTableColumn(column = "id", display = false) + @TableTitle(title = "id", dataIndex = "id", key = "id", display = false) private Long id; @ExcelProperty(index = 0) @@ -36,12 +38,14 @@ public class AddUpSituationRecordDTO { @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") @SalaryTableColumn(text = "税款所属期", width = "10%", column = "taxYearMonth", transmethod = "com.engine.salary.transmethod.TransMethod.timeToMoth") + @TableTitle(title = "税款所属期", dataIndex = "taxYearMonth", key = "taxYearMonth") @ExcelProperty(index = 1) private Date taxYearMonth; private Long employeeId; @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") + @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") @ExcelProperty(index = 2) private String taxAgentName; @@ -51,82 +55,102 @@ public class AddUpSituationRecordDTO { private Long taxAgentId; @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 3) private String departmentName; @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile") + @TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile") @ExcelProperty(index = 4) private String mobile; @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") + @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") @ExcelProperty(index = 5) private String jobNum; @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome") + @TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome") @ExcelProperty(index = 6) private String addUpIncome; @SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction") + @TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction") @ExcelProperty(index = 7) private String addUpSubtraction; @SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal") + @TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal") @ExcelProperty(index = 8) private String addUpSocialSecurityTotal; @SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal") + @TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal") @ExcelProperty(index = 9) private String addUpAccumulationFundTotal; @ExcelProperty(index = 10) @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") + @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") private String addUpChildEducation; @ExcelProperty(index = 11) @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") private String addUpContinuingEducation; @ExcelProperty(index = 12) @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") + @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") private String addUpHousingLoanInterest; @ExcelProperty(index = 13) @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") + @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") private String addUpHousingRent; @ExcelProperty(index = 14) @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") + @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") private String addUpSupportElderly; @ExcelProperty(index = 15) @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") private String addUpIllnessMedical; @ExcelProperty(index = 16) @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") + @TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther") private String addUpEnterpriseAndOther; @ExcelProperty(index = 17) @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") + @TableTitle(title = "累计其他扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction") private String addUpOtherDeduction; @ExcelProperty(index = 18) @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome") + @TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome") private String addUpTaxExemptIncome; @ExcelProperty(index = 19) @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation") + @TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation") private String addUpAllowedDonation; @ExcelProperty(index = 20) @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings") + @TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings") private String addUpTaxSavings; @ExcelProperty(index = 21) @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax") + @TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax") private String addUpAdvanceTax; @ExcelProperty(index = 22) @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") private String addUpInfantCare; } diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 42c97bb04..057df9e62 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -416,7 +416,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction @Override public PageInfo listPage(AddUpDeductionQueryParam queryParam) { - long employeeId = (long) user.getUID(); + long employeeId = user.getUID(); // 未开启分权或是薪酬模块总管理员 if (!getTaxAgentV2Service(user).isOpenDevolution() || getTaxAgentV2Service(user).isChief(employeeId)) { diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 204ccf7a6..ae5c9eee5 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -96,6 +96,14 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); if (needAuth) { + + Boolean adminEnable = getTaxAgentService(user).isAdminEnable(currentEmployeeId); + //不是管理员看不到数据，返回空 + if(!adminEnable){ + PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), SalaryArchiveListDTO.class); + return pageInfo; + } + //获取管理的人员范围 List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployee(currentEmployeeId); Set employeeId = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getEmployeeId); @@ -107,16 +115,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), SalaryArchiveListDTO.class); pageInfo.setTotal(finalAllArchive.size()); pageInfo.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), finalAllArchive)); - + return pageInfo; } else { SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getSalaryArchiveMapper().list(queryParam); PageInfo pageInfo = new PageInfo(list, SalaryArchiveListDTO.class); return pageInfo; } - - - return salaryArchiveMapper.listPage(queryParam); } /** @@ -219,6 +224,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe @Override public XSSFWorkbook exportList(SalaryArchiveQueryParam queryParam) { + long employeeId = user.getUID(); + // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资档案"); // 获取所有可被引用的薪资项目 @@ -239,6 +246,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listAll(); Collection salaryArchives = salaryArchiveMapper.list(queryParam); + + List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployee(employeeId); + List> listMaps = buildSalaryArchiveData(salaryArchives, taxAgentList, salaryItems, Boolean.FALSE); // 组装数据 List> rows = new ArrayList<>(); diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index 7a2efb812..c83c84a95 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -175,18 +175,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { @Override public Boolean isAdminEnable(Long currentEmployeeId) { - // 如果不是超管,是管理员 - if (!isChief(currentEmployeeId)) { - // 没有开启分权 - if (!isOpenDevolution()) { - return Boolean.FALSE; - } else { - // 自己有没有被分配为管理员 - List taxAgentAdminList = getTaxAgentAdminService(user).listByEmployeeId(currentEmployeeId); - return CollectionUtils.isNotEmpty(taxAgentAdminList); - } - } - return Boolean.TRUE; + //是管理员 + List taxAgentAdminList = getTaxAgentAdminService(user).listByEmployeeId(currentEmployeeId); + return CollectionUtils.isNotEmpty(taxAgentAdminList); } diff --git a/src/com/engine/salary/util/page/SalaryPageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java index bd8ab155f..bbb2917d5 100644 --- a/src/com/engine/salary/util/page/SalaryPageUtil.java +++ b/src/com/engine/salary/util/page/SalaryPageUtil.java @@ -3,6 +3,7 @@ package com.engine.salary.util.page; import com.github.pagehelper.PageHelper; import org.apache.commons.collections4.CollectionUtils; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -22,6 +23,7 @@ public class SalaryPageUtil { PageInfo pageInfo = new PageInfo<>(); pageInfo.setPageNum(pageNo); pageInfo.setPageSize(pageSize); + pageInfo.setList(new ArrayList<>()); return pageInfo; } @@ -31,6 +33,7 @@ public class SalaryPageUtil { PageInfo pageInfo = new PageInfo<>(clazz); pageInfo.setPageNum(pageNo); pageInfo.setPageSize(pageSize); + pageInfo.setList(new ArrayList<>()); return pageInfo; } diff --git a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java index 319ee1ab2..a2ad02299 100644 --- a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java +++ b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java @@ -18,7 +18,6 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import weaver.general.Util; import weaver.hrm.User; import java.util.List; @@ -63,12 +62,6 @@ public class AddUpDeductionWrapper extends Service { } PageInfo pageInfo = getAddUpDeductionService(user).listPage(queryParam); - List list = pageInfo.getList(); - // 人员信息赋值 - list.forEach(m -> { - // 身份证号 - m.setIdNo(Util.null2String(m.getIdNo())); - }); return pageInfo; }