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 d9ca74bc..ace813fc 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
@@ -60,7 +60,8 @@ public class PaySpendingContract implements Serializable {
/**临时签订单位名称*/
@Excel(name = "临时签订单位名称", width = 15)
@ApiModelProperty(value = "临时签订单位名称")
- @Size(max = 50, message = "签订单位名称长度不能大于50个字符")
+ @Size(max = 50, message = "签订单位长度不能大于50个字符")
+ @NotEmpty(message = "签订单位不能为空")
private String signedCompanyTemporaryName;
/**签订单位联系人id*/
@Excel(name = "签订单位联系人id", width = 15)
@@ -71,9 +72,10 @@ public class PaySpendingContract implements Serializable {
@ApiModelProperty(value = "临时签订单位联系人id")
private String signedContactsTemporaryId;
/**临时签订单位联系人名称*/
- @Excel(name = "临时签订单位联系人名称", width = 15)
- @ApiModelProperty(value = "临时签订单位联系人名称")
- @Size(max = 50, message = "签订单位联系人名称长度不能大于50个字符")
+ @Excel(name = "临时签订联系人", width = 15)
+ @ApiModelProperty(value = "临时签订联系人")
+ @Size(max = 50, message = "签订联系人长度不能大于50个字符")
+ @NotEmpty(message = "签订联系人不能为空")
private String signedContactsTemporaryName;
/**是否开口(1:是,0:否)*/
@Excel(name = "是否开口(1:是,0:否)", width = 15)
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 2011b9a3..10c4077a 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
@@ -534,15 +534,22 @@ public class PaySpendingContractServiceImpl extends ServiceImpl");
+ if(StringUtils.isEmpty(map.get(3))){
+ sb.append("第").append(n).append("行:负责人不能为空,请修改!
");
}else{
- mapOpening.forEach((k,v)->{
- if(Objects.equals(map.get(4),k)){
- paySpendingContract.setOpening(Integer.parseInt(v));
- }
- });
+ paySpendingContract.setSignedContactsTemporaryName(map.get(3));
+ }
+
+ if(!Objects.isNull(map.get(4))){
+ if(!Objects.equals(map.get(4),"是") && !Objects.equals(map.get(4),"否")){
+ sb.append("第").append(n).append("行:是否开口格式错误,请修改!
");
+ }else{
+ mapOpening.forEach((k,v)->{
+ if(Objects.equals(map.get(4),k)){
+ paySpendingContract.setOpening(Integer.parseInt(v));
+ }
+ });
+ }
}
paySpendingContract.setPrincipalName(map.get(5));