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

Merge branch 'release/个税版本' into release/个税&业务线

This commit is contained in:
钱涛 2026-02-10 16:30:15 +08:00
parent 829453fd05 11827aa33a
commit 1c217b05ab
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/taxapiflow/dto/TaxDeclarationApiFlowStatisticDetailListDTO.java
View File

@ -33,7 +33,7 @@ public class TaxDeclarationApiFlowStatisticDetailListDTO {
private String taxAgentName; private String taxAgentName;
//税款所属期 //税款所属期
@TableTitle(title = "",key = "",dataIndex = "") @TableTitle(title = "税款所属期",key = "taxMonth",dataIndex = "税款所属期")
private String taxMonth; private String taxMonth;
//月使用流量数 //月使用流量数

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

@ -666,9 +666,13 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
DeclareEmployeeFeedbackResponse declareEmployeeFeedbackResponse = JsonUtil.parseObject(res, DeclareEmployeeFeedbackResponse.class); DeclareEmployeeFeedbackResponse declareEmployeeFeedbackResponse = JsonUtil.parseObject(res, DeclareEmployeeFeedbackResponse.class);
if (Objects.isNull(declareEmployeeFeedbackResponse) || Objects.isNull(declareEmployeeFeedbackResponse.getHead())) { if (Objects.isNull(declareEmployeeFeedbackResponse) || Objects.isNull(declareEmployeeFeedbackResponse.getHead())) {
log.error("服务异常:" + res); log.error("服务异常:" + res);
// 删除原来的人员报送记录
getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId());
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156449, "服务异常")); throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156449, "服务异常"));
} }
if (!Objects.equals(declareEmployeeFeedbackResponse.getHead().getCode(), SzyhApiConstant.SUCCESS_CODE)) { if (!Objects.equals(declareEmployeeFeedbackResponse.getHead().getCode(), SzyhApiConstant.SUCCESS_CODE)) {
// 删除原来的人员报送记录
getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId());
throw new SalaryRunTimeException(declareEmployeeFeedbackResponse.getHead().getMsg()); throw new SalaryRunTimeException(declareEmployeeFeedbackResponse.getHead().getMsg());
} }
DeclareEmployeeFeedbackResponse.DeclareEmployeeFeedbackResponseBody declareEmployeeFeedbackResponseBody = declareEmployeeFeedbackResponse.getBody(); DeclareEmployeeFeedbackResponse.DeclareEmployeeFeedbackResponseBody declareEmployeeFeedbackResponseBody = declareEmployeeFeedbackResponse.getBody();

6
src/com/engine/salary/wrapper/TaxDeclarationApiFlowStatisticWrapper.java
View File

@ -9,8 +9,6 @@ import com.engine.salary.entity.taxapiflow.dto.TaxDeclarationApiFlowTotalDTO;
import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowMonthQueryParam; import com.engine.salary.entity.taxapiflow.param.TaxDeclarationApiFlowMonthQueryParam;
import com.engine.salary.service.TaxDeclarationApiFlowStatisticService; import com.engine.salary.service.TaxDeclarationApiFlowStatisticService;
import com.engine.salary.service.impl.TaxDeclarationApiFlowStatisticServiceImpl; import com.engine.salary.service.impl.TaxDeclarationApiFlowStatisticServiceImpl;
import com.engine.salary.util.SalaryAssert;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -47,13 +45,13 @@ public class TaxDeclarationApiFlowStatisticWrapper extends Service {
public XSSFWorkbook exportFlowStatistics() { public XSSFWorkbook exportFlowStatistics() {
List<TaxDeclarationApiFlowStatisticListDTO> dtoList = getTaxDeclarationApiFlowStatisticService(user).listFlowStatistic(); List<TaxDeclarationApiFlowStatisticListDTO> dtoList = getTaxDeclarationApiFlowStatisticService(user).listFlowStatistic();
SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel(95795, "数据不存在")); // SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel(95795, "数据不存在"));
return getTaxDeclarationApiFlowStatisticService(user).exportFlowStatistics(dtoList); return getTaxDeclarationApiFlowStatisticService(user).exportFlowStatistics(dtoList);
} }
public XSSFWorkbook exportFlowStatisticsDetail(TaxDeclarationApiFlowMonthQueryParam queryParam) { public XSSFWorkbook exportFlowStatisticsDetail(TaxDeclarationApiFlowMonthQueryParam queryParam) {
List<TaxDeclarationApiFlowStatisticDetailListDTO> dtoList = getTaxDeclarationApiFlowStatisticService(user).listFlowStatisticDetail(queryParam); List<TaxDeclarationApiFlowStatisticDetailListDTO> dtoList = getTaxDeclarationApiFlowStatisticService(user).listFlowStatisticDetail(queryParam);
SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel(95795, "数据不存在")); // SalaryAssert.notEmpty(dtoList, SalaryI18nUtil.getI18nLabel(95795, "数据不存在"));
return getTaxDeclarationApiFlowStatisticService(user).exportFlowStatisticsDetail(dtoList); return getTaxDeclarationApiFlowStatisticService(user).exportFlowStatisticsDetail(dtoList);
} }