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

申报表状态更新主记录

This commit is contained in:
钱涛 2024-04-07 15:59:36 +08:00
parent fbc9c1a187
commit be85c47a68
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/service/TaxDeclareRecordService.java
View File

@ -194,8 +194,16 @@ public interface TaxDeclareRecordService {
void updateById(TaxDeclareRecordPO taxDeclareRecord);
/**
* 获取申报记录状态列表
* @param id
* @return
*/
List<TaxDeclareStatusPO> getOrInitTaxReports(Long id);
/**
* 更新申报状态，同时更新主记录
* @param declareStatus
*/
void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus);
}

11
src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
View File

@ -720,7 +720,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARING.getValue());
declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId());
declareStatus.setTaxDeclareErrorMsg("");
getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus);
updateTaxDeclareStatus(declareStatus);
// 记录日志
TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent();
@ -851,7 +851,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
declareStatus.setTaxPayAmount(payAmount.subtract(purePaidAmount).toString());
}
//更新申报状态
getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus);
updateTaxDeclareStatus(declareStatus);
// 如果申报失败
if (CollectionUtils.isNotEmpty(taxDeclareFails)) {
@ -922,7 +922,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
// 更新个税申报状态
declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_CANCELLING.getValue());
declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId());
getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus);
updateTaxDeclareStatus(declareStatus);
// 记录日志
TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent();
@ -979,7 +979,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
//更新个税申报状态
declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
declareStatus.setRequestId("");
getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus);
updateTaxDeclareStatus(declareStatus);
// 记录日志
TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent();
@ -1084,6 +1084,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
@Override
public void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus) {
//更新申报表状态
getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus);
//更新主记录
@ -1239,7 +1240,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
}
statuses.add(declareStatus);
personNum += declareStatus.getPersonNum();
personNum += declareStatus.getPersonNum() == null ? 0 : declareStatus.getPersonNum();
taxPayAmount = taxPayAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPayAmount()));
taxPaidAmount = taxPaidAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPaidAmount()));
taxPurePaidAmount = taxPurePaidAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPurePaidAmount()));

12
src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
View File

@ -31,6 +31,7 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.IdGenerator;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.weaver.util.threadPool.ThreadPoolUtil;
import com.weaver.util.threadPool.constant.ModulePoolEnum;
import com.weaver.util.threadPool.entity.LocalRunnable;
@ -291,6 +292,8 @@ public class TaxDeclareRecordWrapper extends Service {
* @return
*/
public List<TaxDeclarationTabDTO> getTaxDeclarationTab(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
// 查询个税申报记录
TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(param.getTaxDeclareRecordId());
@ -337,6 +340,8 @@ public class TaxDeclareRecordWrapper extends Service {
* @return
*/
public TaxDeclarationInfoDTO getTaxDeclarationInfoById(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
// 查询个税申报表
Long taxDeclareRecordId = param.getTaxDeclareRecordId();
TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(taxDeclareRecordId);
@ -441,6 +446,8 @@ public class TaxDeclareRecordWrapper extends Service {
* @param
*/
public String declare(TaxDeclareRecordParam taxDeclareRecordParam) {
ValidUtil.doValidator(taxDeclareRecordParam);
Long id = taxDeclareRecordParam.getTaxDeclareRecordId();
checkBefore(id);
TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))
@ -470,6 +477,8 @@ public class TaxDeclareRecordWrapper extends Service {
* 获取申报反馈
*/
public String getDeclareFeedback(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
Long id = param.getTaxDeclareRecordId();
checkBefore(id);
TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))
@ -509,6 +518,7 @@ public class TaxDeclareRecordWrapper extends Service {
* 作废
*/
public String cancelDeclare(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
Long id = param.getTaxDeclareRecordId();
checkBefore(id);
TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))
@ -538,6 +548,7 @@ public class TaxDeclareRecordWrapper extends Service {
* 获取作废反馈
*/
public String getCancelFeedback(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
Long id = param.getTaxDeclareRecordId();
checkBefore(id);
TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))
@ -569,6 +580,7 @@ public class TaxDeclareRecordWrapper extends Service {
* @return
*/
public String updateDeclare(TaxDeclareRecordParam param) {
ValidUtil.doValidator(param);
Long id = param.getTaxDeclareRecordId();
checkBefore(id);
TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))