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

11-5-修改

Browse Source
This commit is contained in:
青云
2025-11-05 11:43:17 +08:00
parent 8efeff20d4
commit 05569d0471
6 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,15 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
/** /**
* 客户信息-证照信息4对象 xzd_certificate_info * 客户信息-证照信息4对象 xzd_certificate_info
@ -69,7 +68,7 @@ public class XzdCertificateInfo extends BaseEntity {
/** /**
* 停用标志（0：未停用，1：已停用） * 停用标志（0：未停用，1：已停用）
*/ */
private Long disableFlag; private String disableFlag;
/** /**
* 附件 * 附件

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

@ -1,11 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
/** /**
* 客户信息-合同信息9对象 xzd_contract_info * 客户信息-合同信息9对象 xzd_contract_info
@ -55,7 +57,7 @@ public class XzdContractInfo extends BaseEntity {
/** /**
* 合同含税金额 * 合同含税金额
*/ */
private Long contractTaxInclusiveAmount; private BigDecimal contractTaxInclusiveAmount;
/** /**
* 合同类型 * 合同类型

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

@ -1,20 +1,15 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdCertificateInfo; import com.fasterxml.jackson.annotation.JsonFormat;
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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdCertificateInfo;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/** /**
* 客户信息-证照信息4业务对象 xzd_certificate_info * 客户信息-证照信息4业务对象 xzd_certificate_info
* *
@ -68,7 +63,7 @@ public class XzdCertificateInfoBo extends BaseEntity {
/** /**
* 停用标志（0：未停用，1：已停用） * 停用标志（0：未停用，1：已停用）
*/ */
private Long disableFlag; private String disableFlag;
/** /**
* 附件 * 附件

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

@ -1,13 +1,12 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdContractInfo;
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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdContractInfo;
import java.math.BigDecimal;
/** /**
* 客户信息-合同信息9业务对象 xzd_contract_info * 客户信息-合同信息9业务对象 xzd_contract_info
@ -53,7 +52,7 @@ public class XzdContractInfoBo extends BaseEntity {
/** /**
* 合同含税金额 * 合同含税金额
*/ */
private Long contractTaxInclusiveAmount; private BigDecimal contractTaxInclusiveAmount;
/** /**
* 合同类型 * 合同类型

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

@ -1,15 +1,13 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdCertificateInfo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.xzd.domain.XzdCertificateInfo;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
@ -83,7 +81,7 @@ public class XzdCertificateInfoVo implements Serializable {
*/ */
@ExcelProperty(value = "停用标志", converter = ExcelDictConvert.class) @ExcelProperty(value = "停用标志", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：未停用，1：已停用") @ExcelDictFormat(readConverterExp = "0=：未停用，1：已停用")
private Long disableFlag; private String disableFlag;
/** /**
* 附件 * 附件

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

@ -1,16 +1,14 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import org.dromara.xzd.domain.XzdContractInfo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.XzdContractInfo;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.math.BigDecimal;
@ -68,7 +66,7 @@ public class XzdContractInfoVo implements Serializable {
* 合同含税金额 * 合同含税金额
*/ */
@ExcelProperty(value = "合同含税金额") @ExcelProperty(value = "合同含税金额")
private Long contractTaxInclusiveAmount; private BigDecimal contractTaxInclusiveAmount;
/** /**
* 合同类型 * 合同类型