From 791208eed8021ef7eb857ced5f031485cff7a2b7 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 11:42:59 +0800
Subject: [PATCH] 增加workshop字段

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
index 0f16f88..543cd6f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
@@ -101,7 +101,7 @@
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void copyPlan(String date, String factory, String toStart, String toEnd) {
+    public void copyPlan(String date, String factory, String major, String toStart, String toEnd) {
 
         String[] dtSrc = date.split("-");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
@@ -116,6 +116,7 @@
         plan.setYear(Integer.valueOf(dtSrc[0]).toString());
         plan.setMonth(Integer.valueOf(dtSrc[1]).toString());
         plan.setOrgCode(factory);
+        plan.setMajor(major);
         List<ApsGasPipelineCapacityPlan> templatePlans = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(plan);
         while (dtStart.before(dtEnd)) {
             String year = dtStart.get(Calendar.YEAR) + "";
@@ -123,9 +124,11 @@
             apsGasPipelineCapacityPlanMapper.deleteByDateAndFactory(
                     year,
                     month,
-                    factory
+                    factory,
+                    major
             );
             templatePlans.forEach(p -> {
+                p.setId(null);
                 p.setYear(year);
                 p.setMonth(month);
                 p.setCreateBy(SecurityUtils.getUsername());

--
Gitblit v1.9.3