|
@@ -67,12 +67,33 @@ public class ClassDefChangeRecordService {
|
|
|
response.setFail("code is required");
|
|
|
return response;
|
|
|
}
|
|
|
+ List<ClassDefModel> classDefList = queryClassDef(code);
|
|
|
if (EnumOperationType.create.equals(param.getOperationType())) {
|
|
|
- Boolean isExists = isExists(code);
|
|
|
- if (!isExists) {
|
|
|
+ if (classDefList.size() > 0) {
|
|
|
response.setFail("code is exists");
|
|
|
return response;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if (classDefList.size() == 0) {
|
|
|
+ response.setFail("code not exists");
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+ ClassDefModel classDef = classDefList.get(0);
|
|
|
+ param.setGroupCode(classDef.getGroupCode());
|
|
|
+ param.setObjType(classDef.getObjType());
|
|
|
+ param.setName(classDef.getName());
|
|
|
+ if (param.getAliasCode() == null) {
|
|
|
+ param.setAliasCode(classDef.getAliasCode());
|
|
|
+ }
|
|
|
+ if (param.getAliasName() == null) {
|
|
|
+ param.setAliasName(classDef.getAliasName());
|
|
|
+ }
|
|
|
+ param.setType(classDef.getType());
|
|
|
+ param.setProjectId(classDef.getProjectId());
|
|
|
+ param.setMajorCode(classDef.getMajorCode());
|
|
|
+ param.setSystemCode(classDef.getSystemCode());
|
|
|
+ param.setEquipmentCode(classDef.getEquipmentCode());
|
|
|
+ param.setParentCode(classDef.getParentCode());
|
|
|
}
|
|
|
QClassDefChangeRecord qt = QClassDefChangeRecord.classDefChangeRecord;
|
|
|
BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(1));
|
|
@@ -91,16 +112,13 @@ public class ClassDefChangeRecordService {
|
|
|
return response;
|
|
|
}
|
|
|
|
|
|
- private Boolean isExists(String code) {
|
|
|
+ private List<ClassDefModel> queryClassDef(String code) {
|
|
|
JacksonCriteria criteria = JacksonCriteria.newInstance();
|
|
|
criteria.add("type", "common");
|
|
|
criteria.add("code", code);
|
|
|
PagedResponse<ClassDefModel> query = classDefService.query(criteria);
|
|
|
List<ClassDefModel> data = query.getData();
|
|
|
- if (data.size() > 0) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- return true;
|
|
|
+ return data;
|
|
|
}
|
|
|
|
|
|
@Transactional
|