jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ys.git 2025-12-17 10:45:53 +08:00
commit 7d1722657a
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xdap/self_development/config/BusinessDatabase.java
View File

@ -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);
}
}

4
src/main/java/com/xdap/self_development/controller/form/ParameterForm.java
View File

@ -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;

2
src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
View File

@ -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);

24
src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
View File

@ -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()

3
src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
View File

@ -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;
}