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-09-18 17:59:34 +08:00
parent 2681f6f12b
commit 90f27445dc
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+26 -19
View File
@@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -148,7 +145,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
log.info("收入合同-添加异常",e); log.info("收入合同-添加异常",e);
throw new JeroBootException("合同名称已存在！"); throw new JeroBootException("合同名称已存在！");
} }
setPayIncomeContract(payIncomeContract); setPayIncomeContract(payIncomeContract,null);
payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1); payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1);
payIncomeContractService.save(payIncomeContract); payIncomeContractService.save(payIncomeContract);
@@ -275,7 +272,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
} }
// 校验金额 // 校验金额
checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract); checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
setPayIncomeContract(payIncomeContract); setPayIncomeContract(payIncomeContract,payIncomeContractStatus);
// 先删除临时表企业信息，联系人信息，邮寄联系人信息
payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
payContactsManagementTemporaryService.removeByIds(Arrays.asList(payIncomeContract.getSignedContactsTemporaryId()));
payIncomeContractService.updateById(payIncomeContract); payIncomeContractService.updateById(payIncomeContract);
} }
@@ -661,17 +661,28 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
* @Return * @Return
* @Exception * @Exception
*/ */
private void setPayIncomeContract(PayIncomeContract payIncomeContract){ private void setPayIncomeContract(PayIncomeContract payIncomeContract,PayIncomeContract payIncomeContractStatus){
// 企业 if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId()); // 企业
if(Objects.isNull(chargeCompanyName)){ PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
throw new JeroBootException("企业名称为空！"); if(Objects.isNull(chargeCompanyName)){
throw new JeroBootException("企业名称为空！");
}
payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
} }
// 联系人
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId()); if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
if(Objects.isNull(contactsName)){ // 联系人
throw new JeroBootException("联系人名称为空！"); PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId());
if(Objects.isNull(contactsName)){
throw new JeroBootException("联系人名称为空！");
}
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
} }
// 负责人名称 // 负责人名称
SysUser principalName = sysUserService.getById(payIncomeContract.getPrincipalId()); SysUser principalName = sysUserService.getById(payIncomeContract.getPrincipalId());
if(Objects.isNull(principalName)){ if(Objects.isNull(principalName)){
@@ -679,10 +690,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
} }
payIncomeContract.setPrincipalId(principalName.getId()); payIncomeContract.setPrincipalId(principalName.getId());
payIncomeContract.setPrincipalName(principalName.getRealname()); payIncomeContract.setPrincipalName(principalName.getRealname());
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
} }
@Override @Override
jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
+1
View File
@@ -48,6 +48,7 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
str = JSONObject.toJSONString(payCompanyManagement); str = JSONObject.toJSONString(payCompanyManagement);
} }
PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class); PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class);
payCompanyManagementTemporary.setId(null);
payCompanyManagementTemporaryService.save(payCompanyManagementTemporary); payCompanyManagementTemporaryService.save(payCompanyManagementTemporary);
return payCompanyManagementTemporary; return payCompanyManagementTemporary;
} }
jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
+1
View File
@@ -47,6 +47,7 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
str = JSONObject.toJSONString(payContactsManagement); str = JSONObject.toJSONString(payContactsManagement);
} }
PayContactsManagementTemporary payContactsManagementTemporary = JSON.parseObject(str,PayContactsManagementTemporary.class); PayContactsManagementTemporary payContactsManagementTemporary = JSON.parseObject(str,PayContactsManagementTemporary.class);
payContactsManagementTemporary.setId(null);
payContactsManagementTemporaryService.save(payContactsManagementTemporary); payContactsManagementTemporaryService.save(payContactsManagementTemporary);
return payContactsManagementTemporary; return payContactsManagementTemporary;
} }