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

Compare commits

base: lcj:0d5a9eb505e7334e5de29d44361c16ba29d46089
Branches Tags
lcj:dev lcj:prod
..
compare: lcj:97e0dd467f9aa99d98699c35f04a0d670209fb61
Branches Tags
lcj:dev lcj:prod

2 Commits
0d5a9eb505 ... 97e0dd467f

Author SHA1 Message Date
屈展航
97e0dd467f Merge remote-tracking branch 'origin/dev' into dev 2025-10-23 17:24:08 +08:00
屈展航
e58a99e696 10-23-修复 2025-10-23 17:24:00 +08:00
10 changed files with 115 additions and 88 deletions
Expand all files Collapse all files

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java
View File

@ -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;
}

17
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java
View File

@ -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;
/**
* 默认付款天数

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

@ -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;
// /**
// * 合同类型（字典）

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

@ -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;
}

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

@ -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;
/**
* 默认付款天数

25
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java
View File

@ -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;
// /**
// * 合同类型（字典）

21
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java
View File

@ -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;
}

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java
View File

@ -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;
/**
* 默认付款天数

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

@ -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<XzdContractTe
XzdContractTermination add = MapstructUtils.convert(bo, XzdContractTermination.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("CBHTZZ-");
bo.setDocumentCode(banBen);
add.setDocumentCode(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

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

@ -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<XzdSupplierInfoMappe
LambdaQueryWrapper<XzdContact> contactLambdaQueryWrapper = new LambdaQueryWrapper<>();
contactLambdaQueryWrapper.eq(XzdContact::getType,"2");
contactLambdaQueryWrapper.eq(XzdContact::getCustomerinformationId, id);
xzdContactService.remove(contactLambdaQueryWrapper);
//删除附件
fileIds = new ArrayList<>();
List<XzdContact> list2 = xzdContactService.list(contactLambdaQueryWrapper);