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:
梁琦涛
2021-10-22 12:02:24 +08:00
parent 3895fcab11
commit eebd3b6ddd
17 changed files with 117 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
+2 -2
View File
@@ -99,7 +99,7 @@ public class ValidUtil {
if(set != null && set.size() > 0 ){
for(ConstraintViolation<Object> constraintViolation : set){
// 这里循环获取错误信息，可以自定义格式
msg.append("第").append(count).append("行:").append(constraintViolation.getMessage()).append("，请修改！<br/>");
msg.append("第").append(count).append("行:").append(constraintViolation.getMessage()).append("，请修改。<br/>");
}
}
return msg;
@@ -118,7 +118,7 @@ public class ValidUtil {
if(set != null && set.size() > 0 ){
for(ConstraintViolation<Object> constraintViolation : set){
// 这里循环获取错误信息，可以自定义格式
msg.append("第").append(count).append("行:").append(num).append(constraintViolation.getMessage()).append("，请修改！<br/>");
msg.append("第").append(count).append("行:").append(num).append(constraintViolation.getMessage()).append("，请修改。<br/>");
}
}
return msg;
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+4 -4
View File
@@ -677,11 +677,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
int count = list.indexOf(p);
// 校验excel表中是否存在重复企业名称
if(listCompany.contains(p.getCompanyName())){
msg.append("第").append(count + 3).append("行：企业名称在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称在excel中重复，请修改。<br/>");
}
listCompany.add(p.getCompanyName());
if(listDutyCode.contains(p.getDutyCode())){
msg.append("第").append(count + 3).append("行：信用代码在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:信用代码在excel中重复，请修改。<br/>");
}
listCompany.add(p.getDutyCode());
p.setDataSource(finalDataSource);
@@ -695,14 +695,14 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!CollectionUtils.isEmpty(listCompanyAll)){
List<PayCompanyManagement> listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyEquals)){
msg.append("第").append(count + 3).append("行：企业名称已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称已经存在，请修改。<br/>");
}
}
// 校验 表中是否存在信用代码
if(!CollectionUtils.isEmpty(listDutyCodeAll)){
List<PayCompanyManagement> listDutyCodeEquals = listDutyCodeAll.stream().filter(p1->Objects.equals(p1.getDutyCode(),p.getDutyCode())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listDutyCodeEquals)){
msg.append("第").append(count + 3).append("行：信用代码已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:信用代码已经存在，请修改。<br/>");
}
}
if (!StringUtils.isBlank(p.getCompanyPhone())){
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+7 -7
View File
@@ -731,13 +731,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 校验excel表中是否存在重复手机号
List<PayContactsManagement> listContactsPhone = listContacts.stream().filter(p1->Objects.equals(p1.getPhone(),p.getPhone())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsPhone)){
msg.append("第").append(count + 3).append("行：手机号在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:手机号在excel中重复，请修改。<br/>");
}
// 校验excel表中是否存在重复联系人
List<PayContactsManagement> listContactsName = listContacts.stream().filter(p1->Objects.equals(p1.getName(),p.getName())
&& Objects.equals(p1.getCompanyId(),p.getCompanyId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName)){
msg.append("第").append(count + 3).append("行：联系人姓名在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:联系人姓名在excel中重复，请修改。<br/>");
}
listContacts.add(p);
// 校验字段值
@@ -746,7 +746,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
msg.append(s);
}
if(StringUtils.isEmpty(p.getCompanyName())){
msg.append("第").append(count + 3).append("行：企业名称不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不能为空，请修改。<br/>");
}else{
// 根据企业名称获取企业id
if(!CollectionUtils.isEmpty(finalListCompanyAll)){
@@ -754,10 +754,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!CollectionUtils.isEmpty(listCompany)){
p.setCompanyId(listCompany.get(0).getId());
}else{
msg.append("第").append(count + 3).append("行：企业名称不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。<br/>");
}
}else{
msg.append("第").append(count + 3).append("行：企业名称不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。<br/>");
}
}
// 校验 手机号，姓名
@@ -765,12 +765,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 校验 表中是否存手机号
List<PayContactsManagement> listCompanyEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getPhone(),PasswordUtil.encrypt(p.getPhone()))).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyEquals)){
msg.append("第").append(count + 3).append("行：手机号已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:手机号已经存在，请修改。<br/>");
}
List<PayContactsManagement> listContactsEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId())
&& Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsEquals)){
msg.append("第").append(count + 3).append("行：姓名已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:姓名已经存在，请修改。<br/>");
}
}
if (!StringUtils.isBlank(p.getPhone())){
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+6 -6
View File
@@ -38,20 +38,20 @@ public class PayCompanyManagement implements Serializable {
/**企业名称*/
@Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
@NotEmpty(message = "企业名称不能为空！")
@NotEmpty(message = "企业名称不能为空")
@Size(max = 50, message = "企业名称长度不能大于50个字符")
private String companyName;
/**信用代码*/
@Excel(name = "信用代码", width = 15)
@ApiModelProperty(value = "信用代码")
@NotEmpty(message = "信用代码不能为空！")
@NotEmpty(message = "信用代码不能为空")
@Size(max = 18, message = "信用代码长度不能大于18个字符")
@Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误")
private String dutyCode;
/**公司地址*/
@Excel(name = "公司地址", width = 15)
@ApiModelProperty(value = "公司地址")
@NotEmpty(message = "公司地址不能为空！")
@NotEmpty(message = "公司地址不能为空")
@Size(max = 50, message = "公司地址长度不能大于50个字符")
private String companyAddress;
/**公司电话*/
@@ -63,7 +63,7 @@ public class PayCompanyManagement implements Serializable {
/**邮政编码*/
@Excel(name = "邮政编码", width = 15)
@ApiModelProperty(value = "邮政编码")
@NotEmpty(message = "邮政编码不能为空！")
@NotEmpty(message = "邮政编码不能为空")
@Size(min=6,max = 6,message = "邮政编码长度必须为6个字符")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮政编码格式错误")
private String postalCode;
@@ -75,13 +75,13 @@ public class PayCompanyManagement implements Serializable {
/**开户行*/
@Excel(name = "开户行", width = 15)
@ApiModelProperty(value = "开户行")
// @NotEmpty(message = "开户行不能为空！")
// @NotEmpty(message = "开户行不能为空")
@Size(max = 50, message = "开户行长度不能大于50个字符")
private String openingBank;
/**银行账号*/
@Excel(name = "银行账号", width = 15)
@ApiModelProperty(value = "银行账号")
// @NotEmpty(message = "银行账号不能为空！")
// @NotEmpty(message = "银行账号不能为空")
@Size(max = 50, message = "银行账号长度不能大于50个字符")
@Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
private String bankAccount;
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+5 -5
View File
@@ -49,7 +49,7 @@ public class PayContactsManagement implements Serializable {
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
@NotEmpty(message = "姓名不能为空！")
@NotEmpty(message = "姓名不能为空")
@Size(max = 50, message = "姓名长度不能大于50个字符")
private String name;
/**性别（1:男，2:女）*/
@@ -65,27 +65,27 @@ public class PayContactsManagement implements Serializable {
/**手机号*/
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空！")
@NotEmpty(message = "手机号不能为空")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
private String phone;
/**邮箱*/
@Excel(name = "邮箱", width = 15)
@ApiModelProperty(value = "邮箱")
@Pattern(regexp = "^\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}$",message = "邮箱格式错误")
@NotEmpty(message = "邮箱不能为空！")
@NotEmpty(message = "邮箱不能为空")
private String email;
/**通讯地址*/
@Excel(name = "通讯地址", width = 15)
@ApiModelProperty(value = "通讯地址")
@Size(max = 50, message = "通讯地址长度不能大于50个字符")
@NotEmpty(message = "通讯地址不能为空！")
@NotEmpty(message = "通讯地址不能为空")
private String contactAddress;
/**邮政编码*/
@Excel(name = "邮政编码", width = 15)
@Size(min=6,max = 6,message = "邮政编码长度必须为6个字符")
@ApiModelProperty(value = "邮政编码")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮政编码格式错误")
@NotEmpty(message = "邮政编码不能为空！")
@NotEmpty(message = "邮政编码不能为空")
private String postalCode;
/**备注*/
@Excel(name = "备注", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+10 -10
View File
@@ -40,18 +40,18 @@ public class PayIncomeContract implements Serializable {
/**合同编号*/
@Excel(name = "合同编号", width = 15)
@ApiModelProperty(value = "合同编号")
@NotEmpty(message = "合同编号不能为空!")
@NotEmpty(message = "合同编号不能为空")
@Size(max = 50, message = "合同编号长度不能大于50个字符")
private java.lang.String contractNum;
/**合同名称*/
@Excel(name = "合同名称", width = 15)
@ApiModelProperty(value = "合同名称")
@NotEmpty(message = "合同名称不能为空!")
@NotEmpty(message = "合同名称不能为空")
@Size(max = 50, message = "合同名称长度不能大于50个字符")
private java.lang.String contractName;
/**签订单位id*/
@ApiModelProperty(value = "签订单位id")
@NotEmpty(message = "签订单位id不能为空!")
@NotEmpty(message = "签订单位id不能为空")
@Size(max = 32, message = "签订单位id长度不能大于32个字符")
private java.lang.String signedCompanyId;
/**临时签订单位id*/
@@ -67,7 +67,7 @@ public class PayIncomeContract implements Serializable {
/**签订单位联系人id*/
@Excel(name = "签订单位联系人id", width = 15)
@ApiModelProperty(value = "签订单位联系人id")
@NotEmpty(message = "签订单位联系人id不能为空!")
@NotEmpty(message = "签订单位联系人id不能为空")
@Size(max = 32, message = "签订单位联系人id长度不能大于32个字符")
private java.lang.String signedContactsId;
/**临时签订单位联系人id*/
@@ -89,7 +89,7 @@ public class PayIncomeContract implements Serializable {
/**负责人id*/
@Excel(name = "负责人id", width = 15)
@ApiModelProperty(value = "负责人id")
@NotEmpty(message = "负责人id不能为空!")
@NotEmpty(message = "负责人id不能为空")
@Size(max = 32, message = "负责人id长度不能大于32个字符")
private java.lang.String principalId;
/**负责人名称*/
@@ -105,21 +105,21 @@ public class PayIncomeContract implements Serializable {
/**签订合同金额*/
@Excel(name = "签订合同金额", width = 15)
@ApiModelProperty(value = "签订合同金额")
@NotNull(message = "签订合同金额不能为空!")
@NotNull(message = "签订合同金额不能为空")
@DecimalMax(value = "9999999999.99",message = "签订合同金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal contractAmount;
/**税率*/
@Excel(name = "税率", width = 15)
@ApiModelProperty(value = "税率")
@NotNull(message = "税率不能为空!")
@NotNull(message = "税率不能为空")
@Max(value = 100,message = "税率格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal rate;
/**未税金额*/
@Excel(name = "未税金额", width = 15)
@ApiModelProperty(value = "未税金额")
@NotNull(message = "未税金额不能为空!")
@NotNull(message = "未税金额不能为空")
@DecimalMax(value = "9999999999.99",message = "未税金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal noTaxAmount;
@@ -143,14 +143,14 @@ public class PayIncomeContract implements Serializable {
/**应收金额*/
@Excel(name = "应收金额", width = 15)
@ApiModelProperty(value = "应收金额")
@NotNull(message = "应收金额不能为空!")
@NotNull(message = "应收金额不能为空")
@DecimalMax(value = "9999999999.99",message = "应收金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal accountsReceivableAmount;
/**已收金额*/
@Excel(name = "已收金额", width = 15)
@ApiModelProperty(value = "已收金额")
@NotNull(message = "已收金额不能为空!")
@NotNull(message = "已收金额不能为空")
@DecimalMax(value = "9999999999.99",message = "已收金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal amountReceived;
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java
+7 -7
View File
@@ -40,13 +40,13 @@ public class PaySpendingContract implements Serializable {
/**合同编号*/
@Excel(name = "合同编号", width = 15)
@ApiModelProperty(value = "合同编号")
@NotEmpty(message = "合同编号不能为空!")
@NotEmpty(message = "合同编号不能为空")
@Size(max = 50, message = "合同编号长度不能大于50个字符")
private String contractNum;
/**合同名称*/
@Excel(name = "合同名称", width = 15)
@ApiModelProperty(value = "合同名称")
@NotEmpty(message = "合同名称不能为空!")
@NotEmpty(message = "合同名称不能为空")
@Size(max = 50, message = "合同名称长度不能大于50个字符")
private String contractName;
/**签订单位id*/
@@ -99,21 +99,21 @@ public class PaySpendingContract implements Serializable {
/**签订合同总金额*/
@Excel(name = "签订合同总金额", width = 15)
@ApiModelProperty(value = "签订合同总金额")
@NotNull(message = "签订合同金额不能为空!")
@NotNull(message = "签订合同金额不能为空")
@DecimalMax(value = "9999999999.99",message = "签订合同金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal contractAmount;
/**税率*/
@Excel(name = "税率", width = 15)
@ApiModelProperty(value = "税率")
@NotNull(message = "税率不能为空!")
@NotNull(message = "税率不能为空")
@DecimalMax(value = "9999999999.99",message = "税率格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal rate;
/**未税金额*/
@Excel(name = "未税金额", width = 15)
@ApiModelProperty(value = "未税金额")
@NotNull(message = "未税金额不能为空!")
@NotNull(message = "未税金额不能为空")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@DecimalMax(value = "9999999999.99",message = "未税金额格式错误")
private BigDecimal noTaxAmount;
@@ -137,14 +137,14 @@ public class PaySpendingContract implements Serializable {
/**应收金额*/
@Excel(name = "应收金额", width = 15)
@ApiModelProperty(value = "应收金额")
@NotNull(message = "应收金额不能为空!")
@NotNull(message = "应收金额不能为空")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@DecimalMax(value = "9999999999.99",message = "应收金额格式错误")
private BigDecimal accountsReceivableAmount;
/**已收金额*/
@Excel(name = "已收金额", width = 15)
@ApiModelProperty(value = "已收金额")
@NotNull(message = "已收金额不能为空!")
@NotNull(message = "已收金额不能为空")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@DecimalMax(value = "9999999999.99",message = "已收金额格式错误")
private BigDecimal amountReceived;
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+29 -29
View File
@@ -356,28 +356,28 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContractInstallment.setPhaseName(sub.get(mm));
if(!StringUtils.isBlank(sub.get(mm + 1))){
if(!pattern.matcher(sub.get(mm + 1)).matches()){
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收格式错误，请修改！<br/>");
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收格式错误，请修改。<br/>");
}else{
paySpendingContractInstallment.setAccountsReceivableAmount(new BigDecimal(sub.get(mm + 1)));
}
}
if(!StringUtils.isBlank(sub.get(mm + 2))){
if(!DateUtils.isValidDate(sub.get(mm + 2))){
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收时间日期格式不正确，请修改！ <br/>");
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收时间日期格式不正确，请修改。 <br/>");
}else{
paySpendingContractInstallment.setAccountsReceivableTime(DateUtils.str2Date(sub.get(mm + 2),new SimpleDateFormat("yyyy-MM-dd")));
}
}
if(!StringUtils.isBlank(sub.get(mm + 3))){
if(!pattern.matcher(sub.get(mm + 3)).matches()){
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收格式错误，请修改！<br/>");
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收格式错误，请修改。<br/>");
}else{
paySpendingContractInstallment.setPaidAmount(new BigDecimal(sub.get(mm + 3)));
}
}
if(!StringUtils.isBlank(sub.get(mm + 4))) {
if (!DateUtils.isValidDate(sub.get(mm + 4))) {
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收时间日期格式不正确，请修改 <br/>");
sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收时间日期格式不正确，请修改。<br/>");
} else {
paySpendingContractInstallment.setPaidTime(DateUtils.str2Date(sub.get(mm + 4), new SimpleDateFormat("yyyy-MM-dd")));
}
@@ -419,7 +419,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
List<PaySpendingContract> listPaySpendingContractNew = listPaySpendingContract.stream().filter(item->
Objects.equals(item.getContractNum(),paySpendingContract.getContractNum())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listPaySpendingContractNew)){
sb.append("第").append(n + 1).append("行:合同编号在excel中重复，请修改！<br/>");
sb.append("第").append(n + 1).append("行:合同编号在excel中重复，请修改。<br/>");
}
listPaySpendingContract.add(paySpendingContract);
@@ -429,42 +429,42 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
List<PaySpendingContract> listDB = listDBContractNum.stream().filter(item->
Objects.equals(item.getContractNum(),paySpendingContract.getContractNum())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listDB)){
sb.append("第").append(n + 1).append("行:合同编号已存在，请修改！<br/>");
sb.append("第").append(n + 1).append("行:合同编号已存在，请修改。<br/>");
}
}else{
sb.append("第").append(n + 1).append("行:合同编号不能为空，请修改！<br/>");
sb.append("第").append(n + 1).append("行:合同编号不能为空，请修改。<br/>");
}
// 验证数据库中是否存在负责人
if(!StringUtils.isBlank(paySpendingContract.getContractName())){
List<SysUser> listDB = listDBPrincipalName.stream().filter(item->
Objects.equals(item.getRealname(),paySpendingContract.getPrincipalName())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listDB)){
sb.append("第").append(n + 1).append("行:负责人不存在，请修改！<br/>");
sb.append("第").append(n + 1).append("行:负责人不存在，请修改。<br/>");
}else{
paySpendingContract.setPrincipalId(listDB.get(0).getId());
// 验证数据库中是否存在部门名称
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(Collections.singletonList(listDB.get(0).getId()));
if(!Objects.isNull(useDepNames)){
if(!Objects.equals(useDepNames.get(listDB.get(0).getId()),paySpendingContract.getDepartmentName())){
sb.append("第").append(n + 1).append("行:部门名称不存在，请修改！<br/>");
sb.append("第").append(n + 1).append("行:部门名称不存在，请修改。<br/>");
}else{
paySpendingContract.setDepartmentName(useDepNames.get(listDB.get(0).getId()));
}
}else{
sb.append("第").append(n + 1).append("行:部门名称不存在，请修改！<br/>");
sb.append("第").append(n + 1).append("行:部门名称不存在，请修改。<br/>");
}
}
}else{
sb.append("第").append(n + 1).append("行:负责人不能为空，请修改！<br/>");
sb.append("第").append(n + 1).append("行:负责人不能为空，请修改。<br/>");
}
if(!Objects.isNull(paySpendingContract.getPack()) && Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1) && StringUtils.isBlank(paySpendingContract.getPackYear())){
sb.append("第").append(n + 1).append("行:打包年份不能为空，请修改！<br/>");
sb.append("第").append(n + 1).append("行:打包年份不能为空，请修改。<br/>");
}
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())){
if(paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
sb.append("第").append(n + 1).append("行:已收金额大于应收金额，请修改！<br/>");
sb.append("第").append(n + 1).append("行:已收金额大于应收金额，请修改。<br/>");
}else if(!Objects.isNull(paySpendingContract.getOutstandingAmount()) && paySpendingContract.getAccountsReceivableAmount().subtract(paySpendingContract.getAmountReceived()).compareTo(paySpendingContract.getOutstandingAmount()) != 0){
sb.append("第").append(n + 1).append("行:未收金额不正确，请修改！<br/>");
sb.append("第").append(n + 1).append("行:未收金额不正确，请修改。<br/>");
}
}
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
@@ -473,7 +473,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
int c = listPaySpendingContractInstallment.indexOf(item) + 1;
if(!Objects.isNull(item.getAccountsReceivableAmount()) && !Objects.isNull(item.getPaidAmount())
&& item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) < 0){
sb.append("第").append(n + 1).append("行:").append(c).append("阶段实收大于应收，请修改！<br/>");
sb.append("第").append(n + 1).append("行:").append(c).append("阶段实收大于应收，请修改。<br/>");
}
});
}
@@ -499,7 +499,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
// 负责人名称
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
if(Objects.isNull(principalName)){
throw new JeroBootException("负责人名称为空，请修改！");
throw new JeroBootException("负责人名称为空，请修改。");
}
paySpendingContract.setPrincipalId(principalName.getId());
paySpendingContract.setPrincipalName(principalName.getRealname());
@@ -535,7 +535,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setContractName(map.get(1));
paySpendingContract.setSignedCompanyTemporaryName(map.get(2));
if(StringUtils.isEmpty(map.get(3))){
sb.append("第").append(n).append("行:负责人不能为空，请修改！<br/>");
sb.append("第").append(n).append("行:负责人不能为空，请修改。<br/>");
}else{
paySpendingContract.setSignedContactsTemporaryName(map.get(3));
}
@@ -547,7 +547,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
});
if(Objects.isNull(paySpendingContract.getOpening())){
sb.append("第").append(n).append("行:是否开口格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:是否开口格式错误，请修改。<br/>");
}
}
@@ -555,35 +555,35 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setDepartmentName(map.get(6));
if(!StringUtils.isBlank(map.get(7))){
if(!pattern.matcher(map.get(7)).matches()){
sb.append("第").append(n).append("行:签订合同总金额格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:签订合同总金额格式错误，请修改。<br/>");
}else{
paySpendingContract.setContractAmount(new BigDecimal(map.get(7)));
}
}
if(!StringUtils.isBlank(map.get(8))){
if(!pattern.matcher(map.get(8)).matches()){
sb.append("第").append(n).append("行:税率格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:税率格式错误，请修改。<br/>");
}else{
paySpendingContract.setRate(new BigDecimal(map.get(8)));
}
}
if(!StringUtils.isBlank(map.get(9)) ){
if(!pattern.matcher(map.get(9)).matches()){
sb.append("第").append(n).append("行:未税金额格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:未税金额格式错误，请修改。<br/>");
}else{
paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9)));
}
}
if(!StringUtils.isBlank(map.get(10)) ){
if(!DateUtils.isValidDate(map.get(10))){
sb.append("第").append(n).append("行:合同签订日期格式不正确，请修改！ <br/>");
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/>");
sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。<br/>");
}else{
paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd")));
}
@@ -591,21 +591,21 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setContractTimePoints(map.get(13));
if(!StringUtils.isBlank(map.get(13))){
if(!pattern.matcher(map.get(13)).matches()){
sb.append("第").append(n).append("行:应收金额格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:应收金额格式错误，请修改。<br/>");
}else{
paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13)));
}
}
if(!StringUtils.isBlank(map.get(14))){
if(!pattern.matcher(map.get(14)).matches()){
sb.append("第").append(n).append("行:已收金额格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:已收金额格式错误，请修改。<br/>");
}else{
paySpendingContract.setAmountReceived(new BigDecimal(map.get(14)));
}
}
if(!StringUtils.isBlank(map.get(15))){
if(!pattern.matcher(map.get(15)).matches()){
sb.append("第").append(n).append("行:未收金额格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:未收金额格式错误，请修改。<br/>");
}else{
paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(15)));
}
@@ -613,7 +613,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setContractPaymentTimes(map.get(17));
if(StringUtils.isEmpty(map.get(18))){
sb.append("第").append(n).append("行:是否打包不能为空，请修改！<br/>");
sb.append("第").append(n).append("行:是否打包不能为空，请修改。<br/>");
}else{
mapPack.forEach((k,v)->{
if(Objects.equals(map.get(18),k)){
@@ -621,13 +621,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
});
if(Objects.isNull(paySpendingContract.getPack())){
sb.append("第").append(n).append("行:是否打包格式错误，请修改！<br/>");
sb.append("第").append(n).append("行:是否打包格式错误，请修改。<br/>");
paySpendingContract.setPack(2);
}
// 打包获取打包年份
if(Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1)){
if(StringUtils.isEmpty(map.get(19))){
sb.append("第").append(n).append("行:打包年份不能为空，请修改！<br/>");
sb.append("第").append(n).append("行:打包年份不能为空，请修改。<br/>");
}else{
paySpendingContract.setPackYear(map.get(19));
}
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+1 -1
View File
@@ -262,7 +262,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
if (!errorMessage.isEmpty()) {
StringBuilder msg = new StringBuilder();
for (String s : errorMessage) {
msg.append(s).append("，请修改。<br/>");
msg.append(s).append("，请修改！<br/>");
}
throw new JeroBootException(msg.toString());
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java
+2 -2
View File
@@ -38,12 +38,12 @@ public class PayPackCompanyProject implements Serializable {
/**打包id*/
@Excel(name = "打包id", width = 15)
@ApiModelProperty(value = "打包id")
@NotEmpty(message = "打包id不能为空!")
@NotEmpty(message = "打包id不能为空")
private java.lang.String packId;
/**项目id*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
@NotEmpty(message = "项目id不能为空!")
@NotEmpty(message = "项目id不能为空")
private java.lang.String projectId;
/**来源（1:收入合同,2:打包管理）*/
@Excel(name = "来源（1:收入合同,2:打包管理）", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+2 -2
View File
@@ -45,7 +45,7 @@ public class PayPaymentRecord implements Serializable {
private Integer projectType;
/**到账金额*/
@ApiModelProperty(value = "到账金额")
@NotNull(message = "到账金额（元）不能为空！")
@NotNull(message = "到账金额（元）不能为空")
@DecimalMax(value = "9999999999.99",message = "到账金额（元）格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal amountReceived;
@@ -53,7 +53,7 @@ public class PayPaymentRecord implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "来款日期")
@NotNull(message = "来款日期不能为空！")
@NotNull(message = "来款日期不能为空")
private java.util.Date paymentDate;
/**备注*/
@Excel(name = "备注", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+9 -9
View File
@@ -46,16 +46,16 @@ public class PayCommonProject implements Serializable {
/**来款用途（字典表）*/
@ApiModelProperty(value = "来款用途")
@Dict(dicCode = "payment_charge_use")
@NotNull(message = "来款用途不能为空！")
@NotNull(message = "来款用途不能为空")
private Integer chargeUse;
/**运行年份*/
@ApiModelProperty(value = "运行年份")
@NotEmpty(message = "运行年份不能为空！")
@NotEmpty(message = "运行年份不能为空")
@Pattern(regexp = "^\\d{4}$",message = "运行年份格式错误")
private String year;
/**负责人id*/
@ApiModelProperty(value = "负责人id")
@NotEmpty(message = "负责人id不能为空！")
@NotEmpty(message = "负责人id不能为空")
private String principalId;
/**负责人名称*/
@Excel(name = "项目负责人", width = 15,orderNum = "2")
@@ -63,7 +63,7 @@ public class PayCommonProject implements Serializable {
private String principalName;
/**来款企业id*/
@ApiModelProperty(value = "来款企业id")
@NotEmpty(message = "来款企业id不能为空！")
@NotEmpty(message = "来款企业id不能为空")
private String chargeCompanyId;
/**临时来款企业id*/
@ApiModelProperty(value = "临时来款企业id")
@@ -74,7 +74,7 @@ public class PayCommonProject implements Serializable {
private String chargeCompanyTemporaryName;
/**联系人id*/
@ApiModelProperty(value = "联系人id")
@NotEmpty(message = "联系人id不能为空！")
@NotEmpty(message = "联系人id不能为空")
private String contactsId;
/**临时联系人id*/
@ApiModelProperty(value = "临时联系人id")
@@ -85,7 +85,7 @@ public class PayCommonProject implements Serializable {
/**应收金额（元）*/
@Excel(name = "应收金额（元）", width = 15,orderNum = "4")
@ApiModelProperty(value = "应收金额（元）")
@NotNull(message = "应收金额（元）不能为空！")
@NotNull(message = "应收金额（元）不能为空")
@DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal receivableAmount;
@@ -97,7 +97,7 @@ public class PayCommonProject implements Serializable {
private BigDecimal paidAmount;
/**邮寄联系人id*/
@ApiModelProperty(value = "邮寄联系人id")
@NotEmpty(message = "邮寄联系人id不能为空！")
@NotEmpty(message = "邮寄联系人id不能为空")
private String mailContactsId;
/**临时邮寄联系人id*/
@ApiModelProperty(value = "临时邮寄联系人id")
@@ -111,7 +111,7 @@ public class PayCommonProject implements Serializable {
private Integer pack;
/**需要发票（1：增值税普通发票，2：增值税专用发票，0：否）*/
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）")
@NotNull(message = "需要发票不能为空！")
@NotNull(message = "需要发票不能为空")
@Dict(dicCode = "invoice_type")
private Integer needInvoice;
/**到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
@@ -125,7 +125,7 @@ public class PayCommonProject implements Serializable {
private Integer mail;
/**来款方式（1：无，2：合同，3：收费通知）*/
@ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
@NotNull(message = "需要发票不能为空！")
@NotNull(message = "需要发票不能为空")
@Dict(dicCode = "payment_type")
private Integer chargeWay;
/**合同编号*/
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
+3 -3
View File
@@ -40,19 +40,19 @@ public class PayWorkingGroup implements Serializable {
/**工作组项目*/
@Excel(name = "工作组项目", width = 15)
@ApiModelProperty(value = "工作组项目")
@NotEmpty(message = "工作组项目不能为空！")
@NotEmpty(message = "工作组项目不能为空")
@Size(max = 50,message = "工作组项目长度不能大于50个字符")
private String workingGroupProject;
/**运行年份*/
@Excel(name = "运行年份", width = 15)
@ApiModelProperty(value = "运行年份")
@NotEmpty(message = "运行年份不能为空！")
@NotEmpty(message = "运行年份不能为空")
@Pattern(regexp = "^\\d{4}$",message = "运行年份格式错误")
private String year;
/**负责人Aid*/
@Excel(name = "负责人Aid", width = 15)
@ApiModelProperty(value = "负责人Aid")
@NotEmpty(message = "负责人Aid不能为空！")
@NotEmpty(message = "负责人Aid不能为空")
@Size(max = 32,message = "负责人Aid长度不能大于32个字符")
private String principalIdA;
/**负责人名称A*/
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java
+3 -3
View File
@@ -37,17 +37,17 @@ public class PayWorkingGroupDataFile implements Serializable {
private java.lang.String id;
/**项目id（工作组id或者分标委id）*/
@ApiModelProperty(value = "项目id（工作组id或者分标委id）")
@NotEmpty(message = "工项目id不能为空！")
@NotEmpty(message = "工项目id不能为空")
@Size(max = 32,message = "项目id长度不能大于32个字符")
private java.lang.String projectId;
/**项目类型1:工作组，2：分标委*/
@ApiModelProperty(value = "项目类型1:工作组，2：分标委")
@NotEmpty(message = "项目类型1不能为空！")
@NotEmpty(message = "项目类型1不能为空")
private java.lang.Integer projectType;
/**文件id*/
// @Excel(name = "文件id", width = 15)
@ApiModelProperty(value = "文件id")
@NotEmpty(message = "文件id不能为空！")
@NotEmpty(message = "文件id不能为空")
@Size(max = 32,message = "文件id长度不能大于32个字符")
private java.lang.String fileId;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class PayWorkingGroupSubItem implements Serializable {
@Excel(name = "来款方式", width = 15,dicCode = "payment_type")
@Dict(dicCode = "payment_type")
@ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
@NotNull(message = "来款方式不能为空！")
@NotNull(message = "来款方式不能为空")
private java.lang.Integer chargeWay;
/**应收金额（元）*/
@Excel(name = "应收金额（元）", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+8 -2
View File
@@ -163,7 +163,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String finalMsg = msg;
list.forEach(p->{
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
return;
}
@@ -299,7 +302,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String finalMsg = msg;
list.forEach(p->{
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
return;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+18 -18
View File
@@ -383,13 +383,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
// 校验企业名称
List<PayCompanyManagement> listCompany = new ArrayList<>();
if (StringUtils.isBlank(p.getChargeCompanyTemporaryName())) {
msg.append("第").append(count + 3).append("行：企业名称不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不能为空，请修改。<br/>");
} else {
// 通过企业名称获取企业id
listCompany = listCompanyInfo.stream().filter(item ->
Objects.equals(item.getCompanyName(), p.getChargeCompanyTemporaryName())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listCompany)) {
msg.append("第").append(count + 3).append("行：企业名称不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。<br/>");
} else {
p.setChargeCompanyId(listCompany.get(0).getId());
}
@@ -398,25 +398,25 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if (!StringUtils.isBlank(p.getChargeCompanyId())) {
List<PayWorkingGroupSubItem> listDateNew = listData.stream().filter(item -> Objects.equals(p.getChargeCompanyId(), item.getChargeCompanyId())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(listDateNew)) {
msg.append("第").append(count + 3).append("行：工作组成员单位已存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:工作组成员单位已存在，请修改。<br/>");
}
}
if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameTwo())
&& Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameTwo())){
msg.append("第").append(count + 3).append("行：企业联系人一与企业联系人二重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业联系人一与企业联系人二重复，请修改。<br/>");
}
if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree())
&& Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameThree())){
msg.append("第").append(count + 3).append("行：企业联系人一与企业联系人三重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业联系人一与企业联系人三重复，请修改。<br/>");
}
if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree())
&& Objects.equals(p.getContactsTemporaryNameTwo(),p.getContactsTemporaryNameThree())){
msg.append("第").append(count + 3).append("行：企业联系人二与企业联系人三重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业联系人二与企业联系人三重复，请修改。<br/>");
}
// 校验联系人一
if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) {
msg.append("第").append(count + 3).append("行：企业联系人一不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业联系人一不能为空，请修改。<br/>");
} else {
if (!CollectionUtils.isEmpty(listCompany)) {
// 通过联系人获取联系人id
@@ -425,7 +425,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
Objects.equals(item.getName(), p.getContactsTemporaryNameOne())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行：该企业下不存在企业联系人一，请修改。<br/>");
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人一，请修改。<br/>");
} else {
p.setContactsIdOne(listContacts.get(0).getId());
}
@@ -441,7 +441,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
Objects.equals(item.getName(), p.getContactsTemporaryNameTwo())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行：该企业下不存在企业联系人二，请修改。<br/>");
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人二，请修改。<br/>");
} else {
p.setContactsIdTwo(listContacts.get(0).getId());
}
@@ -456,7 +456,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
Objects.equals(item.getName(), p.getContactsTemporaryNameThree())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行：该企业下不存在企业联系人三，请修改。<br/>");
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人三，请修改。<br/>");
} else {
p.setContactsIdThree(listContacts.get(0).getId());
}
@@ -464,7 +464,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
}
// 校验邮寄联系人
if (StringUtils.isBlank(p.getMailContactsTemporaryName())) {
msg.append("第").append(count + 3).append("行：邮寄联系人不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:邮寄联系人不能为空，请修改。<br/>");
} else {
if (!CollectionUtils.isEmpty(listCompany)) {
// 通过联系人获取联系人id
@@ -473,7 +473,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
Objects.equals(item.getName(), p.getMailContactsTemporaryName())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行：该企业下不存在邮寄联系人，请修改。<br/>");
msg.append("第").append(count + 3).append("行:该企业下不存在邮寄联系人，请修改。<br/>");
} else {
p.setMailContactsId(listContacts.get(0).getId());
}
@@ -482,21 +482,21 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
// 校验成员唯一性
List<PayWorkingGroupSubItem> listCompanyAndContactsNew = listCompanyAndContacts.stream().filter(item -> Objects.equals(p.getChargeCompanyTemporaryName(), item.getChargeCompanyTemporaryName())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(listCompanyAndContactsNew)) {
msg.append("第").append(count + 3).append("行：工作组成员单位重复出现，请修改。<br/>");
msg.append("第").append(count + 3).append("行:工作组成员单位重复出现，请修改。<br/>");
}
listCompanyAndContacts.add(p);
// 校验
if (Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY2)) {
if (Objects.isNull(p.getReceivableAmount())) {
msg.append("第").append(count + 3).append("行：应收金额不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:应收金额不能为空，请修改。<br/>");
}
if (StringUtils.isBlank(p.getContractNum())) {
msg.append("第").append(count + 3).append("行：合同号不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:合同号不能为空，请修改。<br/>");
}
}
if (Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY3)) {
if (Objects.isNull(p.getChargeNoticeNo())) {
msg.append("第").append(count + 3).append("行：收费通知号不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:收费通知号不能为空，请修改。<br/>");
} else {
if (Objects.equals(payWorkingGroup.getChargeNoticeNoA(), p.getChargeNoticeNo())) {
p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId());
@@ -505,11 +505,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId());
p.setCharge(payWorkingGroup.getChargeB());
} else {
msg.append("第").append(count + 3).append("行：收费通知号不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:收费通知号不存在，请修改。<br/>");
}
}
if (Objects.isNull(p.getReceivableAmount())) {
msg.append("第").append(count + 3).append("行：应收金额不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:应收金额不能为空，请修改。<br/>");
}
}
p.setPack(PayProjectCommon.PACKAGING0);