From e4132ea5409ed963d6ebe641097ce7c595414edc Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Wed, 29 Oct 2025 11:33:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=95=BF=E9=A1=BA?= =?UTF-8?q?=E7=9A=84=E8=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BusMrpBaseServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java index 720f9284..a4341045 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java @@ -318,11 +318,13 @@ public class BusMrpBaseServiceImpl extends ServiceImpl Date: Wed, 29 Oct 2025 15:56:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?10-29-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/xzd/domain/XzdJsqdTz.java | 27 ++++++++++++++++--- .../dromara/xzd/domain/bo/XzdJsqdTzBo.java | 24 +++++++++++++++-- .../xzd/domain/vo/XzdContractAccountVo.java | 2 ++ .../dromara/xzd/domain/vo/XzdJsqdTzVo.java | 24 +++++++++++++++-- 4 files changed, 70 insertions(+), 7 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java index e2afb0b2..94f6aed3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java @@ -1,12 +1,16 @@ package org.dromara.xzd.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; +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; /** * 决算清单(调整)对象 xzd_jsqd_tz @@ -133,6 +137,23 @@ public class XzdJsqdTz extends BaseEntity { */ private String tzhwbs; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java index 460456ba..b5b660da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java @@ -1,12 +1,15 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdJsqdTz; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; /** * 决算清单(调整)业务对象 xzd_jsqd_tz @@ -134,6 +137,23 @@ public class XzdJsqdTzBo extends BaseEntity { */ private String remark; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 数据来源 */ 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 764f1e50..f2b6ab66 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 @@ -133,6 +133,7 @@ public class XzdContractAccountVo implements Serializable { * 甲方单位(客户) */ @ExcelProperty(value = "甲方单位(客户)") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "firstPartyId") private String firstParty; /** @@ -144,6 +145,7 @@ public class XzdContractAccountVo implements Serializable { * 乙方单位(供应商) */ @ExcelProperty(value = "乙方单位(供应商)") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "secondPartyId") private String secondParty; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java index 1ef73138..7fed5c42 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java @@ -1,14 +1,17 @@ package org.dromara.xzd.domain.vo; -import java.math.BigDecimal; -import org.dromara.xzd.domain.XzdJsqdTz; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** @@ -157,6 +160,23 @@ public class XzdJsqdTzVo implements Serializable { @ExcelProperty(value = "调整后wbs") private String tzhwbs; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 备注 */ From 365cf00644674be5ffc620f858977c142b0fee4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Wed, 29 Oct 2025 16:12:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?10-29-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/xzd/domain/XzdProject.java | 2 +- .../src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java | 2 +- .../src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java index 6925399a..2bb7b2ca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java @@ -185,7 +185,7 @@ public class XzdProject extends BaseEntity { /** * 计划总投资 */ - private Long plannedTotalInvestment; + private BigDecimal plannedTotalInvestment; /** * 政府备案项目名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java index 3f176a24..4d3f17bf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java @@ -201,7 +201,7 @@ public class XzdProjectBo extends BaseEntity { /** * 计划总投资 */ - private Long plannedTotalInvestment; + private BigDecimal plannedTotalInvestment; /** * 政府备案项目名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java index b694707c..8234bd14 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java @@ -251,7 +251,7 @@ public class XzdProjectVo implements Serializable { * 计划总投资 */ @ExcelProperty(value = "计划总投资") - private Long plannedTotalInvestment; + private BigDecimal plannedTotalInvestment; /** * 政府备案项目名称