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

处理冲突

This commit is contained in:
钱涛 2025-02-12 14:16:17 +08:00
parent f3577d3ddd
commit f26d96d56e
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/service/AddUpDeductionService.java
View File

@ -186,7 +186,5 @@ public interface AddUpDeductionService {
*/
XSSFWorkbook exportOnlineFeedbackFail(Long requestId);
String autoAddAll(Date yearMonth, boolean isAdmin, List<Long> taxAgentIds);
List<AddUpDeductionDTO> listAuth(AddUpDeductionQueryParam param);
}

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

@ -35,8 +35,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.bo.TaxAgentBO;
import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO;
import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO;
import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
@ -52,8 +50,8 @@ import com.engine.salary.enums.datacollection.EnumAddUpDeductionRequestStatus;
import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import com.engine.salary.enums.sicategory.DeleteTypeEnum;
import com.engine.salary.enums.taxagent.TaxAgentTaxReturnStatusEnum;
import com.engine.salary.enums.taxdeclaration.EnumDeclareApiBusinessType;
@ -771,7 +769,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
}
@Override
public String autoAddAll(Date yearMonth, boolean isAdmin, List<Long> taxAgentIds) {
public String autoAddAll(Date yearMonth, Boolean isAdmin, List<Long> taxAgentIds) {
String cacheKey = "addUpDeduction_autoAddAll_processing";
Object objVal = Util_DataCache.getObjVal(cacheKey);
if (objVal != null) {

2
src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
View File

@ -495,7 +495,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
}
// 查询薪资档案的发薪人员
LocalDateRange salaryCycleRange = LocalDateRange.builder().fromDate(salaryCycle).endDate(SalaryDateUtil.localDateToDate(SalaryDateUtil.localDate2YearMonth(salaryCycle).atEndOfMonth())).build();
List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salaryCycleRange, Collections.emptyList(), refreshParam.getTaxAgentId());
List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salaryCycleRange, Collections.emptyList(), Collections.singletonList(refreshParam.getTaxAgentId()));
List<Long> employeeIds = salaryArchiveDataDTOS.stream().map(SalaryArchiveDataDTO::getEmployeeId).collect(Collectors.toList());
List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(refreshParam.getTaxAgentId()).employeeIds(employeeIds).build());

2
src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java
View File

@ -106,7 +106,7 @@ public class SalarySobInitServiceImpl extends AbstractSalarySobInitService {
Date now = new Date();
SalarySobPO salarySob = new SalarySobPO()
// .setId(saveParam.getId())
.setTaxAgentId(saveParam.getTaxAgentId())
.setTaxAgentId(saveParam.getTaxAgentIds().get(0))
.setName(saveParam.getName())
.setIncomeCategory(saveParam.getTaxableItems())
.setSalaryCycleType(saveParam.getSalaryCycleType())