qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪资账套分权

This commit is contained in:
钱涛 2022-05-31 21:05:59 +08:00
parent 5596d88c6f
commit efd31013cd
26 changed files with 130 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java
View File

@ -87,6 +87,11 @@ public class SalarySobBasicFormDTO {
//备注")
private String description;
/**
* 分权，是否可编辑
*/
private Boolean canEdit;
/**
* 薪资账套详情-薪资周期/考勤周期
*

12
src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java
View File

@ -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.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
@ -35,23 +36,30 @@ public class SalarySobListDTO {
//主键id
@JsonSerialize(using = ToStringSerializer.class)
@SalaryTableColumn(column = "id", display = false)
@TableTitle(title = "id", key = "id", dataIndex = "id", display = false)
private Long id;
@SalaryTableColumn(text = "账套名称", width = "10%", column = "name")
@TableTitle(title = "账套名称", key = "name", dataIndex = "name")
private String name;
@SalaryTableColumn(text = "薪资周期", width = "10%", column = "salaryCycle",transmethod = "com.engine.salary.transmethod.TransMethod.buildSalaryCycle",otherPara = "column:salaryCycleFromDay")
@SalaryTableColumn(text = "薪资周期", width = "10%", column = "salaryCycle", transmethod = "com.engine.salary.transmethod.TransMethod.buildSalaryCycle", otherPara = "column:salaryCycleFromDay")
@TableTitle(title = "薪资周期", key = "salaryCycle", dataIndex = "salaryCycle")
private String salaryCycle;
@SalaryTableColumn(text = "薪资周期起始日期", width = "10%", column = "salaryCycleFromDay",display = false)
@SalaryTableColumn(text = "薪资周期起始日期", width = "10%", column = "salaryCycleFromDay", display = false)
@TableTitle(title = "薪资周期起始日期", key = "salaryCycleFromDay", dataIndex = "salaryCycleFromDay", display = false)
private String salaryCycleFromDay;
@SalaryTableColumn(text = "启用", width = "10%", column = "disable")
@TableTitle(title = "启用", key = "disable", dataIndex = "disable")
private Integer disable;
@SalaryTableColumn(text = "备注", width = "10%", column = "description")
@TableTitle(title = "备注", key = "description", dataIndex = "description")
private String description;
@SalaryTableColumn(text = "操作", width = "20%", column = "operate")
@TableTitle(title = "操作", key = "operate", dataIndex = "operate")
private String operate;
}

2
src/com/engine/salary/service/TaxAgentV2Service.java → src/com/engine/salary/service/TaxAgentService.java
View File

@ -16,7 +16,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
public interface TaxAgentV2Service {
public interface TaxAgentService {
/**
* 获取当前登录人角色（返回最大角色，优先级为：总管理员-》管理员-》分管理员）

4
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -61,8 +61,8 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
return MapperProxyFactory.getProxy(AddUpDeductionMapper.class);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryAcctRecordService getSalaryAcctRecordService(User user) {

6
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -24,7 +24,7 @@ import com.engine.salary.mapper.datacollection.AddUpSituationMapper;
import com.engine.salary.service.AddUpDeductionService;
import com.engine.salary.service.AddUpSituationService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
@ -63,8 +63,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
return ServiceUtil.getService(AddUpDeductionServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {
return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);

6
src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
View File

@ -20,7 +20,7 @@ import com.engine.salary.mapper.datacollection.OtherDeductionMapper;
import com.engine.salary.service.AddUpDeductionService;
import com.engine.salary.service.OtherDeductionService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
@ -54,8 +54,8 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
return MapperProxyFactory.getProxy(OtherDeductionMapper.class);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private AddUpDeductionService getAddUpDeductionService(User user) {
return ServiceUtil.getService(AddUpDeductionServiceImpl.class, user);

6
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -27,7 +27,7 @@ import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper;
import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper;
import com.engine.salary.service.SIImportService;
import com.engine.salary.service.SISchemeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.util.*;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelParseHelper;
@ -84,8 +84,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
}
private TaxAgentV2Service getTaxAgentService() {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService() {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private InsuranceSchemeDetailMapper getInsuranceSchemeDetailMapper() {

4
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -95,8 +95,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
return (SalaryComparisonResultService) ServiceUtil.getService(SalaryComparisonResultServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}

4
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -95,8 +95,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
return (SalaryAcctRecordService) ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {

6
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -25,7 +25,7 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.SalaryArchiveService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.excel.ExcelComment;
@ -72,8 +72,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
private SalaryItemBiz salaryItemMapper = new SalaryItemBiz();
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
@Override

6
src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.mapper.archive.SalaryArchiveMapper;
import com.engine.salary.mapper.archive.SalaryArchiveTaxAgentMapper;
import com.engine.salary.service.SalaryArchiveTaxAgentService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelUtil;
@ -48,8 +48,8 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
return MapperProxyFactory.getProxy(SalaryArchiveTaxAgentMapper.class);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
// private SalaryBatchService salaryBatchService;

4
src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
View File

@ -79,8 +79,8 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryFormulaService getSalaryFormulaService(User user) {

4
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -93,8 +93,8 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
return SqlProxyHandle.getProxy(SalaryAcctResultMapper.class);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {

4
src/com/engine/salary/service/impl/SalarySobServiceImpl.java
View File

@ -82,8 +82,8 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private TaxAgentAdminService getTaxAgentAdminService(User user) {

4
src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
View File

@ -55,8 +55,8 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
return MapperProxyFactory.getProxy(TaxAgentManageRangeMapper.class);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private TaxAgentSubAdminService taxAgentSubAdminService;

2
src/com/engine/salary/service/impl/TaxAgentV2ServiceImpl.java → src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
View File

@ -47,7 +47,7 @@ import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
public class TaxAgentV2ServiceImpl extends Service implements TaxAgentV2Service {
public class TaxAgentServiceImpl extends Service implements TaxAgentService {
// private ExtEmployeeService extEmployeeService;
SalaryRoleBiz salaryRoleBiz = new SalaryRoleBiz();

8
src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
View File

@ -10,10 +10,10 @@ import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.AddUpDeductionService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.AddUpDeductionServiceImpl;
import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
@ -39,8 +39,8 @@ public class AddUpDeductionWrapper extends Service {
return ServiceUtil.getService(AddUpDeductionServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {

8
src/com/engine/salary/wrapper/AddUpSituationWrapper.java
View File

@ -10,10 +10,10 @@ import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.AddUpSituationService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.AddUpSituationServiceImpl;
import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -34,8 +34,8 @@ public class AddUpSituationWrapper extends Service {
private AddUpSituationService getAddUpSituationService(User user) {
return ServiceUtil.getService(AddUpSituationServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {
return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);

8
src/com/engine/salary/wrapper/OtherDeductionWrapper.java
View File

@ -15,10 +15,10 @@ import com.engine.salary.entity.datacollection.po.OtherDeductionPO;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.OtherDeductionService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.OtherDeductionServiceImpl;
import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -39,8 +39,8 @@ public class OtherDeductionWrapper extends Service {
private OtherDeductionService getOtherDeductionService(User user) {
return ServiceUtil.getService(OtherDeductionServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentV2Service(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {
return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);

8
src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java
View File

@ -14,10 +14,10 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.SalaryAcctEmployeeService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalaryAcctEmployeeServiceImpl;
import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
@ -45,8 +45,8 @@ public class SalaryAcctEmployeeWrapper extends Service {
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
/**

8
src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java
View File

@ -15,9 +15,9 @@ import com.engine.salary.enums.UserStatusEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.SalaryArchiveTaxAgentService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalaryArchiveTaxAgentServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.google.common.collect.Lists;
@ -41,8 +41,8 @@ public class SalaryArchiveTaxAgentWrapper extends Service {
return (SalaryArchiveTaxAgentService) ServiceUtil.getService(SalaryArchiveTaxAgentServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return (TaxAgentV2Service) ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return (TaxAgentService) ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
//

8
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -28,10 +28,10 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEn
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.SalaryArchiveItemService;
import com.engine.salary.service.SalaryArchiveService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalaryArchiveItemServiceImpl;
import com.engine.salary.service.impl.SalaryArchiveServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.google.common.collect.Lists;
@ -63,8 +63,8 @@ public class SalaryArchiveWrapper extends Service {
private EmployBiz employeeService = new EmployBiz();
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
// private SalaryBatchService salaryBatchService;

8
src/com/engine/salary/wrapper/SalarySendWrapper.java
View File

@ -24,10 +24,10 @@ import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.mapper.salarybill.SalarySendMapper;
import com.engine.salary.service.SalarySendService;
import com.engine.salary.service.SalaryTemplateService;
import com.engine.salary.service.TaxAgentV2Service;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalarySendServiceImpl;
import com.engine.salary.service.impl.SalaryTemplateServiceImpl;
import com.engine.salary.service.impl.TaxAgentV2ServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
@ -49,8 +49,8 @@ import java.util.stream.Collectors;
* @Date: 2022/3/16 13:57
*/
public class SalarySendWrapper extends Service {
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private SalarySendService getSalarySendService(User user) {

71
src/com/engine/salary/wrapper/SalarySobWrapper.java
View File

@ -4,22 +4,24 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.entity.salarysob.bo.SalarySobBO;
import com.engine.salary.entity.salarysob.dto.SalarySobBasicFormDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobListDTO;
import com.engine.salary.entity.salarysob.param.SalarySobBasicSaveParam;
import com.engine.salary.entity.salarysob.param.SalarySobDisableParam;
import com.engine.salary.entity.salarysob.param.SalarySobDuplicateParam;
import com.engine.salary.entity.salarysob.param.SalarySobListQueryParam;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.SalarySobService;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalarySobServiceImpl;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import weaver.hrm.User;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.*;
/**
* 薪资账套
@ -36,6 +38,7 @@ public class SalarySobWrapper extends Service {
return (SalarySobService) ServiceUtil.getService(SalarySobServiceImpl.class, user);
}
private TaxAgentService taxAgentService;
/**
* 薪资账套列表
@ -43,20 +46,18 @@ public class SalarySobWrapper extends Service {
* @param queryParam 列表查询参数
* @return
*/
public Map<String, Object> listPage(SalarySobListQueryParam queryParam) {
public PageInfo<SalarySobListDTO> listPage(SalarySobListQueryParam queryParam) {
// // 查询薪资账套
// PageInfo<SalarySobPO> page = getSalarySobService(user).listPageByParam(queryParam);
// // 查询人员信息
// List<Long> employeeIds = SalaryEntityUtil.properties(page.getRecords(), SalarySobPO::getCreator, Collectors.toList());
// List<SimpleEmployee> simpleEmployees = hrmCommonEmployeeService.getEmployeeByIds(employeeIds, tenantKey);
// // 薪资账套po转换成薪资账套列表dto
// List<SalarySobListDTO> salarySobListDTOS = SalarySobBO.convert2ListDTO(page.getRecords(), simpleEmployees);
// Page<SalarySobListDTO> dtoPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal(), page.isSearchCount());
// dtoPage.setRecords(salarySobListDTOS);
// // 转换成前端所需的数据格式
// return SalaryFormatUtil.<SalarySobListDTO>getInstance().buildTable(SalarySobListDTO.class, dtoPage);
return null;
// 查询薪资账套
PageInfo<SalarySobPO> page = getSalarySobService(user).listPageByParam(queryParam);
// 薪资账套po转换成薪资账套列表dto
List<SalarySobListDTO> salarySobListDTOS = SalarySobBO.convert2ListDTO(page.getList());
PageInfo<SalarySobListDTO> dtoPage = new PageInfo<>(salarySobListDTOS, SalarySobListDTO.class);
dtoPage.setTotal(page.getTotal());
dtoPage.setPageNum(page.getPageNum());
dtoPage.setPageSize(page.getPageSize());
// 转换成前端所需的数据格式
return dtoPage;
}
/**
@ -66,11 +67,17 @@ return null;
* @return
*/
public Map<String, Object> getForm(Long id) {
long employeeId = user.getUID();
Map<String, Object> data = new HashMap<>(16);
// 是否可以编辑（分权后，总管理员不可以编辑管理员新建的账套）
boolean canEdit = Objects.isNull(id) || canEdit(id, employeeId);
// 薪资账套基础设置详情（目前核算人员范围的值固定为"1"）
SalarySobBasicFormDTO basicForm = new SalarySobBasicFormDTO()
.setEmployeeRange("1")
.setTaxableItems(IncomeCategoryEnum.WAGES_AND_SALARIES.getValue());
.setTaxableItems(IncomeCategoryEnum.WAGES_AND_SALARIES.getValue())
.setCanEdit(canEdit);
if (!Objects.isNull(id)) {
// 查询薪资账套
SalarySobPO salarySobPO = getSalarySobService(user).getById(id);
@ -118,7 +125,7 @@ return null;
/**
* 删除薪资账套
*
* @param ids 薪资账套的id
* @param ids 薪资账套的id
*/
public void delete(Collection<Long> ids) {
getSalarySobService(user).deleteByIds(ids);
@ -132,4 +139,30 @@ return null;
public void duplicate(SalarySobDuplicateParam duplicateParam) {
getSalarySobService(user).duplicate(duplicateParam);
}
/**
* 判断是否可以编辑薪资账套
*
* @param id
* @param employeeId
* @return
*/
public boolean canEdit(Long id, Long employeeId) {
// 查询薪资账套
SalarySobPO salarySobPO = getSalarySobService(user).getById(id);
if (Objects.isNull(salarySobPO)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98379, "参数错误，薪资账套不存在或者已被删除"));
}
// 判断是否开启了分权
Boolean openDevolution = taxAgentService.isOpenDevolution();
if (!openDevolution) {
return true;
}
Collection<TaxAgentPO> taxAgentPOS = taxAgentService.listAllTaxAgents(employeeId);
Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId);
return taxAgentIds.contains(salarySobPO.getTaxAgentId());
}
}

4
src/com/engine/salary/wrapper/TaxAgentWrapper.java
View File

@ -50,8 +50,8 @@ public class TaxAgentWrapper extends Service {
return ServiceUtil.getService(TaxAgentAdminServiceImpl.class, user);
}
public TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
public TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
public SalaryEmployeeService getSalaryEmployeeService(User user) {

4
src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
View File

@ -60,8 +60,8 @@ public class TaxDeclarationWrapper extends Service {
return ServiceUtil.getService(TaxDeclarationServiceImpl.class, user);
}
private TaxAgentV2Service getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentV2ServiceImpl.class, user);
private TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
private TaxDeclarationDetailService getTaxDeclarationDetailService(User user) {