LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支出合同导入功能修改

Browse Source
This commit is contained in:
liangqitao
2022-04-07 17:24:25 +08:00
parent 4c3e1d6ef0
commit e9710d989a
2 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class PayIncomeContractCommon {
* 支出合同excel表头
*/
public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
"部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
"部门名称","签订合同总金额","税率","未税金额","联系电话","邮寄地址","邮编","合同签订日期","合同终止日期","合同约定主要时点",
"应付金额","已付金额","未付金额","账款状态","合同约定付款次数");
/**
* 支出合同分期信息excel 表头
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+43 -29
View File
@@ -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<PaySpendingContr
if (Objects.isNull(principalName)) {
throw new JeroBootException("负责人名称为空！");
}
paySpendingContract.setStatus(PayIncomeContractCommon.STATUS2);
paySpendingContract.setStatus(PayIncomeContractCommon.STATUS3);
paySpendingContract.setPrincipalId(principalName.getId());
paySpendingContract.setPrincipalName(principalName.getRealname());
paySpendingContractService.updateById(paySpendingContract);
@@ -592,7 +591,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
paySpendingContract.setPrincipalId(principalName.getId());
paySpendingContract.setPrincipalName(principalName.getRealname());
paySpendingContract.setStatus(PayIncomeContractCommon.STATUS2);
paySpendingContract.setStatus(PayIncomeContractCommon.STATUS3);
paySpendingContractService.save(paySpendingContract);
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -831,44 +830,59 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9)));
}
}
if(!StringUtils.isBlank(map.get(10)) ){
if(!DateUtils.isValidDate(map.get(10))){
if(StringUtils.isBlank(map.get(10)) ){
sb.append("第").append(n).append("行:联系电话不能为空，请修改。<br/>");
}else{
paySpendingContract.setPhone(map.get(10));
}
if(StringUtils.isBlank(map.get(11)) ){
sb.append("第").append(n).append("行:邮寄地址不能为空，请修改。<br/>");
}else{
paySpendingContract.setAddress(map.get(11));
}
if(StringUtils.isBlank(map.get(12)) ){
sb.append("第").append(n).append("行:邮编不能为空，请修改。<br/>");
}else{
paySpendingContract.setPostCode(map.get(12));
}
if(!StringUtils.isBlank(map.get(13)) ){
if(!DateUtils.isValidDate(map.get(13))){
sb.append("第").append(n).append("行:合同签订日期格式不正确，请修改。<br/>");
}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("行:合同终止日期格式不正确，请修改。<br/>");
}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("行:应付金额格式错误，请修改。<br/>");
}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("行:已付金额格式错误，请修改。<br/>");
if(!DateUtils.isValidDate(map.get(14))) {
sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。<br/>");
}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("行:应付金额格式错误，请修改。<br/>");
}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("行:已付金额格式错误，请修改。<br/>");
}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("行:未付金额格式错误，请修改。<br/>");
}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;
}