|
@@ -13,6 +13,7 @@ import com.persagy.dmp.rwd.edit.entity.FuncidDefChangeRecord;
|
|
|
import com.persagy.dmp.rwd.edit.entity.QFuncidDefChangeRecord;
|
|
|
import com.persagy.dmp.rwd.edit.entity.RwdeditRefTypeInfos;
|
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
|
|
|
+import com.persagy.dmp.rwd.edit.enumeration.EnumVersionState;
|
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefChangeRecordRepository;
|
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefRepository;
|
|
|
import com.persagy.dmp.rwd.enums.FuncidDataType;
|
|
@@ -57,7 +58,7 @@ public class FuncidDefChangeRecordService {
|
|
|
list.addAll(CriteriaUtils.parse(qt.publishUser, object.get("publishUser")));
|
|
|
list.addAll(CriteriaUtils.parse(qt.publishTime, object.get("publishTime")));
|
|
|
list.addAll(CriteriaUtils.parse(qt.finishTime, object.get("finishTime")));
|
|
|
- list.addAll(CriteriaUtils.parse(qt.state, object.get("state")));
|
|
|
+ list.addAll(CriteriaUtils.parse(qt.state, object.get("state"), EnumVersionState.class));
|
|
|
list.addAll(CriteriaUtils.parse(qt.version, object.get("version")));
|
|
|
return list;
|
|
|
}
|
|
@@ -82,7 +83,7 @@ public class FuncidDefChangeRecordService {
|
|
|
}
|
|
|
FuncidDefModel funcidDef = queryFuncidDef(code, classCode);
|
|
|
if (EnumOperationType.create.equals(param.getOperationType())) {
|
|
|
- if (funcidDef == null) {
|
|
|
+ if (funcidDef != null) {
|
|
|
response.setFail("code is exists");
|
|
|
return response;
|
|
|
}
|
|
@@ -126,7 +127,7 @@ public class FuncidDefChangeRecordService {
|
|
|
param.setWeakPoint(funcidDef.getWeakPoint());
|
|
|
}
|
|
|
QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
|
|
|
- BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(1)).and(qt.version.isNull());
|
|
|
+ BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT)).and(qt.version.isNull());
|
|
|
Iterable<FuncidDefChangeRecord> all = repository.findAll(ex);
|
|
|
List<FuncidDefChangeRecord> list = new ArrayList<>();
|
|
|
all.forEach(list::add);
|
|
@@ -136,7 +137,7 @@ public class FuncidDefChangeRecordService {
|
|
|
param.setOperationUser(UserUtils.currentUserId() + "");
|
|
|
param.setOperationTime(new Date());
|
|
|
param.setValid(true);
|
|
|
- param.setState(1);
|
|
|
+ param.setState(EnumVersionState.INIT);
|
|
|
repository.save(param);
|
|
|
response.add("id", param.getId());
|
|
|
return response;
|
|
@@ -151,7 +152,7 @@ public class FuncidDefChangeRecordService {
|
|
|
return response;
|
|
|
}
|
|
|
FuncidDefChangeRecord changeRecord = optional.get();
|
|
|
- if (changeRecord.getState() == 1 && changeRecord.getVersion() == null) {
|
|
|
+ if (EnumVersionState.INIT.equals(changeRecord.getState()) && changeRecord.getVersion() == null) {
|
|
|
if (param.getAliasCode() != null) {
|
|
|
changeRecord.setAliasCode(param.getAliasCode());
|
|
|
}
|
|
@@ -189,7 +190,7 @@ public class FuncidDefChangeRecordService {
|
|
|
Optional<FuncidDefChangeRecord> optional = repository.findById(param.getId());
|
|
|
if (optional.isPresent()) {
|
|
|
FuncidDefChangeRecord changeRecord = optional.get();
|
|
|
- if (changeRecord.getState() != 1 || changeRecord.getVersion() != null) {
|
|
|
+ if (!EnumVersionState.INIT.equals(changeRecord.getState()) || changeRecord.getVersion() != null) {
|
|
|
response.setFail(changeRecord.getId() + " 不可删除!");
|
|
|
return response;
|
|
|
}
|
|
@@ -339,7 +340,7 @@ public class FuncidDefChangeRecordService {
|
|
|
return sqlList;
|
|
|
}
|
|
|
|
|
|
- public void updateStateByVersion(Integer state, String version) {
|
|
|
+ public void updateStateByVersion(EnumVersionState state, String version) {
|
|
|
JacksonCriteria criteria = JacksonCriteria.newInstance();
|
|
|
criteria.add("version", version);
|
|
|
PagedResponse<FuncidDefChangeRecord> query = query(criteria);
|
|
@@ -349,19 +350,19 @@ public class FuncidDefChangeRecordService {
|
|
|
List<FuncidDefChangeRecord> data = query.getData();
|
|
|
for (FuncidDefChangeRecord changeRecord : data) {
|
|
|
switch (state) {
|
|
|
- case 2: {
|
|
|
+ case CONFIRM: {
|
|
|
changeRecord.setConfirmUser(UserUtils.currentUserId() + "");
|
|
|
changeRecord.setConfirmTime(new Date());
|
|
|
changeRecord.setState(state);
|
|
|
break;
|
|
|
}
|
|
|
- case 3: {
|
|
|
+ case PUBLISH: {
|
|
|
changeRecord.setPublishUser(UserUtils.currentUserId() + "");
|
|
|
changeRecord.setPublishTime(new Date());
|
|
|
changeRecord.setState(state);
|
|
|
break;
|
|
|
}
|
|
|
- case 4: {
|
|
|
+ case FINISH: {
|
|
|
changeRecord.setFinishTime(new Date());
|
|
|
changeRecord.setState(state);
|
|
|
break;
|
|
@@ -372,7 +373,7 @@ public class FuncidDefChangeRecordService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (state == 4) {
|
|
|
+ if (state == EnumVersionState.FINISH) {
|
|
|
updateFuncidDef(data, version);
|
|
|
}
|
|
|
repository.saveAll(data);
|