diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java index 910b3288..2d1c1014 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java @@ -1,17 +1,17 @@ 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.io.Serial; import java.math.BigDecimal; import java.util.Date; -import java.io.Serial; - /** * 承包合同竣工结算对象 xzd_contract_account * @@ -32,6 +32,11 @@ public class XzdContractAccount extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java index 58495e66..86ac687b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java @@ -30,6 +30,11 @@ public class XzdContractAgreement extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 合同编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java index 6e6a9984..0bd29917 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java @@ -1,15 +1,15 @@ 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.util.Date; /** * 承包合同变更对象 xzd_contract_change @@ -31,6 +31,11 @@ public class XzdContractChange extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java index 9833e758..d01e04e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java @@ -1,17 +1,17 @@ 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.io.Serial; import java.math.BigDecimal; import java.util.Date; -import java.io.Serial; - /** * 承包合同信息对象 xzd_contract_details * @@ -32,6 +32,11 @@ public class XzdContractDetails extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 所属部门ID */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java index e6fdb9a8..7ad56c1d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java @@ -31,6 +31,11 @@ public class XzdContractProgressSettlement extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 方案id */ 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 a705bdd2..7bb2dc28 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 @@ -32,6 +32,11 @@ public class XzdContractTermination extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java index 17d9fa20..cd77302b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java @@ -36,6 +36,11 @@ public class XzdSupplierInfo extends BaseEntity { */ private Long cityCode; + /** + * 审核状态 + */ + private String shzt; + /** * 单位编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java index 8f1b83fc..67e02ec6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java @@ -1,17 +1,17 @@ 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.io.Serial; import java.math.BigDecimal; import java.util.Date; -import java.io.Serial; - /** * 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust * @@ -32,6 +32,11 @@ public class XzdWorkcontractCompletionAdjust extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java index 9d3d942c..a2d352c6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java @@ -2,14 +2,15 @@ package org.dromara.xzd.domain.bo; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdContractAccount; -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.XzdContractAccount; import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; @@ -36,6 +37,11 @@ public class XzdContractAccountBo extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java index 5d7d59fc..95762fe6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java @@ -29,6 +29,11 @@ public class XzdContractAgreementBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 合同编码 */ 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 7e6c5462..62ba5418 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 @@ -33,6 +33,11 @@ public class XzdContractChangeBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java index a63d01b9..0ca9ea37 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java @@ -1,15 +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.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; @@ -32,6 +33,11 @@ public class XzdContractDetailsBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 所属部门ID */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java index 8ac97096..f1abe534 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java @@ -36,6 +36,11 @@ public class XzdContractProgressSettlementBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 方案id */ 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 0c7223b2..35e44820 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 @@ -31,6 +31,11 @@ public class XzdContractTerminationBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java index aa5b5ae3..dd46c636 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java @@ -1,15 +1,16 @@ package org.dromara.xzd.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdJsqdTz; -import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; -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.XzdJsqdTz; +import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.springframework.format.annotation.DateTimeFormat; @@ -39,6 +40,11 @@ public class XzdWorkcontractCompletionAdjustBo extends BaseEntity { */ private Long deptId; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java index 405395b6..764f1e50 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java @@ -41,6 +41,11 @@ public class XzdContractAccountVo implements Serializable { @ExcelProperty(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java index e8e63c55..56887c6c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java @@ -36,6 +36,11 @@ public class XzdContractAgreementVo implements Serializable { @ExcelProperty(value = "") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 合同编码 */ 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 0b921434..b3a5e6b5 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 @@ -40,6 +40,11 @@ public class XzdContractChangeVo implements Serializable { @ExcelProperty(value = "") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java index 1e8835c3..9e06be97 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java @@ -40,6 +40,11 @@ public class XzdContractDetailsVo implements Serializable { @ExcelProperty(value = "") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 所属部门ID */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java index aaab8ee0..14534cbb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java @@ -41,6 +41,11 @@ public class XzdContractProgressSettlementVo implements Serializable { @ExcelProperty(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 方案id */ 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 32bc25b4..f5962993 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 @@ -36,6 +36,11 @@ public class XzdContractTerminationVo implements Serializable { @ExcelProperty(value = "") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java index 9d31e5e4..7f77a99f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java @@ -41,6 +41,11 @@ public class XzdSupplierInfoVo implements Serializable { */ private Long cityCode; + /** + * 审核状态 + */ + private String shzt; + /** * 单位编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java index dda1e543..3a69bcf0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java @@ -1,23 +1,21 @@ package org.dromara.xzd.domain.vo; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdContractAccount; -import org.dromara.xzd.domain.XzdJsqdTz; -import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; 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.XzdJsqdTz; +import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; 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; @@ -41,6 +39,11 @@ public class XzdWorkcontractCompletionAdjustVo implements Serializable { @ExcelProperty(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + private Long deptId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index be052a23..6bf8a977 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -5,6 +5,8 @@ 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 lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -24,7 +26,9 @@ import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Collection; @@ -37,6 +41,7 @@ import java.util.Map; * @author Lion Li * @date 2025-10-15 */ +@Slf4j @RequiredArgsConstructor @Service public class XzdContractAccountServiceImpl extends ServiceImpl implements IXzdContractAccountService { @@ -410,4 +415,24 @@ public class XzdContractAccountServiceImpl extends ServiceImpl implements IXzdContractAgreementService { @@ -233,4 +237,24 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl implements IXzdContractChangeService { private final XzdContractChangeMapper baseMapper; @@ -467,4 +471,24 @@ public class XzdContractChangeServiceImpl extends ServiceImpl implements IXzdContractDetailsService { @@ -566,4 +570,24 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl implements IXzdContractProgressSettlementService { @@ -535,4 +539,24 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl implements IXzdContractTerminationService { @@ -189,4 +193,24 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl implements IXzdSupplierInfoService, XzdSupplierInfoService { @@ -946,4 +950,25 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl implements IXzdWorkcontractCompletionAdjustService { private final XzdWorkcontractCompletionAdjustMapper baseMapper; @@ -361,4 +365,24 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl implements IXzdContractPaymentService { private final XzdContractPaymentMapper baseMapper; @@ -339,4 +343,24 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl implements IXzdSkyfkFbhtfkService { private final XzdSkyfkFbhtfkMapper baseMapper; @@ -379,4 +383,24 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl implements IXzdSpykpKpsqService { private final XzdSpykpKpsqMapper baseMapper; @@ -314,4 +315,24 @@ public class XzdSpykpKpsqServiceImpl extends ServiceImpl implements IXzdSpykpSjsqdService { private final XzdSpykpSjsqdMapper baseMapper; @@ -306,4 +311,24 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl