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/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/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..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); @@ -296,7 +298,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService { // BeanUtils.copyProperties(parameter, item); // } // }); - return results; }