diff --git a/src/com/engine/salary/entity/taxapiflow/bo/TaxApiFlowBO.java b/src/com/engine/salary/entity/taxapiflow/bo/TaxApiFlowBO.java index 44b42447c..8ee8ba3e6 100644 --- a/src/com/engine/salary/entity/taxapiflow/bo/TaxApiFlowBO.java +++ b/src/com/engine/salary/entity/taxapiflow/bo/TaxApiFlowBO.java @@ -60,7 +60,7 @@ public class TaxApiFlowBO { String idNo = propertiesWrapper.getEmpIdNoMap().get(e.getEmployeeId()); String externalUsername = propertiesWrapper.getExtEmployeeMap().getOrDefault(e.getEmployeeId(), new ExtEmpPO()).getUsername(); String externalIdNo = propertiesWrapper.getExtEmployeeMap().getOrDefault(e.getEmployeeId(), new ExtEmpPO()).getIdNo(); - String creator = propertiesWrapper.getEmpNameMap().get(e.getCreator()); + String creator = propertiesWrapper.getCreatorNameMap().get(e.getCreator()); String taxAgentName = propertiesWrapper.getTaxAgentNameMap().get(e.getTaxAgentId()); boolean isInternal = StringUtils.isNotEmpty(internalUsername); diff --git a/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java b/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java index 6b3458a33..2b5992ea2 100644 --- a/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java +++ b/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java @@ -7,6 +7,7 @@ import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowWarnConfig import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowWarnReceiverSaveParam; import com.engine.salary.entity.taxapiflow.po.TaxDeclarationApiFlowWarnConfigPO; import com.engine.salary.service.impl.TaxDeclarationApiBillingServiceImpl; +import com.engine.salary.util.page.PageInfo; import java.util.List; @@ -35,6 +36,9 @@ public interface TaxDeclarationApiFlowWarnService { */ List getWarnReceiverList(Long warnConfigId); + + PageInfo getWarnReceiverPageList(Long warnConfigId); + /** * 删除流量不足提醒对象 * diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java index f8177facf..9652dcb29 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java @@ -105,12 +105,22 @@ public class TaxDeclarationApiBillingServiceImpl extends Service implements TaxD List employeeComInfos = getSalaryEmployeeService(user).getEmployeeByIdsAll(new ArrayList<>(employeeTaxAgentMap.keySet())); Map empNameMap = SalaryEntityUtil.convert2Map(employeeComInfos, DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getUsername); Map empIdNoMap = getSalaryEmployeeService(user).mapByEmployeeIds(employeeTaxAgentMap.keySet()); + + //非系统人员信息 List extEmployeePOS = getExtEmpService(user).listAll(); Map extEmployeeMap = SalaryEntityUtil.convert2Map(extEmployeePOS, ExtEmpPO::getId); + // 获取个税扣缴义务人信息 List taxAgentPOS = getTaxAgentService(user).listByIds(new HashSet<>(employeeTaxAgentMap.values())); Map taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId, TaxAgentPO::getName); - return new TempPropertiesWrapper(empNameMap, empIdNoMap, taxAgentNameMap, extEmployeeMap); + + //创建人信息 + List creators = SalaryEntityUtil.properties(list, TaxDeclarationApiFlowRecordPO::getCreator, Collectors.toList()); + List creatorInfos = getSalaryEmployeeService(user).getEmployeeByIdsAll(new ArrayList<>(creators)); + Map creatorNameMap = SalaryEntityUtil.convert2Map(creatorInfos, DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getUsername); + + return new TempPropertiesWrapper(empNameMap, empIdNoMap, taxAgentNameMap, extEmployeeMap, creatorNameMap); + } private TaxDeclarationApiFlowRecordPO getFlowRecordQueryChainWrapper(TaxDeclarationApiFlowRecordQueryParam queryParam) { @@ -138,6 +148,7 @@ public class TaxDeclarationApiBillingServiceImpl extends Service implements TaxD headers.add(SalaryI18nUtil.getI18nLabel(159085, "接口服务")); headers.add(SalaryI18nUtil.getI18nLabel(85435, "操作人")); headers.add(SalaryI18nUtil.getI18nLabel(159086, "结果")); + rows.add(headers); // 获取数据 List dtoList = listFlowRecord(queryParam); // 组装数据 @@ -172,6 +183,8 @@ public class TaxDeclarationApiBillingServiceImpl extends Service implements TaxD private Map taxAgentNameMap; // 获取非系统人员 private Map extEmployeeMap; + //创建人 + private Map creatorNameMap; } @Data diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java index 184c0dd96..37b7c3594 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java @@ -30,6 +30,8 @@ import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; +import com.engine.salary.util.page.PageInfo; +import com.engine.salary.util.page.SalaryPageUtil; import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -92,6 +94,12 @@ public class TaxDeclarationApiFlowWarnServiceImpl extends Service implements Tax .build()).collect(Collectors.toList()); } + @Override + public PageInfo getWarnReceiverPageList(Long warnConfigId) { + List dtos = getWarnReceiverList(warnConfigId); + return SalaryPageUtil.buildPage(1, 10000, dtos, TaxDeclarationApiFlowWarnReceiverListDTO.class); + } + @Override @Transactional(rollbackFor = Exception.class) public void deleteReceiver(Long id) { @@ -248,6 +256,7 @@ public class TaxDeclarationApiFlowWarnServiceImpl extends Service implements Tax /** * 发送邮件 + * * @param receiver * @param title * @param context @@ -258,6 +267,7 @@ public class TaxDeclarationApiFlowWarnServiceImpl extends Service implements Tax /** * 发送Em消息 + * * @param receiver * @param title * @param context diff --git a/src/com/engine/salary/web/TaxDeclarationApiFlowController.java b/src/com/engine/salary/web/TaxDeclarationApiFlowController.java index b4f543da0..c4d9cd8db 100644 --- a/src/com/engine/salary/web/TaxDeclarationApiFlowController.java +++ b/src/com/engine/salary/web/TaxDeclarationApiFlowController.java @@ -145,7 +145,7 @@ public class TaxDeclarationApiFlowController { } String result = request.getParameter("result"); if(StringUtils.isNotBlank(result)){ - queryParam.setBusinessType(Integer.valueOf(result)); + queryParam.setResult(Integer.valueOf(result)); } diff --git a/src/com/engine/salary/web/TaxDeclarationApiFlowWarnController.java b/src/com/engine/salary/web/TaxDeclarationApiFlowWarnController.java index c651e0413..c209be628 100644 --- a/src/com/engine/salary/web/TaxDeclarationApiFlowWarnController.java +++ b/src/com/engine/salary/web/TaxDeclarationApiFlowWarnController.java @@ -3,11 +3,13 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; import com.engine.salary.common.BaseQueryParam; import com.engine.salary.entity.taxapiflow.dto.TaxDeclarationApiFlowWarnConfigFormDTO; +import com.engine.salary.entity.taxapiflow.dto.TaxDeclarationApiFlowWarnReceiverFormDTO; import com.engine.salary.entity.taxapiflow.dto.TaxDeclarationApiFlowWarnReceiverListDTO; import com.engine.salary.entity.taxapiflow.param.CreateMessageRuleParam; import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowWarnConfigSaveParam; import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowWarnReceiverSaveParam; import com.engine.salary.util.ResponseResult; +import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.TaxDeclarationApiFlowWarnWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; @@ -18,7 +20,6 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import java.util.List; /** * 智能算薪-流量不足提醒 @@ -71,7 +72,7 @@ public class TaxDeclarationApiFlowWarnController { @Produces(MediaType.APPLICATION_JSON) public String getWarnReceiverForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationApiFlowWarnReceiverSaveParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getTaxDeclarationApiFlowWarnWrapper(user)::getWarnReceiverForm, param); + return new ResponseResult(user).run(getTaxDeclarationApiFlowWarnWrapper(user)::getWarnReceiverForm, param); } /** @@ -99,7 +100,7 @@ public class TaxDeclarationApiFlowWarnController { @Produces(MediaType.APPLICATION_JSON) public String getWarnReceiverList(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "warnConfigId") Long warnConfigId) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getTaxDeclarationApiFlowWarnWrapper(user)::getWarnReceiverList, warnConfigId); + return new ResponseResult>(user).run(getTaxDeclarationApiFlowWarnWrapper(user)::getWarnReceiverList, warnConfigId); } /** diff --git a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java index 81685df79..d63af20e7 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java @@ -58,13 +58,12 @@ public class TaxDeclarationApiFlowBillingWrapper extends Service { } public PageInfo getFlowRecord(TaxDeclarationApiFlowRecordQueryParam queryParam) { - PageInfo page = getTaxDeclarationApiBillingService(user).pageFlowRecord(queryParam); - return page; + return getTaxDeclarationApiBillingService(user).pageFlowRecord(queryParam); } public XSSFWorkbook exportFlowRecord(TaxDeclarationApiFlowRecordQueryParam queryParam) { List dtoList = getTaxDeclarationApiBillingService(user).listFlowRecord(queryParam); - SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel( 95795, "数据不存在")); + SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel(95795, "数据不存在")); return getTaxDeclarationApiBillingService(user).exportFlowRecord(queryParam); } diff --git a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowWarnWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowWarnWrapper.java index b41bd56c6..dad7ed25c 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowWarnWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowWarnWrapper.java @@ -12,11 +12,10 @@ import com.engine.salary.entity.taxapiflow.po.TaxDeclarationApiFlowWarnConfigPO; import com.engine.salary.enums.SalaryOnOffEnum; import com.engine.salary.service.TaxDeclarationApiFlowWarnService; import com.engine.salary.service.impl.TaxDeclarationApiFlowWarnServiceImpl; +import com.engine.salary.util.page.PageInfo; import lombok.extern.slf4j.Slf4j; import weaver.hrm.User; -import java.util.List; - /** * 流量不足提醒 *

Copyright: Copyright (c) 2023

@@ -54,9 +53,8 @@ public class TaxDeclarationApiFlowWarnWrapper extends Service { return getTaxDeclarationApiFlowWarnService(user).saveWarnConfig(param); } - public List getWarnReceiverList(Long warnConfigId) { - List receiverListDTOS = getTaxDeclarationApiFlowWarnService(user).getWarnReceiverList(warnConfigId); - return receiverListDTOS; + public PageInfo getWarnReceiverList(Long warnConfigId) { + return getTaxDeclarationApiFlowWarnService(user).getWarnReceiverPageList(warnConfigId); } public void deleteReceiver(Long id) {