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

修改bug#41446

Browse Source
This commit is contained in:
梁琦涛
2021-10-26 16:00:49 +08:00
parent a5f18889ee
commit ab86edc836
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+22 -22
View File
@@ -56,39 +56,39 @@ public class PayWorkingGroupSubItem implements Serializable {
@Excel(name = "成员单位", width = 15) @Excel(name = "成员单位", width = 15)
@ApiModelProperty(value = "临时成员单位") @ApiModelProperty(value = "临时成员单位")
private java.lang.String chargeCompanyTemporaryName; private java.lang.String chargeCompanyTemporaryName;
/**企业联系人一id*/ /**企业联系人1id*/
@ApiModelProperty(value = "企业联系人一id") @ApiModelProperty(value = "企业联系人1id")
@Size(max = 32,message = "企业联系人一id长度不能大于32个字符") @Size(max = 32,message = "企业联系人1id长度不能大于32个字符")
// @NotEmpty(message = "企业联系人一id不能为空") // @NotEmpty(message = "企业联系人1id不能为空")
private java.lang.String contactsIdOne; private java.lang.String contactsIdOne;
/**临时企业联系人一id*/ /**临时企业联系人1id*/
@ApiModelProperty(value = "临时企业联系人一id") @ApiModelProperty(value = "临时企业联系人1id")
private java.lang.String contactsTemporaryIdOne; private java.lang.String contactsTemporaryIdOne;
/**临时企业联系人一名称*/ /**临时企业联系人1名称*/
@Excel(name = "企业联系人1", width = 15) @Excel(name = "企业联系人1", width = 15)
@ApiModelProperty(value = "临时企业联系人一名称") @ApiModelProperty(value = "临时企业联系人1名称")
private java.lang.String contactsTemporaryNameOne; private java.lang.String contactsTemporaryNameOne;
/**企业联系人二id*/ /**企业联系人2id*/
@ApiModelProperty(value = "企业联系人二id") @ApiModelProperty(value = "企业联系人2id")
@Size(max = 32,message = "企业联系人二id长度不能大于32个字符") @Size(max = 32,message = "企业联系人2id长度不能大于32个字符")
private java.lang.String contactsIdTwo; private java.lang.String contactsIdTwo;
/**临时企业联系人二id*/ /**临时企业联系人3id*/
@ApiModelProperty(value = "临时企业联系人二id") @ApiModelProperty(value = "临时企业联系人3id")
private java.lang.String contactsTemporaryIdTwo; private java.lang.String contactsTemporaryIdTwo;
/**临时企业联系人二名称*/ /**临时企业联系人2名称*/
@Excel(name = "企业联系人2", width = 15) @Excel(name = "企业联系人2", width = 15)
@ApiModelProperty(value = "临时企业联系人二名称") @ApiModelProperty(value = "临时企业联系人2名称")
private java.lang.String contactsTemporaryNameTwo; private java.lang.String contactsTemporaryNameTwo;
/**企业联系人三id*/ /**企业联系人3id*/
@ApiModelProperty(value = "企业联系人三id") @ApiModelProperty(value = "企业联系人3id")
@Size(max = 32,message = "企业联系人三id长度不能大于32个字符") @Size(max = 32,message = "企业联系人3id长度不能大于32个字符")
private java.lang.String contactsIdThree; private java.lang.String contactsIdThree;
/**临时企业联系人三id*/ /**临时企业联系人3id*/
@ApiModelProperty(value = "临时企业联系人三id") @ApiModelProperty(value = "临时企业联系人3id")
private java.lang.String contactsTemporaryIdThree; private java.lang.String contactsTemporaryIdThree;
/**临时企业联系人三名称*/ /**临时企业联系人3名称*/
@Excel(name = "企业联系人3", width = 15) @Excel(name = "企业联系人3", width = 15)
@ApiModelProperty(value = "临时企业联系人三名称") @ApiModelProperty(value = "临时企业联系人3名称")
private java.lang.String contactsTemporaryNameThree; private java.lang.String contactsTemporaryNameThree;
/**临时邮寄联系人名称*/ /**临时邮寄联系人名称*/
@Excel(name = "邮寄联系人", width = 15) @Excel(name = "邮寄联系人", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+19 -19
View File
@@ -403,20 +403,20 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
} }
if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameTwo()) if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameTwo())
&& Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameTwo())){ && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameTwo())){
msg.append("第").append(count + 3).append("行:企业联系人一与企业联系人二重复，请修改。<br/>"); msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人2重复，请修改。<br/>");
} }
if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree())
&& Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameThree())){ && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameThree())){
msg.append("第").append(count + 3).append("行:企业联系人一与企业联系人三重复，请修改。<br/>"); msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人3重复，请修改。<br/>");
} }
if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree())
&& Objects.equals(p.getContactsTemporaryNameTwo(),p.getContactsTemporaryNameThree())){ && Objects.equals(p.getContactsTemporaryNameTwo(),p.getContactsTemporaryNameThree())){
msg.append("第").append(count + 3).append("行:企业联系人二与企业联系人三重复，请修改。<br/>"); msg.append("第").append(count + 3).append("行:企业联系人2与企业联系人3重复，请修改。<br/>");
} }
// 校验联系人一 // 校验联系人一
if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) { if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) {
msg.append("第").append(count + 3).append("行:企业联系人一不能为空，请修改。<br/>"); msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。<br/>");
} else { } else {
if (!CollectionUtils.isEmpty(listCompany)) { if (!CollectionUtils.isEmpty(listCompany)) {
// 通过联系人获取联系人id // 通过联系人获取联系人id
@@ -425,7 +425,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
Objects.equals(item.getName(), p.getContactsTemporaryNameOne()) Objects.equals(item.getName(), p.getContactsTemporaryNameOne())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) { if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人一，请修改。<br/>"); msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人1，请修改。<br/>");
} else { } else {
p.setContactsIdOne(listContacts.get(0).getId()); 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.getName(), p.getContactsTemporaryNameTwo())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) { if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人二，请修改。<br/>"); msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人2，请修改。<br/>");
} else { } else {
p.setContactsIdTwo(listContacts.get(0).getId()); 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.getName(), p.getContactsTemporaryNameThree())
&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listContacts)) { if (CollectionUtils.isEmpty(listContacts)) {
msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人三，请修改。<br/>"); msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人3，请修改。<br/>");
} else { } else {
p.setContactsIdThree(listContacts.get(0).getId()); p.setContactsIdThree(listContacts.get(0).getId());
} }
@@ -645,27 +645,27 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
} }
payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId()); payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName()); payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
// 企业联系人一 // 企业联系人1
PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne()); PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne());
if(Objects.isNull(contactsNameOne)){ if(Objects.isNull(contactsNameOne)){
throw new JeroBootException("企业联系人一名称为空！"); throw new JeroBootException("企业联系人1名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId()); payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId());
payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName()); payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName());
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){ if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
// 企业联系人二 // 企业联系人2
PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo()); PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo());
if(Objects.isNull(contactsNameTwo)){ if(Objects.isNull(contactsNameTwo)){
throw new JeroBootException("企业联系人二名称为空！"); throw new JeroBootException("企业联系人2名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId()); payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId());
payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName()); payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName());
} }
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){ if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
// 企业联系人三 // 企业联系人3
PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree()); PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree());
if(Objects.isNull(contactsNameThree)){ if(Objects.isNull(contactsNameThree)){
throw new JeroBootException("企业联系人三名称为空！"); throw new JeroBootException("企业联系人3名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId()); payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId());
payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName()); payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName());
@@ -700,10 +700,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
payWorkingGroupSubItem.setChargeCompanyId(payWorkingGroupSubItemOld.getChargeCompanyId()); payWorkingGroupSubItem.setChargeCompanyId(payWorkingGroupSubItemOld.getChargeCompanyId());
} }
if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdOne(),payWorkingGroupSubItem.getContactsIdOne())){ if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdOne(),payWorkingGroupSubItem.getContactsIdOne())){
// 企业联系人一 // 企业联系人1
PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne()); PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne());
if(Objects.isNull(contactsNameOne)){ if(Objects.isNull(contactsNameOne)){
throw new JeroBootException("企业联系人一名称为空！"); throw new JeroBootException("企业联系人1名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId()); payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId());
payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName()); payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName());
@@ -714,10 +714,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){ if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo(),payWorkingGroupSubItem.getContactsIdTwo())) { if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo(),payWorkingGroupSubItem.getContactsIdTwo())) {
// 企业联系人二 // 企业联系人2
PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo()); PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo());
if (Objects.isNull(contactsNameTwo)) { if (Objects.isNull(contactsNameTwo)) {
throw new JeroBootException("企业联系人二名称为空！"); throw new JeroBootException("企业联系人2名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId()); payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId());
payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName()); payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName());
@@ -733,10 +733,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
} }
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){ if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdThree(),payWorkingGroupSubItem.getContactsIdThree())) { if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdThree(),payWorkingGroupSubItem.getContactsIdThree())) {
// 企业联系人三 // 企业联系人3
PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree()); PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree());
if (Objects.isNull(contactsNameThree)) { if (Objects.isNull(contactsNameThree)) {
throw new JeroBootException("企业联系人三名称为空！"); throw new JeroBootException("企业联系人3名称为空！");
} }
payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId()); payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId());
payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName()); payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName());