From 03de3bd77b7c53ae20379a79335824d888238c76 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Thu, 4 Dec 2025 15:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=BB=91=E5=AE=9A=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataEntryEngineModelServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java index 2a64890..a6c4fb9 100644 --- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java @@ -282,7 +282,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ modelPojo.setId(UUID.randomUUID().toString()); sw.buildFromDatasource("xdap_app_223770822127386625").doInsert(modelPojo); - saveDataParamDetail(modelPojo, parameters, xdapUsersPojo); + saveDataParamDetail(modelPojo, parameters,versionNumber, xdapUsersPojo); return 0; } @@ -307,12 +307,12 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ .rowid("id", entryEngineModelPojo.getId()) .doUpdate(EngineParamDetailPojo.class); //绑定参数准备重新走分发 - saveDataParamDetail(entryEngineModelPojo, parameters, null); + saveDataParamDetail(entryEngineModelPojo, parameters, newVersionNum,null); } } //为每个机型绑定参数 - public void saveDataParamDetail(DataEntryEngineModelPojo modelPojo, List parameters, XdapUsers xdapUsersPojo) { + public void saveDataParamDetail(DataEntryEngineModelPojo modelPojo, List parameters,Integer newVersionNum, XdapUsers xdapUsersPojo) { /** * 遍历机型 * 查找参数 将每个机型都把参数,和参数所属的填写部门关联上 @@ -328,7 +328,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ engineParamDetailPojo.setParameterType(parameter.getParameterType()); engineParamDetailPojo.setParameterName(parameter.getParameterName()); engineParamDetailPojo.setDepartment(parameter.getDepartment()); - engineParamDetailPojo.setMajorVersion(versionNumber); + engineParamDetailPojo.setMajorVersion(newVersionNum); engineParamDetailPojo.setVersionStatus(ParamValueVersionEnum.DRAFT.getCode()); engineParamDetailPojo.setCreatedBy(ObjectUtils.isNotEmpty(xdapUsersPojo) ? xdapUsersPojo.getId() : null); engineParamDetailPojo.setLastUpdatedBy("");