lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单据编号统一接口

Browse Source
This commit is contained in:
lg
2025-10-18 17:15:16 +08:00
parent 2e5e42fd84
commit 03b249afe7
42 changed files with 141 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java
View File

@ -7,6 +7,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBqlxProjectInfo;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdBqlxProjectInfoBo;
@ -146,15 +147,13 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl<XzdBidPreProjectMap
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(BiddingManagementDto bo) {
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBidPreProject>().gt(XzdBidPreProject::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
String banBen = BatchNumberGenerator.generateBatchNumber("BQLX-");
// 标前立项
XzdBidPreProjectBo xzdBidPreProjectBo = bo.getXzdBidPreProjectBo();
XzdBidPreProject xzdBidPreProject = new XzdBidPreProject();
if (xzdBidPreProjectBo != null) {
BeanUtil.copyProperties(xzdBidPreProjectBo, xzdBidPreProject);
xzdBidPreProject.setProjectNumber(s+"-"+(l+1));
xzdBidPreProject.setProjectNumber(banBen);
baseMapper.insert(xzdBidPreProject);
}

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdProjectRiskAssessmentServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdProjectRiskAssessment;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdProjectRiskAssessmentBo;
@ -140,9 +141,8 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl<XzdProjectR
XzdProjectRiskAssessment add = MapstructUtils.convert(bo, XzdProjectRiskAssessment.class);
validEntityBeforeSave(add);
if(add != null){
String s = areaUtil.generateDateBasedNumber();
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdProjectRiskAssessment>().gt(XzdProjectRiskAssessment::getCreateTime, LocalDate.now()));
add.setDocumentNumber(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("XMFXPGYJB-");
add.setDocumentNumber(banBen);
}
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
import org.dromara.xzd.utilS.AreaUtil;
@ -119,11 +120,9 @@ public class XzdBiddingFileEstimateServiceImpl extends ServiceImpl<XzdBiddingFil
XzdBiddingFileEstimate add = MapstructUtils.convert(bo, XzdBiddingFileEstimate.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBiddingFileEstimate>().gt(XzdBiddingFileEstimate::getCreateTime, LocalDate.now()));
String banBen = BatchNumberGenerator.generateBatchNumber("ZBWJPG-");
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument;
import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjBusinessBid;
@ -135,14 +136,12 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
if (xzdBiddingDocumentbo == null) {
return false;
}
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBiddingDocument>().gt(XzdBiddingDocument::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
XzdBiddingDocument xzdBiddingDocument = new XzdBiddingDocument();
BeanUtils.copyProperties(xzdBiddingDocumentbo, xzdBiddingDocument);
// 单据编号
xzdBiddingDocument.setDocumentNumber(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("TBWJ-");
xzdBiddingDocument.setDocumentNumber(banBen);
this.save(xzdBiddingDocument);
// 投标文件-技术标

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/service/impl/XzdBidDepositPaymentServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo;
@ -134,9 +135,8 @@ public class XzdBidDepositPaymentServiceImpl extends ServiceImpl<XzdBidDepositPa
public Boolean insertByBo(XzdBidDepositPaymentBo bo) {
XzdBidDepositPayment add = MapstructUtils.convert(bo, XzdBidDepositPayment.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBidDepositPayment>().gt(XzdBidDepositPayment::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("TBBZJJN-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentByBqlx;
import org.dromara.xzd.biddingManagement.earnestMoney.service.IXzdBidDepositPaymentService;
@ -142,10 +143,8 @@ public class XzdBidDepositRecoveryServiceImpl extends ServiceImpl<XzdBidDepositR
public Boolean insertByBo(XzdBidDepositRecoveryBo bo) {
XzdBidDepositRecovery add = MapstructUtils.convert(bo, XzdBidDepositRecovery.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBidDepositRecovery>().gt(XzdBidDepositRecovery::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("TBBZJSH-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/service/impl/XzdBiddingAgencyFeePaymentServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
import org.dromara.xzd.utilS.AreaUtil;
@ -115,12 +116,8 @@ public class XzdBiddingAgencyFeePaymentServiceImpl extends ServiceImpl<XzdBiddin
public Boolean insertByBo(XzdBiddingAgencyFeePaymentBo bo) {
XzdBiddingAgencyFeePayment add = MapstructUtils.convert(bo, XzdBiddingAgencyFeePayment.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdBiddingAgencyFeePayment>().gt(XzdBiddingAgencyFeePayment::getCreateTime, LocalDate .now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("ZBDLZFSQ-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation;
@ -177,10 +178,9 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
public Boolean insertByBo(XzdPurchaseContractSuspendBo bo) {
XzdPurchaseContractSuspend add = MapstructUtils.convert(bo, XzdPurchaseContractSuspend.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("CGHTZZ-");
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdPurchaseContractSuspend>().gt(XzdPurchaseContractSuspend::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setReceiptsCode(s+"-"+(l+1));
add.setReceiptsCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo;
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
@ -206,6 +207,9 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
XzdPurchaseContractAlteration add = MapstructUtils.convert(bo, XzdPurchaseContractAlteration.class);
validEntityBeforeSave(add);
String tableName = XzdClassEnum.CAIGOUHETONG_INFORMATION.getClassName();
String banBen = BatchNumberGenerator.generateBatchNumber("CGHTBG-");
add.setReceiptsCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
/**

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java
View File

@ -69,6 +69,12 @@ public class XzdSubcontractChangeVo implements Serializable {
@ExcelProperty(value = "合同编码")
private Long contractCode;
/**
* 合同编码名称
*/
@ExcelProperty(value = "合同编码名称")
private String contractCodeName;
/**
* 合同名称
*/

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.impl;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurchaseContractAlterationVo;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo;
@ -84,6 +86,13 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
private void setValue(List<XzdSubcontractChangeVo> lists) {
for (XzdSubcontractChangeVo item : lists) {
// 合同编号名称
XzdSubcontractVo xzdSubcontractVo = iXzdSubcontractService.queryById(item.getContractCode());
if (xzdSubcontractVo != null) {
item.setContractCodeName(xzdSubcontractVo.getContractCode());
}
//合同文本-预收款项
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
@ -129,6 +138,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
public TableDataInfo<XzdSubcontractChangeVo> queryPageList(XzdSubcontractChangeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdSubcontractChange> lqw = buildQueryWrapper(bo);
Page<XzdSubcontractChangeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
setValue(result.getRecords());
return TableDataInfo.build(result);
}
@ -199,6 +209,8 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
public Boolean insertByBo(XzdSubcontractChangeBo bo) {
XzdSubcontractChange add = MapstructUtils.convert(bo, XzdSubcontractChange.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTBG-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
String tableName = XzdClassEnum.CAIGOUHETONG_INFORMATION.getClassName();

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo;
@ -259,10 +260,10 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
public Boolean insertByBo(XzdSubcontractBo bo) {
XzdSubcontract add = MapstructUtils.convert(bo, XzdSubcontract.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdSubcontract>().gt(XzdSubcontract::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumberByY();
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTXX-");
add.setContractCode(ZxdEnum.FENBAOHETONG_PREFIX.getTypeValue()+"-"+s+"-"+(l+1));
add.setContractCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
// 表名
String tableName = XzdClassEnum.FENBAOHETONG_INFORMATION.getClassName();

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.XzdPurchaseContractSuspend;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo;
@ -133,10 +134,8 @@ public class XzdSubcontractTerminationServiceImpl extends ServiceImpl<XzdSubcont
public Boolean insertByBo(XzdSubcontractTerminationBo bo) {
XzdSubcontractTermination add = MapstructUtils.convert(bo, XzdSubcontractTermination.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdSubcontractTermination>().gt(XzdSubcontractTermination::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTZZ-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation;
@ -200,9 +201,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
public Boolean insertByBo(XzdPurchaseContractInformationBo bo) {
XzdPurchaseContractInformation add = MapstructUtils.convert(bo, XzdPurchaseContractInformation.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdPurchaseContractInformation>().gt(XzdPurchaseContractInformation::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumberByY();
add.setContractCode(ZxdEnum.PURCHASE_PREFIX.getTypeValue()+"-"+s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("CGHTXX-");
add.setContractCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
String tableName = XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName();
//合同文本-预收款项

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysWgcbtbServiceImpl.java
View File

@ -145,7 +145,7 @@ public class XzdCbysWgcbtbServiceImpl extends ServiceImpl<XzdCbysWgcbtbMapper, X
public Boolean insertByBo(XzdCbysWgcbtbBo bo) {
XzdCbysWgcbtb add = MapstructUtils.convert(bo, XzdCbysWgcbtb.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("CBTB");
String banBen = BatchNumberGenerator.generateBatchNumber("WGCBTB");
add.setDocCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java
View File

@ -161,7 +161,7 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
public Boolean insertByBo(XzdCbysZjhcbAlterationBo bo) {
XzdCbysZjhcbAlteration add = MapstructUtils.convert(bo, XzdCbysZjhcbAlteration.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("CBBG-");
String banBen = BatchNumberGenerator.generateBatchNumber("WGCBTB-");
add.setDocCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (bo.getXzdCbysSscb() == null || bo.getXzdCbysSscb().isEmpty()) {

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryVo;
@ -151,11 +152,8 @@ public class XzdGuaranteeChangeInfoServiceImpl extends ServiceImpl<XzdGuaranteeC
public Boolean insertByBo(XzdGuaranteeChangeInfoBo bo) {
XzdGuaranteeChangeInfo add = MapstructUtils.convert(bo, XzdGuaranteeChangeInfo.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdGuaranteeChangeInfo>().gt(XzdGuaranteeChangeInfo::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentNumber(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("JBHTBHBG-");
add.setDocumentNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
@ -187,11 +188,8 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
public Boolean insertByBo(XzdGuaranteeInfoBo bo) {
XzdGuaranteeInfo add = MapstructUtils.convert(bo, XzdGuaranteeInfo.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdGuaranteeInfo>().gt(XzdGuaranteeInfo::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentNumber(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTBH-");
add.setDocumentNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/service/impl/XzdDepositApplicationServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
@ -115,10 +116,8 @@ public class XzdDepositApplicationServiceImpl extends ServiceImpl<XzdDepositAppl
public Boolean insertByBo(XzdDepositApplicationBo bo) {
XzdDepositApplication add = MapstructUtils.convert(bo, XzdDepositApplication.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdDepositApplication>().gt(XzdDepositApplication::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentSerialNumber(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("BZJJNSPB-");
add.setDocumentSerialNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
@ -125,12 +126,10 @@ public class XzdFbhtzbjthServiceImpl extends ServiceImpl<XzdFbhtzbjthMapper, Xzd
public Boolean insertByBo(XzdFbhtzbjthBo bo) {
XzdFbhtzbjth add = MapstructUtils.convert(bo, XzdFbhtzbjth.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTZBJTH-");
Long l = baseMapper.selectCount(new LambdaQueryWrapper<XzdFbhtzbjth>().gt(XzdFbhtzbjth::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerinformationBo.java
View File

@ -38,7 +38,6 @@ public class XzdCustomerinformationBo extends BaseEntity {
/**
* 单位编号
*/
@NotBlank(message = "单位编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String unitCode;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
@ -133,7 +134,9 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
public Boolean insertByBo(XzdContractAccountBo bo) {
XzdContractAccount add = MapstructUtils.convert(bo, XzdContractAccount.class);
validEntityBeforeSave(add);
add.setDocumentCodeThis(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTJGJS-");
add.setDocumentCodeThis(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (!flag) {
return false;

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
@ -126,7 +127,9 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
public Boolean insertByBo(XzdContractAgreementBo bo) {
XzdContractAgreement add = MapstructUtils.convert(bo, XzdContractAgreement.class);
validEntityBeforeSave(add);
add.setContractCode(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("HZXX-");
add.setContractCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
@ -162,8 +163,8 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
public Boolean insertByBo(XzdContractChangeBo bo) {
XzdContractChange add = MapstructUtils.convert(bo, XzdContractChange.class);
validEntityBeforeSave(add);
add.setDocumentCode(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTBG-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (!flag) {

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.ctr.domain.ContractPaymentClause;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
@ -173,8 +174,9 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
public Boolean insertByBo(XzdContractDetailsBo bo) {
XzdContractDetails add = MapstructUtils.convert(bo, XzdContractDetails.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTXX-");
add.setContractCode(IdUtil.getSnowflakeNextIdStr());
add.setContractCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (!flag) {

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
@ -159,7 +160,8 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
public Boolean insertByBo(XzdContractProgressSettlementBo bo) {
XzdContractProgressSettlement add = MapstructUtils.convert(bo, XzdContractProgressSettlement.class);
validEntityBeforeSave(add);
add.setCode((IdUtil.getSnowflakeNextIdStr()));
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTJDJS-");
add.setCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -107,7 +108,8 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
public Boolean insertByBo(XzdContractTerminationBo bo) {
XzdContractTermination add = MapstructUtils.convert(bo, XzdContractTermination.class);
validEntityBeforeSave(add);
bo.setDocumentCode(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTZZ-");
bo.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java
View File

@ -11,6 +11,7 @@ import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.*;
@ -109,6 +110,8 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
dto.getXzdCustomerinformation().setPoiAreaId(dto.getXzdCustomerinformation().getPoiAreaId());
dto.getXzdCustomerinformation().setCreateDept(LoginHelper.getDeptId());
dto.getXzdCustomerinformation().setCreateBy((LoginHelper.getUserId()));
String banBen = BatchNumberGenerator.generateBatchNumber("KHXX-");
dto.getXzdCustomerinformation().setUnitCode(banBen);
// dto.getXzdCustomerinformation().setCreateTime(LocalDateTime.now());
xzdCustomerinformationService.insertByBo(dto.getXzdCustomerinformation());

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -101,6 +102,8 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl<XzdProject
bo.setDocumentNumber(IdUtil.getSnowflake().nextIdStr());
XzdProjectManagerApproval add = MapstructUtils.convert(bo, XzdProjectManagerApproval.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("XMJLTJSPB-");
add.setDocumentNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.domain.vo.SysUserVo;
@ -176,6 +177,8 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
public Boolean insertByBo(XzdProjectBo bo) {
XzdProject add = MapstructUtils.convert(bo, XzdProject.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("XMXX-");
add.setProjectNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl;
@ -186,6 +187,8 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
public Boolean insertByBo(XzdSupplierInfoBo bo) {
XzdSupplierInfo add = MapstructUtils.convert(bo, XzdSupplierInfo.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("GYSXX-");
add.setUnitCode(banBen);
if (add == null){
log.warn("转换对象类型失败");

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
@ -121,7 +122,9 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
public Boolean insertByBo(XzdWorkcontractCompletionAdjustBo bo) {
XzdWorkcontractCompletionAdjust add = MapstructUtils.convert(bo, XzdWorkcontractCompletionAdjust.class);
validEntityBeforeSave(add);
add.setDocumentNumber(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTJGJS-");
add.setDocumentNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.XzdPurchaseContractSuspend;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo;
@ -168,9 +169,9 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
public Boolean insertByBo(SettlementOfSubcontractingContractBo bo) {
SettlementOfSubcontractingContract add = MapstructUtils.convert(bo, SettlementOfSubcontractingContract.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<SettlementOfSubcontractingContract>().gt(SettlementOfSubcontractingContract::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTJD-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo;
import org.dromara.xzd.domain.*;
@ -227,9 +228,9 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl
public Boolean insertByBo(SettlementOfSubcontractingCompletionBo bo) {
SettlementOfSubcontractingCompletion add = MapstructUtils.convert(bo, SettlementOfSubcontractingCompletion.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<SettlementOfSubcontractingCompletion>().gt(SettlementOfSubcontractingCompletion::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTJGJS-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.settlement.fenbaohetongjungong.domain.SettlementOfSubcontractingCompletion;
import org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo.SettlementOfSubcontractingCompletionVo;
@ -110,9 +111,9 @@ public class SettlementOfSubcontractingAdjustmentServiceImpl extends ServiceImpl
public Boolean insertByBo(SettlementOfSubcontractingAdjustmentBo bo) {
SettlementOfSubcontractingAdjustment add = MapstructUtils.convert(bo, SettlementOfSubcontractingAdjustment.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<SettlementOfSubcontractingAdjustment>().gt(SettlementOfSubcontractingAdjustment::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentNo(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTJGJSTZ-");
add.setDocumentNo(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java
View File

@ -236,10 +236,10 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
}
}
//决算单据名称
if (item.getContractCode() != null){
String codeName = jungonService.queryNameById(item.getContractCode());
if (item.getFinalAccountCode() != null){
String codeName = jungonService.queryNameById(item.getFinalAccountCode());
if (codeName != null){
item.setContractCodeName(codeName);
item.setFinalAccountCodeName(codeName);
}
}
//合同编码

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.ctr.domain.vo.ContractPaymentClauseVo;
import org.dromara.ctr.service.impl.ContractPaymentClauseServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
@ -155,7 +156,8 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
public Boolean insertByBo(XzdContractPaymentBo bo) {
XzdContractPayment add = MapstructUtils.convert(bo, XzdContractPayment.class);
validEntityBeforeSave(add);
add.setDocumentCode(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTSG-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.SysOss;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo;
@ -172,7 +173,8 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
public Boolean insertByBo(XzdSkyfkFbhtfkBo bo) {
XzdSkyfkFbhtfk add = MapstructUtils.convert(bo, XzdSkyfkFbhtfk.class);
validEntityBeforeSave(add);
add.setDocumentCode(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("FBHTFG-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/service/impl/XzdSpykpKpsqServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
@ -191,7 +192,9 @@ public class XzdSpykpKpsqServiceImpl extends ServiceImpl<XzdSpykpKpsqMapper, Xzd
public Boolean insertByBo(XzdSpykpKpsqBo bo) {
XzdSpykpKpsq add = MapstructUtils.convert(bo, XzdSpykpKpsq.class);
validEntityBeforeSave(add);
add.setDjbm(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("KPSQ-");
add.setDjbm(banBen);
//申请人
add.setSqr(LoginHelper.getLoginUser().getNickname());
//申请部门

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
@ -135,7 +136,8 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
public Boolean insertByBo(XzdSpykpSjsqdBo bo) {
XzdSpykpSjsqd add = MapstructUtils.convert(bo, XzdSpykpSjsqd.class);
validEntityBeforeSave(add);
add.setDjbh(IdUtil.getSnowflakeNextIdStr());
String banBen = BatchNumberGenerator.generateBatchNumber("SJSQD-");
add.setDjbh(banBen);
LoginUser user = LoginHelper.getLoginUser();
add.setSqrId(user.getUserId());
boolean flag = baseMapper.insert(add) > 0;

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdContractDetails;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
@ -220,9 +221,9 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
public Boolean insertByBo(FinancialRevenuePlanAlterationBo bo) {
FinancialRevenuePlanAlteration add = MapstructUtils.convert(bo, FinancialRevenuePlanAlteration.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<FinancialRevenuePlanAlteration>().gt(FinancialRevenuePlanAlteration::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode( s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("YDZJJHBG-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract;
@ -235,9 +236,8 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
public Boolean insertByBo(FinancialRevenueExpenditurePlanBo bo) {
FinancialRevenueExpenditurePlan add = MapstructUtils.convert(bo, FinancialRevenueExpenditurePlan.class);
validEntityBeforeSave(add);
Long l = baseMapper.selectCount(new LambdaQueryWrapper<FinancialRevenueExpenditurePlan>().gt(FinancialRevenueExpenditurePlan::getCreateTime, LocalDate.now()));
String s = areaUtil.generateDateBasedNumber();
add.setDocumentCode(s+"-"+(l+1));
String banBen = BatchNumberGenerator.generateBatchNumber("YDZJJH-");
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
// 收入明细