From 43e34a9991b53b2600eb133c9c6b355c3e2761a0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 10 Oct 2024 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E5=85=B3=E8=81=94=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E6=8E=88=E6=9D=83=E4=BA=BA=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../planchange/service/ProcessPlanChangeService.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java
index 01bc4045..d227401a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java
@@ -387,7 +387,7 @@ public class ProcessPlanChangeService extends ServiceImpl<ProcessPlanChangeMappe
     private EnterpriseStandardPlan convertFromPersonChange(ProcessPlanChangeLink processPlanChangeLink) {
         EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan();
         enterpriseStandardPlan.setId(processPlanChangeLink.getPlanId());
-        enterpriseStandardPlan.setMainDraftingUser(processPlanChangeLink.getMainDraftingUser());
+        enterpriseStandardPlan.setMainDraftingUser(processPlanChangeLink.getDraftingUserNew());
 
         return enterpriseStandardPlan;
     }
@@ -403,8 +403,8 @@ public class ProcessPlanChangeService extends ServiceImpl<ProcessPlanChangeMappe
     private EnterpriseStandardPlan convertFromDelay(ProcessPlanChangeLink processPlanChangeLink) {
         EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan();
         enterpriseStandardPlan.setId(processPlanChangeLink.getPlanId());
-        enterpriseStandardPlan.setDraftCompleteDate(processPlanChangeLink.getDraftCompleteDate());
-        enterpriseStandardPlan.setPlanArchivingDate(processPlanChangeLink.getPlanArchivingDate());
+        enterpriseStandardPlan.setDraftCompleteDate(processPlanChangeLink.getDraftCompleteDateChange());
+        enterpriseStandardPlan.setPlanArchivingDate(processPlanChangeLink.getPlanArchivingDateChange());
         enterpriseStandardPlan.setPlanStatus(ESPlanStatusEnum.DELAY.getValue());
 
         return enterpriseStandardPlan;