支出合同修改签订单位,联系人不做校验
This commit is contained in:
+30
-15
@@ -404,10 +404,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
break;
|
||||
case PayIncomeContractCommon.PROJECT_TYPE3:
|
||||
// 会议项目
|
||||
// 打包合同不可选择会议项目
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
throw new JeroBootException("打包合同不可关联会议项目!");
|
||||
}
|
||||
PayMeetingSituation payMeetingSituation = payMeetingSituationService.getById(p.getProjectId());
|
||||
if(Objects.isNull(payMeetingSituation)){
|
||||
throw new JeroBootException("会议项目不存在!");
|
||||
@@ -427,6 +423,13 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
}
|
||||
// 验证项目是否已被关联
|
||||
getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
|
||||
// 合同选择打包,运行年份不是打包企业,添加打包企业
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
// 合同选择了打包,查看打包年份&&打包企业是否存在
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
payPackCompanyProjectService.setPack(payMeetingSituation.getCompanyId(),payMeetingSituation.getContractId(),payIncomeContract.getPackYear(),payMeetingSituation.getId(),PayIncomeContractCommon.PROJECT_TYPE3,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
principalId = payMeeting.getDirectorId();
|
||||
projectName = payMeeting.getMeetingName();
|
||||
// 更新项目id
|
||||
@@ -648,6 +651,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
}
|
||||
// 更新项目id
|
||||
payIncomeContractAssociated.setProjectId(payMeetingSituation.getId());
|
||||
// 合同为打包
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
// 查询打包项目来源是否为收入合同
|
||||
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
|
||||
queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectId,payMeetingSituation.getId());
|
||||
queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayIncomeContractCommon.COME1);
|
||||
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
|
||||
// 存在数据,取消打包,变更项目打包状态, 否则不进行操作
|
||||
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
|
||||
payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PayIncomeContractCommon.PROJECT_TYPE4:
|
||||
// 会员项目
|
||||
@@ -865,20 +880,20 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
payIncomeContractService.update(update);
|
||||
// 添加审核记录
|
||||
payIncomeContractAuditService.save(payIncomeContractAudit);
|
||||
// 更新到合同邮寄表
|
||||
PayMailContract payMailContract = new PayMailContract();
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractStatus.getSignedContactsTemporaryId());
|
||||
if(!Objects.isNull(payContactsManagementTemporary)){
|
||||
payMailContract.setMobile(payContactsManagementTemporary.getPhone());
|
||||
payMailContract.setEmail(payContactsManagementTemporary.getEmail());
|
||||
}
|
||||
payMailContract.setContractId(payIncomeContractStatus.getId());
|
||||
payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
|
||||
payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
|
||||
payMailContractService.save(payMailContract);
|
||||
|
||||
// 审核通过
|
||||
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
|
||||
// 更新到合同邮寄表
|
||||
PayMailContract payMailContract = new PayMailContract();
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractStatus.getSignedContactsTemporaryId());
|
||||
if(!Objects.isNull(payContactsManagementTemporary)){
|
||||
payMailContract.setMobile(payContactsManagementTemporary.getPhone());
|
||||
payMailContract.setEmail(payContactsManagementTemporary.getEmail());
|
||||
}
|
||||
payMailContract.setContractId(payIncomeContractStatus.getId());
|
||||
payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
|
||||
payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
|
||||
payMailContractService.save(payMailContract);
|
||||
// 获取项目负责人,发送消息
|
||||
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
|
||||
+42
-170
@@ -9,13 +9,7 @@ import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.util.DateUtils;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.contract.common.PayIncomeContractCommon;
|
||||
import com.jero.contract.entity.PayIncomeContract;
|
||||
import com.jero.contract.entity.PayIncomeContractInstallment;
|
||||
import com.jero.contract.entity.PaySpendingContract;
|
||||
import com.jero.contract.entity.PaySpendingContractInstallment;
|
||||
import com.jero.contract.mapper.PaySpendingContractMapper;
|
||||
@@ -23,25 +17,17 @@ import com.jero.contract.service.IPaySpendingContractInstallmentService;
|
||||
import com.jero.contract.service.IPaySpendingContractService;
|
||||
import com.jero.contract.vo.PaySpendingContractImportExcel;
|
||||
import com.jero.contract.vo.PaySpendingContractInput;
|
||||
import com.jero.modules.system.entity.SysDepart;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysDepartService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
|
||||
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.xssf.usermodel.XSSFCell;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.InputStream;
|
||||
@@ -50,7 +36,6 @@ import java.text.DateFormat;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -65,26 +50,16 @@ import java.util.stream.Collectors;
|
||||
@Service
|
||||
public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContractMapper, PaySpendingContract> implements IPaySpendingContractService {
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private IPaySpendingContractInstallmentService paySpendingContractInstallmentService;
|
||||
@Autowired
|
||||
@Resource
|
||||
private IPaySpendingContractService paySpendingContractService;
|
||||
@Autowired
|
||||
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
|
||||
@Autowired
|
||||
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
|
||||
@Autowired
|
||||
@Resource
|
||||
private ISysUserService sysUserService;
|
||||
@Autowired
|
||||
@Resource
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
@Resource
|
||||
private PaySpendingContractMapper paySpendingContractMapper;
|
||||
@Autowired
|
||||
private IPayCompanyManagementService payCompanyManagementService;
|
||||
@Autowired
|
||||
private IPayContactsManagementService payContactsManagementService;
|
||||
@Autowired
|
||||
private ISysDepartService sysDepartService;
|
||||
|
||||
|
||||
@Override
|
||||
@@ -125,7 +100,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
log.info("支出合同-添加异常",e);
|
||||
throw new JeroBootException("合同编号已存在!");
|
||||
}
|
||||
setPaySpendingContractAdd(paySpendingContract);
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
paySpendingContractService.save(paySpendingContract);
|
||||
StringBuilder msgPaySpendingContractInstallment = new StringBuilder();
|
||||
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
@@ -209,7 +190,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("阶段:").append(sb);
|
||||
}
|
||||
if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
|
||||
&& p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) == -1){
|
||||
&& p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
|
||||
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("期应收金额大于已收金额!");
|
||||
}
|
||||
});
|
||||
@@ -218,7 +199,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
if(!StringUtils.isBlank(msgPaySpendingContractInstallment)){
|
||||
throw new JeroBootException(msgPaySpendingContractInstallment.toString());
|
||||
}
|
||||
setPaySpendingContractEdit(paySpendingContract,paySpendingContractStatus);
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
paySpendingContractService.updateById(paySpendingContract);
|
||||
}
|
||||
|
||||
@@ -296,7 +283,6 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}
|
||||
}
|
||||
Map<String, String> mapOpening = sysBaseAPI.queryDictItemsMapByCode("yn");
|
||||
// Map<String, String> mapAccountStatus = sysBaseAPI.queryDictItemsMapByCode("revenue_contract_account_status");
|
||||
Map<String, String> mapPack = sysBaseAPI.queryDictItemsMapByCode("yn");
|
||||
StringBuilder sb = new StringBuilder();
|
||||
List<PaySpendingContractImportExcel> listPaySpendingContractImportExcel = new ArrayList<>();
|
||||
@@ -312,9 +298,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
PaySpendingContractImportExcel paySpendingContractImportExcel = new PaySpendingContractImportExcel();
|
||||
// 获取合同信息
|
||||
PaySpendingContract paySpendingContract = setPaySpendingContractExcel(sub,mapOpening,mapPack,n + 1,sb);
|
||||
if(!Objects.isNull(paySpendingContract)){
|
||||
paySpendingContractImportExcel.setSpendingContract(paySpendingContract);
|
||||
}
|
||||
paySpendingContractImportExcel.setSpendingContract(paySpendingContract);
|
||||
int count1 = count - listSpendingContract.size();
|
||||
if(count > 0){
|
||||
Pattern p = Pattern.compile("[0-9]*");
|
||||
@@ -326,12 +310,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = new ArrayList<>();
|
||||
Pattern pattern = Pattern.compile("[0-9]*\\.?[0-9]+");
|
||||
for (int i = 0; i < count2; i++) {
|
||||
if(StringUtils.isBlank(sub.get(listSpendingContract.size() + (i * 5) + 0))){
|
||||
if(StringUtils.isBlank(sub.get(listSpendingContract.size() + (i * 5)))){
|
||||
continue;
|
||||
}
|
||||
int mm = listSpendingContract.size() + (i * listSpendingContractInstallment.size());
|
||||
PaySpendingContractInstallment paySpendingContractInstallment = new PaySpendingContractInstallment();
|
||||
paySpendingContractInstallment.setPhaseName(sub.get(mm + 0));
|
||||
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("期应收金额格式错误!");
|
||||
@@ -362,12 +346,10 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}
|
||||
listPaySpendingContractInstallment.add(paySpendingContractInstallment);
|
||||
}
|
||||
if(!Objects.isNull(paySpendingContract) && !CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
paySpendingContractImportExcel.setListInstallment(listPaySpendingContractInstallment);
|
||||
}
|
||||
if(!Objects.isNull(paySpendingContract)){
|
||||
listPaySpendingContractImportExcel.add(paySpendingContractImportExcel);
|
||||
}
|
||||
listPaySpendingContractImportExcel.add(paySpendingContractImportExcel);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -383,26 +365,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
LambdaQueryWrapper<PaySpendingContract> queryDBContractNum = new LambdaQueryWrapper<>();
|
||||
queryDBContractNum.in(PaySpendingContract::getContractNum,listContractNum);
|
||||
List<PaySpendingContract> listDBContractNum = paySpendingContractService.list(queryDBContractNum);
|
||||
|
||||
// 获取excel签订单位
|
||||
List<String> listSignedCompanyTemporaryName = listPaySpendingContractData.stream().map(PaySpendingContract::getSignedCompanyTemporaryName).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayCompanyManagement> queryDBSignedCompanyTemporaryName = new LambdaQueryWrapper<>();
|
||||
queryDBSignedCompanyTemporaryName.in(PayCompanyManagement::getCompanyName,listSignedCompanyTemporaryName);
|
||||
List<PayCompanyManagement> listDBSignedCompanyTemporaryName = payCompanyManagementService.list(queryDBSignedCompanyTemporaryName);
|
||||
|
||||
// 获取excel签订单位联系人
|
||||
List<String> listSignedContactsTemporaryName = listPaySpendingContractData.stream().map(PaySpendingContract::getSignedContactsTemporaryName).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayContactsManagement> queryDBSignedContactsTemporaryName = new LambdaQueryWrapper<>();
|
||||
queryDBSignedContactsTemporaryName.in(PayContactsManagement::getName,listSignedContactsTemporaryName);
|
||||
List<PayContactsManagement> listDBSignedContactsTemporaryName = payContactsManagementService.list(queryDBSignedContactsTemporaryName);
|
||||
|
||||
// 获取excel负责人
|
||||
List<SysUser> listDBPrincipalName = sysUserService.list();
|
||||
|
||||
// 校验excel中是否存在重复合同编号
|
||||
List<PaySpendingContract> listPaySpendingContract = new ArrayList<>();
|
||||
listPaySpendingContractImportExcel.forEach(p->{
|
||||
int n = listPaySpendingContractImportExcel.indexOf(p);
|
||||
int n = listPaySpendingContractImportExcel.indexOf(p) + 2;
|
||||
// 校验合同信息
|
||||
PaySpendingContract paySpendingContract = p.getSpendingContract();
|
||||
// 校验excel中是否存在重复合同编号
|
||||
@@ -429,43 +398,16 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}else{
|
||||
sb.append("第").append(n + 1).append("行,合同编号不能为空,请修改!");
|
||||
}
|
||||
// 验证数据库中是否存在签订单位
|
||||
if(!StringUtils.isBlank(paySpendingContract.getSignedCompanyTemporaryName())){
|
||||
List<PayCompanyManagement> listDB = listDBSignedCompanyTemporaryName.stream().filter(item->
|
||||
Objects.equals(item.getCompanyName(),paySpendingContract.getSignedCompanyTemporaryName())).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(listDB)){
|
||||
sb.append("第").append(n + 1).append("行,签订单位不存在,请修改!");
|
||||
}else{
|
||||
paySpendingContract.setSignedCompanyId(listDB.get(0).getId());
|
||||
}
|
||||
}else{
|
||||
sb.append("第").append(n + 1).append("行,签订单位不能为空,请修改!");
|
||||
}
|
||||
// 验证数据库中是否存在签订单位联系人
|
||||
if(!StringUtils.isBlank(paySpendingContract.getSignedCompanyTemporaryName())){
|
||||
if(!StringUtils.isBlank(paySpendingContract.getSignedCompanyId())){
|
||||
List<PayContactsManagement> listDB = listDBSignedContactsTemporaryName.stream().filter(item->
|
||||
Objects.equals(item.getCompanyName(),paySpendingContract.getSignedCompanyTemporaryName())
|
||||
&& Objects.equals(item.getCompanyId(),paySpendingContract.getSignedCompanyId())).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(listDB)){
|
||||
sb.append("第").append(n + 1).append("行,签订企业下签订单位联系人不存在,请修改!");
|
||||
}else{
|
||||
paySpendingContract.setSignedContactsId(listDB.get(0).getId());
|
||||
}
|
||||
}
|
||||
}else{
|
||||
sb.append("第").append(n + 1).append("行,签订单位联系人不能为空,请修改!");
|
||||
}
|
||||
// 验证数据库中是否存在负责人
|
||||
if(!StringUtils.isBlank(paySpendingContract.getContractName())){
|
||||
List<SysUser> listDB = listDBPrincipalName.stream().filter(item->
|
||||
Objects.equals(item.getUsername(),paySpendingContract.getPrincipalName())).collect(Collectors.toList());
|
||||
Objects.equals(item.getRealname(),paySpendingContract.getPrincipalName())).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(listDB)){
|
||||
sb.append("第").append(n + 1).append("行,负责人不存在,请修改!");
|
||||
}else{
|
||||
paySpendingContract.setPrincipalId(listDB.get(0).getId());
|
||||
// 验证数据库中是否存在部门名称
|
||||
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(Arrays.asList(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("行,部门名称不存在,请修改!");
|
||||
@@ -483,7 +425,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
sb.append("第").append(n + 1).append("行,打包年份不能为空,请修改!");
|
||||
}
|
||||
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
|
||||
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) == -1){
|
||||
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
|
||||
sb.append("第").append(n + 1).append("行,应收金额大于已收金额,请修改!");
|
||||
}
|
||||
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
|
||||
@@ -491,7 +433,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
listPaySpendingContractInstallment.forEach(item->{
|
||||
int c = listPaySpendingContractInstallment.indexOf(item) + 1;
|
||||
if(!Objects.isNull(item.getAccountsReceivableAmount()) && !Objects.isNull(item.getPaidAmount())
|
||||
&& item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) == -1){
|
||||
&& item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) < 0){
|
||||
sb.append("第").append(n + 1).append("行,").append(c).append("期应收金额大于已收金额,请修改!");
|
||||
}
|
||||
StringBuilder msg = ValidUtil.validateExcel(item,n + 1);
|
||||
@@ -505,20 +447,27 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
if(!StringUtils.isBlank(sb)){
|
||||
throw new JeroBootException(sb.toString());
|
||||
}
|
||||
|
||||
// 更新数据
|
||||
listPaySpendingContractImportExcel.forEach(p->{
|
||||
PaySpendingContract paySpendingContract = p.getSpendingContract();
|
||||
paySpendingContract.setOutstandingAmount(paySpendingContract.getAccountsReceivableAmount().subtract(paySpendingContract.getAmountReceived()));
|
||||
if(paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) == 0){
|
||||
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS3);
|
||||
}else if(paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) == 1
|
||||
&& paySpendingContract.getAmountReceived().compareTo(new BigDecimal("0.00")) != 0){
|
||||
}else if(paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) > 0
|
||||
&& paySpendingContract.getAmountReceived().compareTo(new BigDecimal("0.00")) != 0){
|
||||
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS2);
|
||||
}else{
|
||||
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
|
||||
}
|
||||
paySpendingContract.setNoTaxAmount((Objects.isNull(paySpendingContract.getContractAmount()) ? new BigDecimal("0.00") : paySpendingContract.getContractAmount()).divide(new BigDecimal("1").add(paySpendingContract.getRate().divide(new BigDecimal("100"))),2,BigDecimal.ROUND_HALF_UP));
|
||||
setPaySpendingContractAdd(paySpendingContract);
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
paySpendingContractService.save(paySpendingContract);
|
||||
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
|
||||
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
@@ -542,7 +491,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
|
||||
|
||||
private PaySpendingContract setPaySpendingContractExcel(Map<Integer,String> map,Map<String, String> mapOpening,Map<String, String> mapPack,
|
||||
int n,StringBuilder sb){
|
||||
int n,StringBuilder sb){
|
||||
Pattern pattern = Pattern.compile("[0-9]*\\.?[0-9]+");
|
||||
PaySpendingContract paySpendingContract = new PaySpendingContract();
|
||||
paySpendingContract.setContractNum(map.get(0));
|
||||
@@ -628,12 +577,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
try{
|
||||
Workbook workbook = null;
|
||||
InputStream is = file.getInputStream();
|
||||
String name = file.getOriginalFilename().toLowerCase();
|
||||
String name = Objects.requireNonNull(file.getOriginalFilename()).toLowerCase();
|
||||
// 创建excel操作对象
|
||||
if (name.contains(".xlsx") || name.contains(".xls")) {
|
||||
workbook = WorkbookFactory.create(is);
|
||||
}
|
||||
//得到一个工作表
|
||||
assert workbook != null;
|
||||
Sheet sheet = workbook.getSheetAt(0);
|
||||
//获得数据的总行数
|
||||
int totalRowNum = sheet.getLastRowNum();
|
||||
@@ -716,82 +666,4 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 插入企业信息,联系人信息到临时表,更新项目记录
|
||||
* @Author lqt
|
||||
* @Date 2021/8/31
|
||||
* @Param payCommonProject
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private void setPaySpendingContractAdd(PaySpendingContract paySpendingContract){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(paySpendingContract.getSignedCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
|
||||
paySpendingContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(paySpendingContract.getSignedContactsId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedContactsTemporaryId(contactsName.getId());
|
||||
paySpendingContract.setSignedContactsTemporaryName(contactsName.getName());
|
||||
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 插入企业信息,联系人信息到临时表,更新项目记录
|
||||
* @Author lqt
|
||||
* @Date 2021/8/31
|
||||
* @Param payCommonProject
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private void setPaySpendingContractEdit(PaySpendingContract paySpendingContract,PaySpendingContract paySpendingContractStatus){
|
||||
if(!Objects.equals(paySpendingContractStatus.getSignedCompanyTemporaryId(),paySpendingContract.getSignedCompanyId())){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(paySpendingContract.getSignedCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
|
||||
paySpendingContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
payCompanyManagementTemporaryService.removeById(paySpendingContract.getSignedCompanyTemporaryId());
|
||||
}else{
|
||||
paySpendingContract.setSignedCompanyId(paySpendingContractStatus.getSignedCompanyId());
|
||||
}
|
||||
|
||||
if(!Objects.equals(paySpendingContractStatus.getSignedContactsTemporaryId(),paySpendingContract.getSignedContactsId())){
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(paySpendingContract.getSignedContactsId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedContactsTemporaryId(contactsName.getId());
|
||||
paySpendingContract.setSignedContactsTemporaryName(contactsName.getName());
|
||||
payContactsManagementTemporaryService.removeById(paySpendingContract.getSignedContactsTemporaryId());
|
||||
}else{
|
||||
paySpendingContract.setSignedContactsId(paySpendingContractStatus.getSignedContactsId());
|
||||
}
|
||||
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user