From 2e01926480761a99a4c1a0ed2a986a2a862b86e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 21 Oct 2021 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#40990?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/entity/PayIncomeContract.java | 1 + .../contract/entity/PaySpendingContract.java | 1 + .../impl/PaySpendingContractServiceImpl.java | 38 +++++++++++++------ .../controller/PayPackCompanyController.java | 2 + .../PayPackCompanyProjectController.java | 2 + 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index ec3c68ff..5d1d01a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -180,6 +180,7 @@ public class PayIncomeContract implements Serializable { /**打包年份*/ @Excel(name = "打包年份", width = 15) @ApiModelProperty(value = "打包年份") + @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误") private java.lang.String packYear; /**合同状态（1：草稿，2：已通过，3：未通过，4：已归档）*/ @Excel(name = "合同状态（1：草稿，2：已通过，3：未通过，4：已存档）", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index ace813fc..a67d2140 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -172,6 +172,7 @@ public class PaySpendingContract implements Serializable { /**打包年份*/ @Excel(name = "打包年份", width = 15) @ApiModelProperty(value = "打包年份") + @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误") private String packYear; /**创建人*/ @ApiModelProperty(value = "创建人") 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 10c4077a..6b67f07f 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 @@ -541,14 +541,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ + if(Objects.equals(map.get(4),k)){ + paySpendingContract.setOpening(Integer.parseInt(v)); + } + }); + if(Objects.isNull(paySpendingContract.getOpening())){ sb.append("第").append(n).append("行:是否开口格式错误，请修改！
"); - }else{ - mapOpening.forEach((k,v)->{ - if(Objects.equals(map.get(4),k)){ - paySpendingContract.setOpening(Integer.parseInt(v)); - } - }); } } @@ -613,12 +612,27 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ - if(Objects.equals(map.get(18),k)){ - paySpendingContract.setPack(Integer.parseInt(v)); + if(StringUtils.isEmpty(map.get(18))){ + sb.append("第").append(n).append("行:是否打包不能为空，请修改！
"); + }else{ + mapPack.forEach((k,v)->{ + if(Objects.equals(map.get(18),k)){ + paySpendingContract.setPack(Integer.parseInt(v)); + } + }); + if(Objects.isNull(paySpendingContract.getPack())){ + sb.append("第").append(n).append("行:是否打包格式错误，请修改！
"); + paySpendingContract.setPack(2); } - }); - paySpendingContract.setPackYear(map.get(19)); + // 打包获取打包年份 + if(Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1)){ + if(StringUtils.isEmpty(map.get(19))){ + sb.append("第").append(n).append("行:打包年份不能为空，请修改！
"); + }else{ + paySpendingContract.setPackYear(map.get(19)); + } + } + } return paySpendingContract; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index 84c1471b..c23c7e65 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -37,6 +37,7 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; @@ -305,6 +306,7 @@ public class PayPackCompanyController extends JeroController