From e9710d989a5602624dddcf43580f3771f5b6d372 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 17:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/PayIncomeContractCommon.java | 2 +- .../impl/PaySpendingContractServiceImpl.java | 72 +++++++++++-------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index 8ac923a1..0348c539 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java @@ -87,7 +87,7 @@ public class PayIncomeContractCommon { * 支出合同excel表头 */ public final static List LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人", - "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点", + "部门名称","签订合同总金额","税率","未税金额","联系电话","邮寄地址","邮编","合同签订日期","合同终止日期","合同约定主要时点", "应付金额","已付金额","未付金额","账款状态","合同约定付款次数"); /** * 支出合同分期信息excel 表头 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index b0b92460..b61c79cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -18,7 +18,6 @@ import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.entity.PaySpendingContractAudit; import com.jero.contract.entity.PaySpendingContractInstallment; @@ -32,7 +31,6 @@ import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -44,6 +42,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.InputStream; @@ -299,7 +298,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ @@ -831,44 +830,59 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + }else{ + paySpendingContract.setPhone(map.get(10)); + } + if(StringUtils.isBlank(map.get(11)) ){ + sb.append("第").append(n).append("行:邮寄地址不能为空，请修改。
"); + }else{ + paySpendingContract.setAddress(map.get(11)); + } + if(StringUtils.isBlank(map.get(12)) ){ + sb.append("第").append(n).append("行:邮编不能为空，请修改。
"); + }else{ + paySpendingContract.setPostCode(map.get(12)); + } + if(!StringUtils.isBlank(map.get(13)) ){ + if(!DateUtils.isValidDate(map.get(13))){ sb.append("第").append(n).append("行:合同签订日期格式不正确，请修改。
"); }else{ - paySpendingContract.setContractDate(DateUtils.str2Date(map.get(10),new SimpleDateFormat("yyyy-MM-dd"))); - } - } - if(!StringUtils.isBlank(map.get(11))){ - if(!DateUtils.isValidDate(map.get(11))) { - sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。
"); - }else{ - paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd"))); - } - } - paySpendingContract.setContractTimePoints(map.get(13)); - if(!StringUtils.isBlank(map.get(13))){ - if(!pattern.matcher(map.get(13)).matches()){ - sb.append("第").append(n).append("行:应付金额格式错误，请修改。
"); - }else{ - paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13))); + paySpendingContract.setContractDate(DateUtils.str2Date(map.get(13),new SimpleDateFormat("yyyy-MM-dd"))); } } if(!StringUtils.isBlank(map.get(14))){ - if(!pattern.matcher(map.get(14)).matches()){ - sb.append("第").append(n).append("行:已付金额格式错误，请修改。
"); + if(!DateUtils.isValidDate(map.get(14))) { + sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。
"); }else{ - paySpendingContract.setAmountReceived(new BigDecimal(map.get(14))); + paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(14),new SimpleDateFormat("yyyy-MM-dd"))); } } - if(!StringUtils.isBlank(map.get(15))){ - if(!pattern.matcher(map.get(15)).matches()){ + paySpendingContract.setContractTimePoints(map.get(13)); + if(!StringUtils.isBlank(map.get(16))){ + if(!pattern.matcher(map.get(16)).matches()){ + sb.append("第").append(n).append("行:应付金额格式错误，请修改。
"); + }else{ + paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(16))); + } + } + if(!StringUtils.isBlank(map.get(17))){ + if(!pattern.matcher(map.get(17)).matches()){ + sb.append("第").append(n).append("行:已付金额格式错误，请修改。
"); + }else{ + paySpendingContract.setAmountReceived(new BigDecimal(map.get(17))); + } + } + if(!StringUtils.isBlank(map.get(18))){ + if(!pattern.matcher(map.get(18)).matches()){ sb.append("第").append(n).append("行:未付金额格式错误，请修改。
"); }else{ - paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(15))); + paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(18))); } } - paySpendingContract.setContractPaymentTimes(map.get(17)); + paySpendingContract.setContractPaymentTimes(map.get(20)); return paySpendingContract; }