From 13640fce09f69a3547d2c13cd498c2fe130eee4a Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Wed, 17 Dec 2025 09:06:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/BusinessDatabase.java | 2 +- .../controller/form/ParameterForm.java | 4 +++- .../service/impl/ParameterServiceImpl.java | 24 ++++++++----------- .../impl/TemplateApprovalServiceImpl.java | 1 - 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java index b1693f8..2d2bc16 100644 --- a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java +++ b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java @@ -24,6 +24,6 @@ public class BusinessDatabase { @Bean public MpaasQuery getTCDatabase() { - return queryFactory.buildFromDatasource("yc_lrs_test_relsult"); + return queryFactory.buildFromDatasource(DatasourceConstant.XDAP_MYSQL_PREFIX + tenantId); } } diff --git a/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java b/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java index 7c7d2df..da26698 100644 --- a/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java @@ -1,12 +1,14 @@ package com.xdap.self_development.controller.form; import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; import javax.validation.constraints.NotBlank; @Data public class ParameterForm { - private String id; + + private String parameterId; private Integer parameterNumber; diff --git a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java index c378b19..36f2714 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java @@ -328,31 +328,27 @@ public class ParameterServiceImpl implements ParameterService { List revisionRecords, Template baseTemplate, String userId ) { - Parameter originalParameter = parameterMap.get(form.getId()); + Parameter originalParameter = parameterMap.get(form.getParameterId()); if (originalParameter == null) { throw new IllegalArgumentException("未找到要更新的参数，编号: " + form.getParameterNumber()); } Parameter updatedParameter = new Parameter(); - String detail; + BeanUtils.copyProperties(form, updatedParameter); + String detail = getParameterChange(originalParameter, updatedParameter); + updatedParameter.setCreatedBy(userId); // 如果是原模板，就更新 if (Objects.equals(baseTemplate.getId(), newTemplate.getId())) { - BeanUtils.copyProperties(form, updatedParameter); - updatedParameter.setId(null); - updatedParameter.setCreatedBy(userId); - detail = getParameterChange(originalParameter, updatedParameter); + updatedParameter.setId(originalParameter.getId()); bd.getBusinessDatabase() .rowid("id", originalParameter.getRowId()) .doUpdate(updatedParameter); } // 如果是新模板，就新增 else { - BeanUtils.copyProperties(form, updatedParameter); - updatedParameter.setCreatedBy(userId); - updatedParameter.setId(null); - detail = getParameterChange(originalParameter, updatedParameter); - bd.getBusinessDatabase().doInsert(updatedParameter); + bd.getBusinessDatabase() + .doInsert(updatedParameter); } newParameters.add(updatedParameter); revisionRecords.add(new RevisionRecord( @@ -406,7 +402,7 @@ public class ParameterServiceImpl implements ParameterService { Template newTemplate, List revisionRecords, Template baseTemplate ) { - Parameter deletedParameter = parameterMap.get(form.getId()); + Parameter deletedParameter = parameterMap.get(form.getParameterId()); if (deletedParameter != null) { revisionRecords.add(new RevisionRecord( @@ -429,7 +425,7 @@ public class ParameterServiceImpl implements ParameterService { ParameterForm form, Map parameterMap, List newParameters ) { - Parameter unchangedParameter = parameterMap.get(form.getId()); + Parameter unchangedParameter = parameterMap.get(form.getParameterId()); if (unchangedParameter != null) { newParameters.add(unchangedParameter); @@ -440,7 +436,7 @@ public class ParameterServiceImpl implements ParameterService { Map parameterMap, List parameterForms) { Set formIds = parameterForms.stream() - .map(ParameterForm::getId) + .map(ParameterForm::getParameterId) .filter(Objects::nonNull) .collect(Collectors.toSet()); return parameterMap.entrySet().stream() diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java index 12b8fee..42b0097 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java @@ -296,7 +296,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService { // BeanUtils.copyProperties(parameter, item); // } // }); - return results; } From 5f7e8493e3d837aa997079d394d1bcad7a90e7da Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Wed, 17 Dec 2025 09:34:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BenchmarkingReportServiceImpl.java | 2 ++ .../service/impl/TemplateApprovalServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java index 11f33fd..a3139bd 100644 --- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java @@ -378,11 +378,13 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService bd.getBusinessDatabase() .eq("document_no", flow.getId()) .eq("owner_id", request.getUserId()) + .update("last_update_date", Timestamp.valueOf(LocalDateTime.now())) .update("is_delete", 1) .doUpdate(TodoTaskPojo.class); bd.getBusinessDatabase() .eq("document_no", flow.getId()) .ne("owner_id", request.getUserId()) + .update("last_update_date", Timestamp.valueOf(LocalDateTime.now())) .update("is_delete", 2) .doDelete(TodoTaskPojo.class); diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java index 42b0097..849fd8d 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java @@ -255,11 +255,13 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService { .eq("document_no", flow.getId()) .ne("owner_id", request.getUserId()) .update("is_delete", 2) + .update("last_update_date", Timestamp.valueOf(LocalDateTime.now())) .doDelete(TodoTaskPojo.class); } bd.getBusinessDatabase() .eq("document_no", flow.getId()) .eq("owner_id", request.getUserId()) + .update("last_update_date", Timestamp.valueOf(LocalDateTime.now())) .update("is_delete", 1) .doUpdate(TodoTaskPojo.class);