diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java index 7f2fa7d6..5cf9a52c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java @@ -1,15 +1,16 @@ package org.dromara.xzd.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; - import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; /** * 承包合同终止对象 xzd_contract_termination @@ -103,5 +104,14 @@ public class XzdContractTermination extends BaseEntity { */ private Long danjuId; + /** + * 累计结算金额 + */ + private BigDecimal ljjsje; + + /** + * 累计付款金额 + */ + private BigDecimal ljfkje; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java index aad747bd..0953e00e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java @@ -1,11 +1,14 @@ package org.dromara.xzd.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.util.List; /** @@ -61,7 +64,7 @@ public class XzdSettlementInfo extends BaseEntity { /** * 开户银行 */ - private Long openingBank; + private String openingBank; /** * 账号 @@ -76,7 +79,7 @@ public class XzdSettlementInfo extends BaseEntity { /** * 默认扣率 */ - private Long defaultDeductionRate; + private BigDecimal defaultDeductionRate; /** * 开户行户名 @@ -106,7 +109,7 @@ public class XzdSettlementInfo extends BaseEntity { /** * 消费税率 */ - private Long consumptionTaxRate; + private BigDecimal consumptionTaxRate; /** * 回款天数 @@ -116,7 +119,7 @@ public class XzdSettlementInfo extends BaseEntity { /** * 年利率 */ - private Long annualInterestRate; + private BigDecimal annualInterestRate; /** * 信用等级 @@ -131,7 +134,7 @@ public class XzdSettlementInfo extends BaseEntity { /** * 信用额度 */ - private Long creditLimit; + private BigDecimal creditLimit; /** * 默认付款天数 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java index 63948a31..7e6c5462 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java @@ -1,18 +1,16 @@ package org.dromara.xzd.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; -import org.dromara.xzd.domain.*; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import org.dromara.xzd.domain.vo.XzdContractAdvanceInfoVo; -import org.dromara.xzd.domain.vo.XzdContractClauseVo; -import org.dromara.xzd.domain.vo.XzdDeductionItemsVo; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; +import org.dromara.xzd.domain.*; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -31,7 +29,7 @@ import java.util.List; public class XzdContractChangeBo extends BaseEntity { /** - * + * id */ private Long id; @@ -54,7 +52,7 @@ public class XzdContractChangeBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date documentDate; -// + /** * 所属部门 */ @@ -65,10 +63,10 @@ public class XzdContractChangeBo extends BaseEntity { */ private Long contractCodeId; -// /** -// * 合同名称 -// */ -// private String contractName; + /** + * 合同名称 + */ + private String contractName; // /** // * 合同类型（字典） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java index 98d3917c..b06f28a1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java @@ -1,16 +1,18 @@ package org.dromara.xzd.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdContractTermination; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdContractTermination; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; /** @@ -105,5 +107,14 @@ public class XzdContractTerminationBo extends BaseEntity { */ private Long danjuId; + /** + * 累计结算金额 + */ + private BigDecimal ljjsje; + + /** + * 累计付款金额 + */ + private BigDecimal ljfkje; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementInfoBo.java index 59cf404b..decf4bf6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementInfoBo.java @@ -1,13 +1,12 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdSettlementInfo; -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 org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdSettlementInfo; + +import java.math.BigDecimal; /** * 客户信息-结算信息6业务对象 xzd_settlement_info @@ -68,7 +67,7 @@ public class XzdSettlementInfoBo extends BaseEntity { /** * 默认扣率 */ - private Long defaultDeductionRate; + private BigDecimal defaultDeductionRate; /** * 开户行户名 @@ -103,7 +102,7 @@ public class XzdSettlementInfoBo extends BaseEntity { /** * 消费税率 */ - private Long consumptionTaxRate; + private BigDecimal consumptionTaxRate; /** * 回款天数 @@ -113,7 +112,7 @@ public class XzdSettlementInfoBo extends BaseEntity { /** * 年利率 */ - private Long annualInterestRate; + private BigDecimal annualInterestRate; /** * 信用等级 @@ -128,7 +127,7 @@ public class XzdSettlementInfoBo extends BaseEntity { /** * 信用额度 */ - private Long creditLimit; + private BigDecimal creditLimit; /** * 默认付款天数 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java index 8a32f8e0..1c991e4f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java @@ -1,21 +1,20 @@ package org.dromara.xzd.domain.vo; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; -import org.dromara.xzd.domain.*; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; +import org.dromara.xzd.domain.*; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -76,11 +75,11 @@ public class XzdContractChangeVo implements Serializable { */ private XzdContractDetailsVo contract; -// /** -// * 合同名称 -// */ -// @ExcelProperty(value = "合同名称") -// private String contractName; + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; // /** // * 合同类型（字典） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java index e052dad9..e8062b05 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java @@ -1,19 +1,19 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdContractTermination; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.xzd.domain.XzdContractTermination; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** @@ -125,5 +125,14 @@ public class XzdContractTerminationVo implements Serializable { @ExcelProperty(value = "单据引用ID") private Long danjuId; + /** + * 累计结算金额 + */ + private BigDecimal ljjsje; + + /** + * 累计付款金额 + */ + private BigDecimal ljfkje; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java index a8a65c9b..64351071 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java @@ -1,16 +1,16 @@ package org.dromara.xzd.domain.vo; -import org.dromara.xzd.domain.XzdSettlementInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.xzd.domain.XzdSettlementInfo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -129,7 +129,7 @@ public class XzdSettlementInfoVo implements Serializable { * 消费税率 */ @ExcelProperty(value = "消费税率") - private Long consumptionTaxRate; + private BigDecimal consumptionTaxRate; /** * 回款天数 @@ -141,7 +141,7 @@ public class XzdSettlementInfoVo implements Serializable { * 年利率 */ @ExcelProperty(value = "年利率") - private Long annualInterestRate; + private BigDecimal annualInterestRate; /** * 信用等级 @@ -159,7 +159,7 @@ public class XzdSettlementInfoVo implements Serializable { * 信用额度 */ @ExcelProperty(value = "信用额度") - private Long creditLimit; + private BigDecimal creditLimit; /** * 默认付款天数 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java index 7645640e..b0fbd194 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java @@ -1,30 +1,29 @@ package org.dromara.xzd.service.impl; -import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; 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; +import org.dromara.xzd.domain.XzdContractTermination; import org.dromara.xzd.domain.bo.XzdContractTerminationBo; import org.dromara.xzd.domain.vo.XzdContractTerminationVo; -import org.dromara.xzd.domain.XzdContractTermination; import org.dromara.xzd.mapper.XzdContractTerminationMapper; import org.dromara.xzd.service.IXzdContractTerminationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 承包合同终止Service业务层处理 @@ -109,7 +108,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java index 4dce39e7..7dda0926 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java @@ -1,30 +1,28 @@ package org.dromara.xzd.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; 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.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.TableDataInfo; 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; import org.dromara.xzd.domain.*; -import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo; -import org.dromara.xzd.domain.vo.XzdCustomertypeVo; -import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; +import org.dromara.xzd.domain.vo.XzdCustomertypeVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; import org.dromara.xzd.mapper.XzdSupplierInfoMapper; import org.dromara.xzd.service.IXzdSupplierInfoService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -532,6 +530,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl contactLambdaQueryWrapper = new LambdaQueryWrapper<>(); contactLambdaQueryWrapper.eq(XzdContact::getType,"2"); contactLambdaQueryWrapper.eq(XzdContact::getCustomerinformationId, id); + xzdContactService.remove(contactLambdaQueryWrapper); //删除附件 fileIds = new ArrayList<>(); List list2 = xzdContactService.list(contactLambdaQueryWrapper);