|
@@ -72,12 +72,51 @@ public class FuncidDefChangeRecordService {
|
|
|
response.setFail("classCode is required");
|
|
|
return response;
|
|
|
}
|
|
|
+ List<FuncidDefModel> funcidDefList = queryFuncidDef(code, classCode);
|
|
|
if (EnumOperationType.create.equals(param.getOperationType())) {
|
|
|
- Boolean isExists = isExists(code, classCode);
|
|
|
- if (!isExists) {
|
|
|
+ if (funcidDefList.size() > 0) {
|
|
|
response.setFail("code is exists");
|
|
|
return response;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if (funcidDefList.size() == 0) {
|
|
|
+ response.setFail("code not exists");
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+ FuncidDefModel funcidDef = funcidDefList.get(0);
|
|
|
+ param.setOrigCode(funcidDef.getOrigCode());
|
|
|
+ param.setName(funcidDef.getName());
|
|
|
+ if (param.getAliasCode() == null) {
|
|
|
+ param.setAliasCode(funcidDef.getAliasCode());
|
|
|
+ }
|
|
|
+ if (param.getAliasName() == null) {
|
|
|
+ param.setAliasName(funcidDef.getAliasName());
|
|
|
+ }
|
|
|
+ param.setClassCode(funcidDef.getClassCode());
|
|
|
+ param.setCategory(funcidDef.getCategory());
|
|
|
+ param.setType(funcidDef.getType());
|
|
|
+ param.setGroupCode(funcidDef.getGroupCode());
|
|
|
+ param.setProjectId(funcidDef.getProjectId());
|
|
|
+ if (param.getFirstTag() == null) {
|
|
|
+ param.setFirstTag(funcidDef.getFirstTag());
|
|
|
+ }
|
|
|
+ if (param.getSecondTag() == null) {
|
|
|
+ param.setSecondTag(funcidDef.getSecondTag());
|
|
|
+ }
|
|
|
+ param.setPriority(funcidDef.getPriority());
|
|
|
+ param.setInputMode(funcidDef.getInputMode());
|
|
|
+ param.setUnit(funcidDef.getUnit());
|
|
|
+ param.setDataType(funcidDef.getDataType());
|
|
|
+ param.setOrigDataType(funcidDef.getOrigDataType());
|
|
|
+ param.setIsMultiple(funcidDef.getIsMultiple());
|
|
|
+ param.setIsRegion(funcidDef.getIsRegion());
|
|
|
+ param.setFormater(funcidDef.getFormater());
|
|
|
+ param.setDataSource(funcidDef.getDataSource());
|
|
|
+ if (param.getNote() == null) {
|
|
|
+ param.setNote(funcidDef.getNote());
|
|
|
+ }
|
|
|
+ param.setSubFlag(funcidDef.getSubFlag());
|
|
|
+ param.setWeakPoint(funcidDef.getWeakPoint());
|
|
|
}
|
|
|
QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
|
|
|
BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(1));
|
|
@@ -96,17 +135,14 @@ public class FuncidDefChangeRecordService {
|
|
|
return response;
|
|
|
}
|
|
|
|
|
|
- private Boolean isExists(String code, String classCode) {
|
|
|
+ private List<FuncidDefModel> queryFuncidDef(String code, String classCode) {
|
|
|
JacksonCriteria criteria = JacksonCriteria.newInstance();
|
|
|
criteria.add("type", "common");
|
|
|
criteria.add("code", code);
|
|
|
criteria.add("classCode", classCode);
|
|
|
PagedResponse<FuncidDefModel> query = funcidDefService.query(criteria);
|
|
|
List<FuncidDefModel> data = query.getData();
|
|
|
- if (data.size() > 0) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- return true;
|
|
|
+ return data;
|
|
|
}
|
|
|
|
|
|
@Transactional
|