From 2db941ef9718d846f2a5598e02206c758157ba91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Fri, 22 Aug 2025 22:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E4=BA=A7=E5=80=BC=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=81=E8=AE=BE=E8=AE=A1=E5=AE=8C=E5=B7=A5=E4=BA=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusCailiaoshebeiController.java | 2 ++ .../java/org/dromara/out/domain/OutMonthPlan.java | 5 +++++ .../org/dromara/out/domain/OutMonthPlanAudit.java | 10 ++++++++++ .../dromara/out/domain/bo/OutMonthPlanAuditBo.java | 12 ++++++++++++ .../org/dromara/out/domain/bo/OutMonthPlanBo.java | 6 ++++++ .../dromara/out/domain/vo/OutMonthPlanAuditVo.java | 7 +++++++ .../org/dromara/out/domain/vo/OutMonthPlanVo.java | 6 ++++++ .../out/service/impl/OutMonthPlanServiceImpl.java | 1 + 8 files changed, 49 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java index 0c6108af..a0c8169b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java @@ -25,6 +25,7 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.cailiaoshebei.service.IBusCailiaoshebeiService; import org.dromara.common.mybatis.core.page.TableDataInfo; +import java.util.Date; import java.util.List; /** @@ -248,4 +249,5 @@ public class BusCailiaoshebeiController extends BaseController { return R.ok(busBillofquantitiesVersionsService.obtainTheList(bo)); } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlan.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlan.java index 139479d6..0af8edc0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlan.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlan.java @@ -33,6 +33,11 @@ public class OutMonthPlan extends BaseEntity { */ private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + private String type; + /** * 计划产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlanAudit.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlanAudit.java index db0bb484..8603c60a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlanAudit.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlanAudit.java @@ -33,6 +33,16 @@ public class OutMonthPlanAudit extends BaseEntity { */ private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + private String type; + + /** + * 计划产值 + */ + private BigDecimal planValue; + /** * 设计产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanAuditBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanAuditBo.java index 1ade5db0..0da7eab7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanAuditBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanAuditBo.java @@ -33,6 +33,18 @@ public class OutMonthPlanAuditBo extends BaseEntity { @NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + + /** + * 计划产值 + */ + @NotNull(message = "计划产值不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal planValue; + /** * 设计产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanBo.java index d53443dc..7eda1bb8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanBo.java @@ -33,6 +33,12 @@ public class OutMonthPlanBo extends BaseEntity { @NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + /** * 计划产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanAuditVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanAuditVo.java index a1d1b910..1ab877ce 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanAuditVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanAuditVo.java @@ -41,6 +41,13 @@ public class OutMonthPlanAuditVo implements Serializable { @ExcelProperty(value = "项目ID") private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + @ExcelProperty(value = "类型 1对甲 2对乙") + private String type; + + /** * 设计产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanVo.java index 05d75ee6..cb981d87 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanVo.java @@ -41,6 +41,12 @@ public class OutMonthPlanVo implements Serializable { @ExcelProperty(value = "项目ID") private Long projectId; + /** + * 类型 1对甲 2对乙 + */ + @ExcelProperty(value = "类型 1对甲 2对乙") + private String type; + /** * 计划产值 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java index 32a456b1..98198cb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java @@ -101,6 +101,7 @@ public class OutMonthPlanServiceImpl extends ServiceImpl params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(OutMonthPlan::getId); + lqw.eq(StringUtils.isNotBlank(bo.getType()), OutMonthPlan::getType, bo.getType()); lqw.eq(bo.getProjectId() != null, OutMonthPlan::getProjectId, bo.getProjectId()); lqw.eq(bo.getPlanValue() != null, OutMonthPlan::getPlanValue, bo.getPlanValue()); lqw.eq(bo.getCompleteValue() != null, OutMonthPlan::getCompleteValue, bo.getCompleteValue());