From d90a1977cebbaee38179ec00f66e86afd46676b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 20 Jun 2023 15:58:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86-?= =?UTF-8?q?=E5=BE=80=E6=9C=9F=E7=B4=AF=E8=AE=A1=E6=83=85=E5=86=B5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=85=A8=E9=83=A8=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AddUpSituationServiceImpl.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index cd232cf8f..e4965928c 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -8,7 +8,6 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.AddUpSituationBiz; -import com.engine.salary.biz.EmployBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -300,25 +299,25 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation cellList.add(Util.null2String(dto.getMobile())); cellList.add(Util.null2String(dto.getJobNum())); cellList.add(Util.null2String(dto.getIdNo())); - cellList.add(dto.getHiredate() == null ? "" : dto.getHiredate()); - cellList.add(String.valueOf(dto.getAddUpIncome())); - cellList.add(String.valueOf(dto.getAddUpSubtraction())); - cellList.add(String.valueOf(dto.getAddUpSocialSecurityTotal())); - cellList.add(String.valueOf(dto.getAddUpAccumulationFundTotal())); - cellList.add(String.valueOf(dto.getAddUpChildEducation())); - cellList.add(String.valueOf(dto.getAddUpContinuingEducation())); - cellList.add(String.valueOf(dto.getAddUpHousingLoanInterest())); - cellList.add(String.valueOf(dto.getAddUpHousingRent())); - cellList.add(String.valueOf(dto.getAddUpSupportElderly())); - cellList.add(String.valueOf(dto.getAddUpIllnessMedical())); - cellList.add(String.valueOf(dto.getAddUpEnterpriseAndOther())); - cellList.add(String.valueOf(dto.getAddUpOtherDeduction())); - cellList.add(String.valueOf(dto.getAddUpTaxExemptIncome())); - cellList.add(String.valueOf(dto.getAddUpAllowedDonation())); - cellList.add(String.valueOf(dto.getAddUpTaxSavings())); - cellList.add(String.valueOf(dto.getAddUpAdvanceTax())); - cellList.add(String.valueOf(dto.getAddUpInfantCare())); - cellList.add(String.valueOf(dto.getAddUpPrivatePension())); + cellList.add(Util.null2String(dto.getHiredate())); + cellList.add(Util.null2String(dto.getAddUpIncome())); + cellList.add(Util.null2String(dto.getAddUpSubtraction())); + cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); + cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); + cellList.add(Util.null2String(dto.getAddUpChildEducation())); + cellList.add(Util.null2String(dto.getAddUpContinuingEducation())); + cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest())); + cellList.add(Util.null2String(dto.getAddUpHousingRent())); + cellList.add(Util.null2String(dto.getAddUpSupportElderly())); + cellList.add(Util.null2String(dto.getAddUpIllnessMedical())); + cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); + cellList.add(Util.null2String(dto.getAddUpOtherDeduction())); + cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); + cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); + cellList.add(Util.null2String(dto.getAddUpTaxSavings())); + cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); + cellList.add(Util.null2String(dto.getAddUpInfantCare())); + cellList.add(Util.null2String(dto.getAddUpPrivatePension())); return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList());