Merge branch 'release/个税&业务线' into custom/联特
This commit is contained in:
commit
8f2ff5e63d
|
|
@ -1,5 +1,6 @@
|
||||||
package com.engine.salary.service.impl;
|
package com.engine.salary.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.NumberUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.engine.common.util.ServiceUtil;
|
import com.engine.common.util.ServiceUtil;
|
||||||
import com.engine.core.impl.Service;
|
import com.engine.core.impl.Service;
|
||||||
|
|
@ -936,7 +937,8 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
|
||||||
declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
|
declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
|
||||||
// 申报类型
|
// 申报类型
|
||||||
declareStatus.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
|
declareStatus.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
|
||||||
declareStatus.setPersonNum(Integer.parseInt(Optional.ofNullable(declareTaxFeedbackResponse.getBody().get("nsrc")).orElse("0").toString()));
|
String nsrc = Util.null2String(declareTaxFeedbackResponse.getBody().get("nsrc"));
|
||||||
|
declareStatus.setPersonNum(Integer.parseInt(NumberUtil.isNumber(nsrc) ? nsrc : "0"));
|
||||||
declareStatus.setDeclareRequestId(declareStatus.getRequestId());
|
declareStatus.setDeclareRequestId(declareStatus.getRequestId());
|
||||||
declareStatus.setRequestId("");
|
declareStatus.setRequestId("");
|
||||||
//实缴(不含滞纳金)
|
//实缴(不含滞纳金)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue