修改:参数修改逻辑问题
This commit is contained in:
parent
c30f5ab842
commit
13640fce09
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -328,31 +328,27 @@ public class ParameterServiceImpl implements ParameterService {
|
||||
List<RevisionRecord> 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<RevisionRecord> 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<String, Parameter> parameterMap,
|
||||
List<Parameter> 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<String, Parameter> parameterMap,
|
||||
List<ParameterForm> parameterForms) {
|
||||
Set<String> formIds = parameterForms.stream()
|
||||
.map(ParameterForm::getId)
|
||||
.map(ParameterForm::getParameterId)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
return parameterMap.entrySet().stream()
|
||||
|
||||
@ -296,7 +296,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
|
||||
// BeanUtils.copyProperties(parameter, item);
|
||||
// }
|
||||
// });
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user