zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同资金拆分实现

Browse Source
This commit is contained in:
潘荣晟
2026-01-15 16:43:31 +08:00
parent b819904205
commit cd5a942f7b
13 changed files with 568 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/amountdismantle/AmountDismantleController.java Normal file
View File

File diff suppressed because it is too large Load Diff

71
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java Normal file
View File

@@ -0,0 +1,71 @@
package com.zt.plat.module.contractorder.dal.dataobject.amountdismantle;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
/**
* 结算金额拆分 DO
*
* @author 后台管理-1
*/
@TableName("bse_amt_dsmt")
@KeySequence("bse_amt_dsmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
*/
public class AmountDismantleDO extends BusinessBaseDO {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 物料名称
*/
@TableField("MTRL_NAME")
private String materialName;
/**
* 物料编码
*/
@TableField("MTRL_CD")
private String materialCode;
/**
* 元素缩写
*/
@TableField("ELEM_ABBR")
private String elementAbbreviation;
/**
* 元素名称
*/
@TableField("ELEM_NAME")
private String elementName;
/**
* 元素编码
*/
@TableField("ELEM_CD")
private String elementCode;
/**
* 占比
*/
@TableField("RTIO")
private BigDecimal ratio;
/**
* 合同id
*/
@TableField("CTRT_ID")
private Long contractId;
}

33
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java Normal file
View File

@@ -0,0 +1,33 @@
package com.zt.plat.module.contractorder.dal.mysql.amountdismantle;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.module.contractorder.api.vo.contract.AmountDismantlePageReqVO;
import com.zt.plat.module.contractorder.dal.dataobject.amountdismantle.AmountDismantleDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 结算金额拆分 Mapper
*
* @author 后台管理-1
*/
@Mapper
public interface AmountDismantleMapper extends BaseMapperX<AmountDismantleDO> {
default PageResult<AmountDismantleDO> selectPage(AmountDismantlePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<AmountDismantleDO>()
.likeIfPresent(AmountDismantleDO::getMaterialName, reqVO.getMaterialName())
.eqIfPresent(AmountDismantleDO::getMaterialCode, reqVO.getMaterialCode())
.eqIfPresent(AmountDismantleDO::getElementAbbreviation, reqVO.getElementAbbreviation())
.likeIfPresent(AmountDismantleDO::getElementName, reqVO.getElementName())
.eqIfPresent(AmountDismantleDO::getElementCode, reqVO.getElementCode())
.eqIfPresent(AmountDismantleDO::getRatio, reqVO.getRatio())
.eqIfPresent(AmountDismantleDO::getContractId, reqVO.getContractId())
.betweenIfPresent(AmountDismantleDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(AmountDismantleDO::getId));
}
}

71
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/amountdismantle/AmountDismantleService.java Normal file
View File

@@ -0,0 +1,71 @@
package com.zt.plat.module.contractorder.service.amountdismantle;
import java.util.*;
import com.zt.plat.module.contractorder.api.vo.contract.AmountDismantlePageReqVO;
import com.zt.plat.module.contractorder.api.vo.contract.AmountDismantleRespVO;
import com.zt.plat.module.contractorder.api.vo.contract.AmountDismantleSaveReqVO;
import com.zt.plat.module.contractorder.dal.dataobject.amountdismantle.AmountDismantleDO;
import jakarta.validation.*;
import com.zt.plat.framework.common.pojo.PageResult;
/**
* 结算金额拆分 Service 接口
*
* @author 后台管理-1
*/
public interface AmountDismantleService {
/**
* 创建结算金额拆分
*
* @param createReqVO 创建信息
* @return 编号
*/
AmountDismantleRespVO createAmountDismantle(@Valid AmountDismantleSaveReqVO createReqVO);
/**
* 更新结算金额拆分
*
* @param updateReqVO 更新信息
*/
void updateAmountDismantle(@Valid AmountDismantleSaveReqVO updateReqVO);
/**
* 删除结算金额拆分
*
* @param id 编号
*/
void deleteAmountDismantle(Long id);
/**
* 批量删除结算金额拆分
*
* @param ids 编号
*/
void deleteAmountDismantleListByIds(List<Long> ids);
/**
* 获得结算金额拆分
*
* @param id 编号
* @return 结算金额拆分
*/
AmountDismantleDO getAmountDismantle(Long id);
/**
* 获得结算金额拆分分页
*
* @param pageReqVO 分页查询
* @return 结算金额拆分分页
*/
PageResult<AmountDismantleDO> getAmountDismantlePage(AmountDismantlePageReqVO pageReqVO);
/**
* 通过合同id查询结算金额拆分
*
* @param contractId 合同id
* @return 结算金额拆分列表
*/
List<AmountDismantleDO> getAmountDismantleListByContractId(Long contractId);
}

103
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/amountdismantle/AmountDismantleServiceImpl.java Normal file
View File

File diff suppressed because it is too large Load Diff

35
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -27,6 +27,7 @@ import com.zt.plat.module.bpm.api.task.dto.*;
import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import com.zt.plat.module.contractorder.api.dto.contract.*;
import com.zt.plat.module.contractorder.api.vo.contract.*;
import com.zt.plat.module.contractorder.dal.dataobject.amountdismantle.AmountDismantleDO;
import com.zt.plat.module.contractorder.dal.dataobject.contract.*;
import com.zt.plat.module.contractorder.dal.mysql.contract.*;
import com.zt.plat.module.contractorder.enums.DateConstants;
@@ -34,6 +35,7 @@ import com.zt.plat.module.contractorder.enums.DictTypeConstants;
import com.zt.plat.module.contractorder.enums.ProcessConstants;
import com.zt.plat.module.contractorder.enums.TableFieldConstants;
import com.zt.plat.module.contractorder.enums.contract.DictEnum;
import com.zt.plat.module.contractorder.service.amountdismantle.AmountDismantleService;
import com.zt.plat.module.contractorder.service.contractreceivesend.ContractReceiveSendService;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractPageReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO;
@@ -121,7 +123,8 @@ public class ContractServiceImpl implements ContractService {
@Resource
private ContractReceiveSendService contractReceiveSendService;
@Resource
private AmountDismantleService amountDismantleService;
@Override
public PageResult<ContractMainDO> getContractPage(ContractPageReqVO pageReqVO) {
return contractMainMapper.selectContractPage(pageReqVO);
@@ -316,6 +319,13 @@ public class ContractServiceImpl implements ContractService {
contractReceiveSendService.createContractReceiveSend(contractReceiveSend);
});
}
//插入资金拆分表
if(reqVO.getAmountSplit() != null && !reqVO.getAmountSplit().isEmpty()){
reqVO.getAmountSplit().forEach(amountDismantle -> {
amountDismantle.setContractId(contractId);
amountDismantleService.createAmountDismantle(amountDismantle);
});
}
return contractId;
}
@@ -950,7 +960,28 @@ public class ContractServiceImpl implements ContractService {
// 执行中合同重新提交erp
submitErp(newContractMainDO.getId());
}
//更新收发货规则
if (reqVO.getContractReceiveSends() != null && !reqVO.getContractReceiveSends().isEmpty()){
//通过合同id删除收发货规则
List<ContractReceiveSendRespVO> contractReceiveSendListByContract = contractReceiveSendService.getContractReceiveSendListByContractId(id);
contractReceiveSendService.deleteContractReceiveSendListByIds(contractReceiveSendListByContract.stream().map(ContractReceiveSendRespVO::getId).toList());
//重新插入收发货规则
reqVO.getContractReceiveSends().forEach(item->{
item.setContractId(id);
item.setId(null);
contractReceiveSendService.createContractReceiveSend(item);
});
}
//更新资金拆分表(直接先删除后面再插入)
if (reqVO.getAmountSplit()!=null &&!reqVO.getAmountSplit().isEmpty()){
List<AmountDismantleDO> amountDismantleList = amountDismantleService.getAmountDismantleListByContractId(id);
amountDismantleService.deleteAmountDismantleListByIds(amountDismantleList.stream().map(AmountDismantleDO::getId).toList());
reqVO.getAmountSplit().forEach(item->{
item.setContractId(id);
item.setId(null);
amountDismantleService.createAmountDismantle(item);
});
}
return true;
}