diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index edfca12c..68e11735 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -21,8 +21,6 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingR import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService; import com.jero.modules.laws.enterprise.util.BeanCopyUtils; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.tag.enums.TableNameEnum; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; @@ -30,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.*; /** @@ -95,6 +92,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener { variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration()); variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate()); variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate()); + variables.put(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON, data.getApprovalUser()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); String standardId = IdWorker.getIdStr(); variables.put(FieldCommon.ID, standardId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 01a8d0fd..dfc64d22 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -248,7 +248,7 @@ public class EsRevisionServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId) + .set(ProcessEsRevision::getApprovalUser, toUserId); + update(updateWrapper); } processHandleService.transfer(taskId, toUserId); }