1.0.76 初始化合同变更、合同变更信息、合同变更物料、合同变更付款方式
parent
bf1e0729e9
commit
1321973ed3
@ -0,0 +1,229 @@
|
||||
package org.dromara.oa.erp.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 合同变更信息对象 erp_contract_change_info
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("erp_contract_change_info")
|
||||
public class ErpContractChangeInfo extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 变更信息快照ID
|
||||
*/
|
||||
@TableId(value = "change_info_id", type = IdType.AUTO)
|
||||
private Long changeInfoId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 有无合同(1有 2无)
|
||||
*/
|
||||
private String contractFlag;
|
||||
|
||||
/**
|
||||
* 客户合同编号
|
||||
*/
|
||||
private String customerContractCode;
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
private String contractCode;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
private String contractName;
|
||||
|
||||
/**
|
||||
* 合同大类
|
||||
*/
|
||||
private String contractCategory;
|
||||
|
||||
/**
|
||||
* 合同类型
|
||||
*/
|
||||
private String contractType;
|
||||
|
||||
/**
|
||||
* 业务方向
|
||||
*/
|
||||
private String businessDirection;
|
||||
|
||||
/**
|
||||
* 部门
|
||||
*/
|
||||
private Long contractDeptId;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
private Date contractDate;
|
||||
|
||||
/**
|
||||
* 合同总价
|
||||
*/
|
||||
private Long totalPrice;
|
||||
|
||||
/**
|
||||
* 甲方公司
|
||||
*/
|
||||
private Long oneCustomerId;
|
||||
|
||||
/**
|
||||
* 甲方授权代表
|
||||
*/
|
||||
private String oneRepresent;
|
||||
|
||||
/**
|
||||
* 甲方签字日期
|
||||
*/
|
||||
private Date oneDate;
|
||||
|
||||
/**
|
||||
* 乙方公司
|
||||
*/
|
||||
private Long twoCustomerId;
|
||||
|
||||
/**
|
||||
* 乙方授权代表
|
||||
*/
|
||||
private String twoRepresent;
|
||||
|
||||
/**
|
||||
* 乙方签字日期
|
||||
*/
|
||||
private Date twoDate;
|
||||
|
||||
/**
|
||||
* 合同负责人
|
||||
*/
|
||||
private Long contractManagerId;
|
||||
|
||||
/**
|
||||
* 合同模板ID
|
||||
*/
|
||||
private Long templateId;
|
||||
|
||||
/**
|
||||
* 附件ID
|
||||
*/
|
||||
private String ossId;
|
||||
|
||||
/**
|
||||
* 付款账户ID
|
||||
*/
|
||||
private Long paymentAccountId;
|
||||
|
||||
/**
|
||||
* 付款方式
|
||||
*/
|
||||
private String paymentMethod;
|
||||
|
||||
/**
|
||||
* 签字合同附件
|
||||
*/
|
||||
private Long signatureAppendix;
|
||||
|
||||
/**
|
||||
* 质保期(天)
|
||||
*/
|
||||
private Long warrantyPeriod;
|
||||
|
||||
/**
|
||||
* 内部合同号
|
||||
*/
|
||||
private String internalContractCode;
|
||||
|
||||
/**
|
||||
* 外部合同号
|
||||
*/
|
||||
private String externalContractCode;
|
||||
|
||||
/**
|
||||
* 订单号
|
||||
*/
|
||||
private String orderContractCode;
|
||||
|
||||
/**
|
||||
* 项目号
|
||||
*/
|
||||
private String projectContractCode;
|
||||
|
||||
/**
|
||||
* 交付启动期限
|
||||
*/
|
||||
private Long deliveryStart;
|
||||
|
||||
/**
|
||||
* 质保期描述
|
||||
*/
|
||||
private String warrantyPeriodDescription;
|
||||
|
||||
/**
|
||||
* 交货地点
|
||||
*/
|
||||
private String deliveryLocation;
|
||||
|
||||
/**
|
||||
* 运输方式
|
||||
*/
|
||||
private String shipMethod;
|
||||
|
||||
/**
|
||||
* 合同税率
|
||||
*/
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 签订地点
|
||||
*/
|
||||
private String signingPlace;
|
||||
|
||||
/**
|
||||
* 合同物料备注
|
||||
*/
|
||||
private String materialRemark;
|
||||
|
||||
/**
|
||||
* 合同模板标识
|
||||
*/
|
||||
private String contractTemplateFlag;
|
||||
|
||||
/**
|
||||
* 合同大写金额
|
||||
*/
|
||||
private String capitalizedAmount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@TableLogic
|
||||
private String delFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
package org.dromara.oa.erp.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 合同变更物料对象 erp_contract_change_material
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("erp_contract_change_material")
|
||||
public class ErpContractChangeMaterial extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 变更物料快照ID
|
||||
*/
|
||||
@TableId(value = "change_material_id", type = IdType.AUTO)
|
||||
private Long changeMaterialId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 标准物料标识
|
||||
*/
|
||||
private String materialFlag;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 规格描述
|
||||
*/
|
||||
private String specificationDescription;
|
||||
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 销售物料ID
|
||||
*/
|
||||
private Long relationMaterialId;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private Long amount;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long unitId;
|
||||
|
||||
/**
|
||||
* 未税单价
|
||||
*/
|
||||
private Long beforePrice;
|
||||
|
||||
/**
|
||||
* 税率
|
||||
*/
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 含税单价
|
||||
*/
|
||||
private Long includingPrice;
|
||||
|
||||
/**
|
||||
* 小计
|
||||
*/
|
||||
private Long subtotal;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 激活标识
|
||||
*/
|
||||
private String activeFlag;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@TableLogic
|
||||
private String delFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,221 @@
|
||||
package org.dromara.oa.erp.domain.bo;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeInfo;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 合同变更信息业务对象 erp_contract_change_info
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ErpContractChangeInfo.class, reverseConvertGenerate = false)
|
||||
public class ErpContractChangeInfoBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 变更信息快照ID
|
||||
*/
|
||||
private Long changeInfoId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 有无合同(1有 2无)
|
||||
*/
|
||||
private String contractFlag;
|
||||
|
||||
/**
|
||||
* 客户合同编号
|
||||
*/
|
||||
private String customerContractCode;
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
private String contractCode;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
private String contractName;
|
||||
|
||||
/**
|
||||
* 合同大类
|
||||
*/
|
||||
private String contractCategory;
|
||||
|
||||
/**
|
||||
* 合同类型
|
||||
*/
|
||||
private String contractType;
|
||||
|
||||
/**
|
||||
* 业务方向
|
||||
*/
|
||||
private String businessDirection;
|
||||
|
||||
/**
|
||||
* 部门
|
||||
*/
|
||||
private Long contractDeptId;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
private Date contractDate;
|
||||
|
||||
/**
|
||||
* 合同总价
|
||||
*/
|
||||
private Long totalPrice;
|
||||
|
||||
/**
|
||||
* 甲方公司
|
||||
*/
|
||||
private Long oneCustomerId;
|
||||
|
||||
/**
|
||||
* 甲方授权代表
|
||||
*/
|
||||
private String oneRepresent;
|
||||
|
||||
/**
|
||||
* 甲方签字日期
|
||||
*/
|
||||
private Date oneDate;
|
||||
|
||||
/**
|
||||
* 乙方公司
|
||||
*/
|
||||
private Long twoCustomerId;
|
||||
|
||||
/**
|
||||
* 乙方授权代表
|
||||
*/
|
||||
private String twoRepresent;
|
||||
|
||||
/**
|
||||
* 乙方签字日期
|
||||
*/
|
||||
private Date twoDate;
|
||||
|
||||
/**
|
||||
* 合同负责人
|
||||
*/
|
||||
private Long contractManagerId;
|
||||
|
||||
/**
|
||||
* 合同模板ID
|
||||
*/
|
||||
private Long templateId;
|
||||
|
||||
/**
|
||||
* 附件ID
|
||||
*/
|
||||
private String ossId;
|
||||
|
||||
/**
|
||||
* 付款账户ID
|
||||
*/
|
||||
private Long paymentAccountId;
|
||||
|
||||
/**
|
||||
* 付款方式
|
||||
*/
|
||||
private String paymentMethod;
|
||||
|
||||
/**
|
||||
* 签字合同附件
|
||||
*/
|
||||
private Long signatureAppendix;
|
||||
|
||||
/**
|
||||
* 质保期(天)
|
||||
*/
|
||||
private Long warrantyPeriod;
|
||||
|
||||
/**
|
||||
* 内部合同号
|
||||
*/
|
||||
private String internalContractCode;
|
||||
|
||||
/**
|
||||
* 外部合同号
|
||||
*/
|
||||
private String externalContractCode;
|
||||
|
||||
/**
|
||||
* 订单号
|
||||
*/
|
||||
private String orderContractCode;
|
||||
|
||||
/**
|
||||
* 项目号
|
||||
*/
|
||||
private String projectContractCode;
|
||||
|
||||
/**
|
||||
* 交付启动期限
|
||||
*/
|
||||
private Long deliveryStart;
|
||||
|
||||
/**
|
||||
* 质保期描述
|
||||
*/
|
||||
private String warrantyPeriodDescription;
|
||||
|
||||
/**
|
||||
* 交货地点
|
||||
*/
|
||||
private String deliveryLocation;
|
||||
|
||||
/**
|
||||
* 运输方式
|
||||
*/
|
||||
private String shipMethod;
|
||||
|
||||
/**
|
||||
* 合同税率
|
||||
*/
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 签订地点
|
||||
*/
|
||||
private String signingPlace;
|
||||
|
||||
/**
|
||||
* 合同物料备注
|
||||
*/
|
||||
private String materialRemark;
|
||||
|
||||
/**
|
||||
* 合同模板标识
|
||||
*/
|
||||
private String contractTemplateFlag;
|
||||
|
||||
/**
|
||||
* 合同大写金额
|
||||
*/
|
||||
private String capitalizedAmount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
package org.dromara.oa.erp.domain.bo;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeMaterial;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 合同变更物料业务对象 erp_contract_change_material
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ErpContractChangeMaterial.class, reverseConvertGenerate = false)
|
||||
public class ErpContractChangeMaterialBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 变更物料快照ID
|
||||
*/
|
||||
private Long changeMaterialId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 标准物料标识
|
||||
*/
|
||||
private String materialFlag;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 规格描述
|
||||
*/
|
||||
private String specificationDescription;
|
||||
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 销售物料ID
|
||||
*/
|
||||
private Long relationMaterialId;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private Long amount;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long unitId;
|
||||
|
||||
/**
|
||||
* 未税单价
|
||||
*/
|
||||
private Long beforePrice;
|
||||
|
||||
/**
|
||||
* 税率
|
||||
*/
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 含税单价
|
||||
*/
|
||||
private Long includingPrice;
|
||||
|
||||
/**
|
||||
* 小计
|
||||
*/
|
||||
private Long subtotal;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 激活标识
|
||||
*/
|
||||
private String activeFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,268 @@
|
||||
package org.dromara.oa.erp.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeInfo;
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 合同变更信息视图对象 erp_contract_change_info
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ErpContractChangeInfo.class)
|
||||
public class ErpContractChangeInfoVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 变更信息快照ID
|
||||
*/
|
||||
@ExcelProperty(value = "变更信息快照ID")
|
||||
private Long changeInfoId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
@ExcelProperty(value = "合同变更ID")
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 有无合同(1有 2无)
|
||||
*/
|
||||
@ExcelProperty(value = "有无合同(1有 2无)")
|
||||
private String contractFlag;
|
||||
|
||||
/**
|
||||
* 客户合同编号
|
||||
*/
|
||||
@ExcelProperty(value = "客户合同编号")
|
||||
private String customerContractCode;
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
@ExcelProperty(value = "合同编号")
|
||||
private String contractCode;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@ExcelProperty(value = "合同名称")
|
||||
private String contractName;
|
||||
|
||||
/**
|
||||
* 合同大类
|
||||
*/
|
||||
@ExcelProperty(value = "合同大类")
|
||||
private String contractCategory;
|
||||
|
||||
/**
|
||||
* 合同类型
|
||||
*/
|
||||
@ExcelProperty(value = "合同类型")
|
||||
private String contractType;
|
||||
|
||||
/**
|
||||
* 业务方向
|
||||
*/
|
||||
@ExcelProperty(value = "业务方向")
|
||||
private String businessDirection;
|
||||
|
||||
/**
|
||||
* 部门
|
||||
*/
|
||||
@ExcelProperty(value = "部门")
|
||||
private Long contractDeptId;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@ExcelProperty(value = "合同签订日期")
|
||||
private Date contractDate;
|
||||
|
||||
/**
|
||||
* 合同总价
|
||||
*/
|
||||
@ExcelProperty(value = "合同总价")
|
||||
private Long totalPrice;
|
||||
|
||||
/**
|
||||
* 甲方公司
|
||||
*/
|
||||
@ExcelProperty(value = "甲方公司")
|
||||
private Long oneCustomerId;
|
||||
|
||||
/**
|
||||
* 甲方授权代表
|
||||
*/
|
||||
@ExcelProperty(value = "甲方授权代表")
|
||||
private String oneRepresent;
|
||||
|
||||
/**
|
||||
* 甲方签字日期
|
||||
*/
|
||||
@ExcelProperty(value = "甲方签字日期")
|
||||
private Date oneDate;
|
||||
|
||||
/**
|
||||
* 乙方公司
|
||||
*/
|
||||
@ExcelProperty(value = "乙方公司")
|
||||
private Long twoCustomerId;
|
||||
|
||||
/**
|
||||
* 乙方授权代表
|
||||
*/
|
||||
@ExcelProperty(value = "乙方授权代表")
|
||||
private String twoRepresent;
|
||||
|
||||
/**
|
||||
* 乙方签字日期
|
||||
*/
|
||||
@ExcelProperty(value = "乙方签字日期")
|
||||
private Date twoDate;
|
||||
|
||||
/**
|
||||
* 合同负责人
|
||||
*/
|
||||
@ExcelProperty(value = "合同负责人")
|
||||
private Long contractManagerId;
|
||||
|
||||
/**
|
||||
* 合同模板ID
|
||||
*/
|
||||
@ExcelProperty(value = "合同模板ID")
|
||||
private Long templateId;
|
||||
|
||||
/**
|
||||
* 附件ID
|
||||
*/
|
||||
@ExcelProperty(value = "附件ID")
|
||||
private String ossId;
|
||||
|
||||
/**
|
||||
* 付款账户ID
|
||||
*/
|
||||
@ExcelProperty(value = "付款账户ID")
|
||||
private Long paymentAccountId;
|
||||
|
||||
/**
|
||||
* 付款方式
|
||||
*/
|
||||
@ExcelProperty(value = "付款方式")
|
||||
private String paymentMethod;
|
||||
|
||||
/**
|
||||
* 签字合同附件
|
||||
*/
|
||||
@ExcelProperty(value = "签字合同附件")
|
||||
private Long signatureAppendix;
|
||||
|
||||
/**
|
||||
* 质保期(天)
|
||||
*/
|
||||
@ExcelProperty(value = "质保期(天)")
|
||||
private Long warrantyPeriod;
|
||||
|
||||
/**
|
||||
* 内部合同号
|
||||
*/
|
||||
@ExcelProperty(value = "内部合同号")
|
||||
private String internalContractCode;
|
||||
|
||||
/**
|
||||
* 外部合同号
|
||||
*/
|
||||
@ExcelProperty(value = "外部合同号")
|
||||
private String externalContractCode;
|
||||
|
||||
/**
|
||||
* 订单号
|
||||
*/
|
||||
@ExcelProperty(value = "订单号")
|
||||
private String orderContractCode;
|
||||
|
||||
/**
|
||||
* 项目号
|
||||
*/
|
||||
@ExcelProperty(value = "项目号")
|
||||
private String projectContractCode;
|
||||
|
||||
/**
|
||||
* 交付启动期限
|
||||
*/
|
||||
@ExcelProperty(value = "交付启动期限")
|
||||
private Long deliveryStart;
|
||||
|
||||
/**
|
||||
* 质保期描述
|
||||
*/
|
||||
@ExcelProperty(value = "质保期描述")
|
||||
private String warrantyPeriodDescription;
|
||||
|
||||
/**
|
||||
* 交货地点
|
||||
*/
|
||||
@ExcelProperty(value = "交货地点")
|
||||
private String deliveryLocation;
|
||||
|
||||
/**
|
||||
* 运输方式
|
||||
*/
|
||||
@ExcelProperty(value = "运输方式")
|
||||
private String shipMethod;
|
||||
|
||||
/**
|
||||
* 合同税率
|
||||
*/
|
||||
@ExcelProperty(value = "合同税率")
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 签订地点
|
||||
*/
|
||||
@ExcelProperty(value = "签订地点")
|
||||
private String signingPlace;
|
||||
|
||||
/**
|
||||
* 合同物料备注
|
||||
*/
|
||||
@ExcelProperty(value = "合同物料备注")
|
||||
private String materialRemark;
|
||||
|
||||
/**
|
||||
* 合同模板标识
|
||||
*/
|
||||
@ExcelProperty(value = "合同模板标识")
|
||||
private String contractTemplateFlag;
|
||||
|
||||
/**
|
||||
* 合同大写金额
|
||||
*/
|
||||
@ExcelProperty(value = "合同大写金额")
|
||||
private String capitalizedAmount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,128 @@
|
||||
package org.dromara.oa.erp.domain.vo;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeMaterial;
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 合同变更物料视图对象 erp_contract_change_material
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ErpContractChangeMaterial.class)
|
||||
public class ErpContractChangeMaterialVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 变更物料快照ID
|
||||
*/
|
||||
@ExcelProperty(value = "变更物料快照ID")
|
||||
private Long changeMaterialId;
|
||||
|
||||
/**
|
||||
* 合同变更ID
|
||||
*/
|
||||
@ExcelProperty(value = "合同变更ID")
|
||||
private Long contractChangeId;
|
||||
|
||||
/**
|
||||
* 标准物料标识
|
||||
*/
|
||||
@ExcelProperty(value = "标准物料标识")
|
||||
private String materialFlag;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@ExcelProperty(value = "产品名称")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 规格描述
|
||||
*/
|
||||
@ExcelProperty(value = "规格描述")
|
||||
private String specificationDescription;
|
||||
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
@ExcelProperty(value = "物料ID")
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 销售物料ID
|
||||
*/
|
||||
@ExcelProperty(value = "销售物料ID")
|
||||
private Long relationMaterialId;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@ExcelProperty(value = "数量")
|
||||
private Long amount;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
@ExcelProperty(value = "单位ID")
|
||||
private Long unitId;
|
||||
|
||||
/**
|
||||
* 未税单价
|
||||
*/
|
||||
@ExcelProperty(value = "未税单价")
|
||||
private Long beforePrice;
|
||||
|
||||
/**
|
||||
* 税率
|
||||
*/
|
||||
@ExcelProperty(value = "税率")
|
||||
private Long taxRate;
|
||||
|
||||
/**
|
||||
* 含税单价
|
||||
*/
|
||||
@ExcelProperty(value = "含税单价")
|
||||
private Long includingPrice;
|
||||
|
||||
/**
|
||||
* 小计
|
||||
*/
|
||||
@ExcelProperty(value = "小计")
|
||||
private Long subtotal;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
@ExcelProperty(value = "排序号")
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 激活标识
|
||||
*/
|
||||
@ExcelProperty(value = "激活标识")
|
||||
private String activeFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeInfo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeInfoVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同变更信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface ErpContractChangeInfoMapper extends BaseMapperPlus<ErpContractChangeInfo, ErpContractChangeInfoVo> {
|
||||
|
||||
/**
|
||||
* 查询合同变更信息列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更信息集合
|
||||
*/
|
||||
public Page<ErpContractChangeInfoVo> selectCustomErpContractChangeInfoVoList(@Param("page") Page<ErpContractChangeInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangeInfo> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同变更信息列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更信息集合
|
||||
*/
|
||||
public List<ErpContractChangeInfoVo> selectCustomErpContractChangeInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangeInfo> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.oa.erp.domain.ErpContractChange;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同变更Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface ErpContractChangeMapper extends BaseMapperPlus<ErpContractChange, ErpContractChangeVo> {
|
||||
|
||||
/**
|
||||
* 查询合同变更列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更集合
|
||||
*/
|
||||
public Page<ErpContractChangeVo> selectCustomErpContractChangeVoList(@Param("page") Page<ErpContractChangeVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChange> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同变更列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更集合
|
||||
*/
|
||||
public List<ErpContractChangeVo> selectCustomErpContractChangeVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChange> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeMaterial;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeMaterialVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同变更物料Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface ErpContractChangeMaterialMapper extends BaseMapperPlus<ErpContractChangeMaterial, ErpContractChangeMaterialVo> {
|
||||
|
||||
/**
|
||||
* 查询合同变更物料列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更物料集合
|
||||
*/
|
||||
public Page<ErpContractChangeMaterialVo> selectCustomErpContractChangeMaterialVoList(@Param("page") Page<ErpContractChangeMaterialVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangeMaterial> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同变更物料列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更物料集合
|
||||
*/
|
||||
public List<ErpContractChangeMaterialVo> selectCustomErpContractChangeMaterialVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangeMaterial> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangePaymentMethod;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangePaymentMethodVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同变更付款方式Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface ErpContractChangePaymentMethodMapper extends BaseMapperPlus<ErpContractChangePaymentMethod, ErpContractChangePaymentMethodVo> {
|
||||
|
||||
/**
|
||||
* 查询合同变更付款方式列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更付款方式集合
|
||||
*/
|
||||
public Page<ErpContractChangePaymentMethodVo> selectCustomErpContractChangePaymentMethodVoList(@Param("page") Page<ErpContractChangePaymentMethodVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangePaymentMethod> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同变更付款方式列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同变更付款方式集合
|
||||
*/
|
||||
public List<ErpContractChangePaymentMethodVo> selectCustomErpContractChangePaymentMethodVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChangePaymentMethod> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeInfo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeInfoVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangeInfoBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 合同变更信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface IErpContractChangeInfoService {
|
||||
|
||||
/**
|
||||
* 查询合同变更信息
|
||||
*
|
||||
* @param changeInfoId 主键
|
||||
* @return 合同变更信息
|
||||
*/
|
||||
ErpContractChangeInfoVo queryById(Long changeInfoId);
|
||||
|
||||
/**
|
||||
* 分页查询合同变更信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更信息分页列表
|
||||
*/
|
||||
TableDataInfo<ErpContractChangeInfoVo> queryPageList(ErpContractChangeInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更信息列表
|
||||
*/
|
||||
List<ErpContractChangeInfoVo> queryList(ErpContractChangeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增合同变更信息
|
||||
*
|
||||
* @param bo 合同变更信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpContractChangeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改合同变更信息
|
||||
*
|
||||
* @param bo 合同变更信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpContractChangeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeMaterial;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeMaterialVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangeMaterialBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 合同变更物料Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface IErpContractChangeMaterialService {
|
||||
|
||||
/**
|
||||
* 查询合同变更物料
|
||||
*
|
||||
* @param changeMaterialId 主键
|
||||
* @return 合同变更物料
|
||||
*/
|
||||
ErpContractChangeMaterialVo queryById(Long changeMaterialId);
|
||||
|
||||
/**
|
||||
* 分页查询合同变更物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更物料分页列表
|
||||
*/
|
||||
TableDataInfo<ErpContractChangeMaterialVo> queryPageList(ErpContractChangeMaterialBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更物料列表
|
||||
*/
|
||||
List<ErpContractChangeMaterialVo> queryList(ErpContractChangeMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 新增合同变更物料
|
||||
*
|
||||
* @param bo 合同变更物料
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpContractChangeMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 修改合同变更物料
|
||||
*
|
||||
* @param bo 合同变更物料
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpContractChangeMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更物料信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractChangePaymentMethod;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangePaymentMethodVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangePaymentMethodBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 合同变更付款方式Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
public interface IErpContractChangePaymentMethodService {
|
||||
|
||||
/**
|
||||
* 查询合同变更付款方式
|
||||
*
|
||||
* @param changePaymentId 主键
|
||||
* @return 合同变更付款方式
|
||||
*/
|
||||
ErpContractChangePaymentMethodVo queryById(Long changePaymentId);
|
||||
|
||||
/**
|
||||
* 分页查询合同变更付款方式列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更付款方式分页列表
|
||||
*/
|
||||
TableDataInfo<ErpContractChangePaymentMethodVo> queryPageList(ErpContractChangePaymentMethodBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更付款方式列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更付款方式列表
|
||||
*/
|
||||
List<ErpContractChangePaymentMethodVo> queryList(ErpContractChangePaymentMethodBo bo);
|
||||
|
||||
/**
|
||||
* 新增合同变更付款方式
|
||||
*
|
||||
* @param bo 合同变更付款方式
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpContractChangePaymentMethodBo bo);
|
||||
|
||||
/**
|
||||
* 修改合同变更付款方式
|
||||
*
|
||||
* @param bo 合同变更付款方式
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpContractChangePaymentMethodBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更付款方式信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,169 @@
|
||||
package org.dromara.oa.erp.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangeInfoBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeInfoVo;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeInfo;
|
||||
import org.dromara.oa.erp.mapper.ErpContractChangeInfoMapper;
|
||||
import org.dromara.oa.erp.service.IErpContractChangeInfoService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 合同变更信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpContractChangeInfoServiceImpl implements IErpContractChangeInfoService {
|
||||
|
||||
private final ErpContractChangeInfoMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询合同变更信息
|
||||
*
|
||||
* @param changeInfoId 主键
|
||||
* @return 合同变更信息
|
||||
*/
|
||||
@Override
|
||||
public ErpContractChangeInfoVo queryById(Long changeInfoId){
|
||||
return baseMapper.selectVoById(changeInfoId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询合同变更信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpContractChangeInfoVo> queryPageList(ErpContractChangeInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpContractChangeInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpContractChangeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpContractChangeInfoVo> queryList(ErpContractChangeInfoBo bo) {
|
||||
MPJLambdaWrapper<ErpContractChangeInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpContractChangeInfo> buildQueryWrapper(ErpContractChangeInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpContractChangeInfo> lqw = JoinWrappers.lambda(ErpContractChangeInfo.class)
|
||||
.selectAll(ErpContractChangeInfo.class)
|
||||
.eq(ErpContractChangeInfo::getDelFlag, "0")
|
||||
.eq(bo.getContractChangeId() != null, ErpContractChangeInfo::getContractChangeId, bo.getContractChangeId())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractChangeInfo::getContractFlag, bo.getContractFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getCustomerContractCode()), ErpContractChangeInfo::getCustomerContractCode, bo.getCustomerContractCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractCode()), ErpContractChangeInfo::getContractCode, bo.getContractCode())
|
||||
.like(StringUtils.isNotBlank(bo.getContractName()), ErpContractChangeInfo::getContractName, bo.getContractName())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractChangeInfo::getContractCategory, bo.getContractCategory())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractChangeInfo::getContractType, bo.getContractType())
|
||||
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractChangeInfo::getBusinessDirection, bo.getBusinessDirection())
|
||||
.eq(bo.getContractDeptId() != null, ErpContractChangeInfo::getContractDeptId, bo.getContractDeptId())
|
||||
.eq(bo.getContractDate() != null, ErpContractChangeInfo::getContractDate, bo.getContractDate())
|
||||
.eq(bo.getTotalPrice() != null, ErpContractChangeInfo::getTotalPrice, bo.getTotalPrice())
|
||||
.eq(bo.getOneCustomerId() != null, ErpContractChangeInfo::getOneCustomerId, bo.getOneCustomerId())
|
||||
.eq(StringUtils.isNotBlank(bo.getOneRepresent()), ErpContractChangeInfo::getOneRepresent, bo.getOneRepresent())
|
||||
.eq(bo.getOneDate() != null, ErpContractChangeInfo::getOneDate, bo.getOneDate())
|
||||
.eq(bo.getTwoCustomerId() != null, ErpContractChangeInfo::getTwoCustomerId, bo.getTwoCustomerId())
|
||||
.eq(StringUtils.isNotBlank(bo.getTwoRepresent()), ErpContractChangeInfo::getTwoRepresent, bo.getTwoRepresent())
|
||||
.eq(bo.getTwoDate() != null, ErpContractChangeInfo::getTwoDate, bo.getTwoDate())
|
||||
.eq(bo.getContractManagerId() != null, ErpContractChangeInfo::getContractManagerId, bo.getContractManagerId())
|
||||
.eq(bo.getTemplateId() != null, ErpContractChangeInfo::getTemplateId, bo.getTemplateId())
|
||||
.eq(StringUtils.isNotBlank(bo.getOssId()), ErpContractChangeInfo::getOssId, bo.getOssId())
|
||||
.eq(bo.getPaymentAccountId() != null, ErpContractChangeInfo::getPaymentAccountId, bo.getPaymentAccountId())
|
||||
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractChangeInfo::getPaymentMethod, bo.getPaymentMethod())
|
||||
.eq(bo.getSignatureAppendix() != null, ErpContractChangeInfo::getSignatureAppendix, bo.getSignatureAppendix())
|
||||
.eq(bo.getWarrantyPeriod() != null, ErpContractChangeInfo::getWarrantyPeriod, bo.getWarrantyPeriod())
|
||||
.eq(StringUtils.isNotBlank(bo.getInternalContractCode()), ErpContractChangeInfo::getInternalContractCode, bo.getInternalContractCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getExternalContractCode()), ErpContractChangeInfo::getExternalContractCode, bo.getExternalContractCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getOrderContractCode()), ErpContractChangeInfo::getOrderContractCode, bo.getOrderContractCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getProjectContractCode()), ErpContractChangeInfo::getProjectContractCode, bo.getProjectContractCode())
|
||||
.eq(bo.getDeliveryStart() != null, ErpContractChangeInfo::getDeliveryStart, bo.getDeliveryStart())
|
||||
.eq(StringUtils.isNotBlank(bo.getWarrantyPeriodDescription()), ErpContractChangeInfo::getWarrantyPeriodDescription, bo.getWarrantyPeriodDescription())
|
||||
.eq(StringUtils.isNotBlank(bo.getDeliveryLocation()), ErpContractChangeInfo::getDeliveryLocation, bo.getDeliveryLocation())
|
||||
.eq(StringUtils.isNotBlank(bo.getShipMethod()), ErpContractChangeInfo::getShipMethod, bo.getShipMethod())
|
||||
.eq(bo.getTaxRate() != null, ErpContractChangeInfo::getTaxRate, bo.getTaxRate())
|
||||
.eq(StringUtils.isNotBlank(bo.getSigningPlace()), ErpContractChangeInfo::getSigningPlace, bo.getSigningPlace())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialRemark()), ErpContractChangeInfo::getMaterialRemark, bo.getMaterialRemark())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractChangeInfo::getContractTemplateFlag, bo.getContractTemplateFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getCapitalizedAmount()), ErpContractChangeInfo::getCapitalizedAmount, bo.getCapitalizedAmount())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同变更信息
|
||||
*
|
||||
* @param bo 合同变更信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpContractChangeInfoBo bo) {
|
||||
ErpContractChangeInfo add = MapstructUtils.convert(bo, ErpContractChangeInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setChangeInfoId(add.getChangeInfoId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同变更信息
|
||||
*
|
||||
* @param bo 合同变更信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpContractChangeInfoBo bo) {
|
||||
ErpContractChangeInfo update = MapstructUtils.convert(bo, ErpContractChangeInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpContractChangeInfo entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
package org.dromara.oa.erp.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangeMaterialBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangeMaterialVo;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangeMaterial;
|
||||
import org.dromara.oa.erp.mapper.ErpContractChangeMaterialMapper;
|
||||
import org.dromara.oa.erp.service.IErpContractChangeMaterialService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 合同变更物料Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpContractChangeMaterialServiceImpl implements IErpContractChangeMaterialService {
|
||||
|
||||
private final ErpContractChangeMaterialMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询合同变更物料
|
||||
*
|
||||
* @param changeMaterialId 主键
|
||||
* @return 合同变更物料
|
||||
*/
|
||||
@Override
|
||||
public ErpContractChangeMaterialVo queryById(Long changeMaterialId){
|
||||
return baseMapper.selectVoById(changeMaterialId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询合同变更物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更物料分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpContractChangeMaterialVo> queryPageList(ErpContractChangeMaterialBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpContractChangeMaterial> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpContractChangeMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更物料列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpContractChangeMaterialVo> queryList(ErpContractChangeMaterialBo bo) {
|
||||
MPJLambdaWrapper<ErpContractChangeMaterial> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpContractChangeMaterial> buildQueryWrapper(ErpContractChangeMaterialBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpContractChangeMaterial> lqw = JoinWrappers.lambda(ErpContractChangeMaterial.class)
|
||||
.selectAll(ErpContractChangeMaterial.class)
|
||||
.eq(ErpContractChangeMaterial::getDelFlag, "0")
|
||||
.eq(bo.getContractChangeId() != null, ErpContractChangeMaterial::getContractChangeId, bo.getContractChangeId())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpContractChangeMaterial::getMaterialFlag, bo.getMaterialFlag())
|
||||
.like(StringUtils.isNotBlank(bo.getProductName()), ErpContractChangeMaterial::getProductName, bo.getProductName())
|
||||
.eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractChangeMaterial::getSpecificationDescription, bo.getSpecificationDescription())
|
||||
.eq(bo.getMaterialId() != null, ErpContractChangeMaterial::getMaterialId, bo.getMaterialId())
|
||||
.eq(bo.getRelationMaterialId() != null, ErpContractChangeMaterial::getRelationMaterialId, bo.getRelationMaterialId())
|
||||
.eq(bo.getAmount() != null, ErpContractChangeMaterial::getAmount, bo.getAmount())
|
||||
.eq(bo.getUnitId() != null, ErpContractChangeMaterial::getUnitId, bo.getUnitId())
|
||||
.eq(bo.getBeforePrice() != null, ErpContractChangeMaterial::getBeforePrice, bo.getBeforePrice())
|
||||
.eq(bo.getTaxRate() != null, ErpContractChangeMaterial::getTaxRate, bo.getTaxRate())
|
||||
.eq(bo.getIncludingPrice() != null, ErpContractChangeMaterial::getIncludingPrice, bo.getIncludingPrice())
|
||||
.eq(bo.getSubtotal() != null, ErpContractChangeMaterial::getSubtotal, bo.getSubtotal())
|
||||
.eq(bo.getSortOrder() != null, ErpContractChangeMaterial::getSortOrder, bo.getSortOrder())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChangeMaterial::getActiveFlag, bo.getActiveFlag())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同变更物料
|
||||
*
|
||||
* @param bo 合同变更物料
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpContractChangeMaterialBo bo) {
|
||||
ErpContractChangeMaterial add = MapstructUtils.convert(bo, ErpContractChangeMaterial.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setChangeMaterialId(add.getChangeMaterialId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同变更物料
|
||||
*
|
||||
* @param bo 合同变更物料
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpContractChangeMaterialBo bo) {
|
||||
ErpContractChangeMaterial update = MapstructUtils.convert(bo, ErpContractChangeMaterial.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpContractChangeMaterial entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更物料信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,141 @@
|
||||
package org.dromara.oa.erp.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractChangePaymentMethodBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractChangePaymentMethodVo;
|
||||
import org.dromara.oa.erp.domain.ErpContractChangePaymentMethod;
|
||||
import org.dromara.oa.erp.mapper.ErpContractChangePaymentMethodMapper;
|
||||
import org.dromara.oa.erp.service.IErpContractChangePaymentMethodService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 合同变更付款方式Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-03-07
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpContractChangePaymentMethodServiceImpl implements IErpContractChangePaymentMethodService {
|
||||
|
||||
private final ErpContractChangePaymentMethodMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询合同变更付款方式
|
||||
*
|
||||
* @param changePaymentId 主键
|
||||
* @return 合同变更付款方式
|
||||
*/
|
||||
@Override
|
||||
public ErpContractChangePaymentMethodVo queryById(Long changePaymentId){
|
||||
return baseMapper.selectVoById(changePaymentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询合同变更付款方式列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同变更付款方式分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpContractChangePaymentMethodVo> queryPageList(ErpContractChangePaymentMethodBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpContractChangePaymentMethod> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpContractChangePaymentMethodVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同变更付款方式列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同变更付款方式列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpContractChangePaymentMethodVo> queryList(ErpContractChangePaymentMethodBo bo) {
|
||||
MPJLambdaWrapper<ErpContractChangePaymentMethod> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpContractChangePaymentMethod> buildQueryWrapper(ErpContractChangePaymentMethodBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpContractChangePaymentMethod> lqw = JoinWrappers.lambda(ErpContractChangePaymentMethod.class)
|
||||
.selectAll(ErpContractChangePaymentMethod.class)
|
||||
.eq(ErpContractChangePaymentMethod::getDelFlag, "0")
|
||||
.eq(bo.getContractChangeId() != null, ErpContractChangePaymentMethod::getContractChangeId, bo.getContractChangeId())
|
||||
.eq(bo.getSortOrder() != null, ErpContractChangePaymentMethod::getSortOrder, bo.getSortOrder())
|
||||
.eq(bo.getPaymentStageId() != null, ErpContractChangePaymentMethod::getPaymentStageId, bo.getPaymentStageId())
|
||||
.eq(bo.getPaymentDeadline() != null, ErpContractChangePaymentMethod::getPaymentDeadline, bo.getPaymentDeadline())
|
||||
.eq(bo.getPaymentPercentage() != null, ErpContractChangePaymentMethod::getPaymentPercentage, bo.getPaymentPercentage())
|
||||
.eq(bo.getInvoicePercentage() != null, ErpContractChangePaymentMethod::getInvoicePercentage, bo.getInvoicePercentage())
|
||||
.eq(bo.getPaymentAmount() != null, ErpContractChangePaymentMethod::getPaymentAmount, bo.getPaymentAmount())
|
||||
.eq(StringUtils.isNotBlank(bo.getPaymentDescription()), ErpContractChangePaymentMethod::getPaymentDescription, bo.getPaymentDescription())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChangePaymentMethod::getActiveFlag, bo.getActiveFlag())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同变更付款方式
|
||||
*
|
||||
* @param bo 合同变更付款方式
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpContractChangePaymentMethodBo bo) {
|
||||
ErpContractChangePaymentMethod add = MapstructUtils.convert(bo, ErpContractChangePaymentMethod.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setChangePaymentId(add.getChangePaymentId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同变更付款方式
|
||||
*
|
||||
* @param bo 合同变更付款方式
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpContractChangePaymentMethodBo bo) {
|
||||
ErpContractChangePaymentMethod update = MapstructUtils.convert(bo, ErpContractChangePaymentMethod.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpContractChangePaymentMethod entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同变更付款方式信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractChangeInfoMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractChangeInfoVo" id="ErpContractChangeInfoResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractChangeInfoVoList" resultMap="ErpContractChangeInfoResult">
|
||||
select change_info_id, tenant_id, contract_change_id, contract_flag, customer_contract_code, contract_code, contract_name, contract_category, contract_type, business_direction, contract_dept_id, contract_date, total_price, one_customer_id, one_represent, one_date, two_customer_id, two_represent, two_date, contract_manager_id, template_id, oss_id, payment_account_id, payment_method, signature_appendix, warranty_period, internal_contract_code, external_contract_code, order_contract_code, project_contract_code, delivery_start, warranty_period_description, delivery_location, ship_method, tax_rate, signing_place, material_remark, contract_template_flag, capitalized_amount, remark, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change_info t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractChangeMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractChangeVo" id="ErpContractChangeResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractChangeVoList" resultMap="ErpContractChangeResult">
|
||||
select contract_change_id, tenant_id, contract_id, change_code, change_type, change_contract_code, change_contract_name, customer_name, change_contract_amount, contract_code, contract_name, original_customer_name, original_contract_amount, change_reason, apply_time, undertake_dept_id, undertake_by, industry_region, seal_legal_entity, change_status, flow_status, write_back_flag, write_back_time, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractChangeMaterialMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractChangeMaterialVo" id="ErpContractChangeMaterialResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractChangeMaterialVoList" resultMap="ErpContractChangeMaterialResult">
|
||||
select change_material_id, tenant_id, contract_change_id, material_flag, product_name, specification_description, material_id, relation_material_id, amount, unit_id, before_price, tax_rate, including_price, subtotal, remark, sort_order, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change_material t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractChangePaymentMethodMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractChangePaymentMethodVo" id="ErpContractChangePaymentMethodResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractChangePaymentMethodVoList" resultMap="ErpContractChangePaymentMethodResult">
|
||||
select change_payment_id, tenant_id, contract_change_id, sort_order, payment_stage_id, payment_deadline, payment_percentage, invoice_percentage, payment_amount, payment_description, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change_payment_method t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue