|
@@ -10,7 +10,6 @@ import com.persagy.common.web.MapResponse;
|
|
import com.persagy.common.web.PagedResponse;
|
|
import com.persagy.common.web.PagedResponse;
|
|
import com.persagy.dmp.rwd.edit.config.web.UserUtils;
|
|
import com.persagy.dmp.rwd.edit.config.web.UserUtils;
|
|
import com.persagy.dmp.rwd.edit.entity.FuncidDefChangeRecord;
|
|
import com.persagy.dmp.rwd.edit.entity.FuncidDefChangeRecord;
|
|
-import com.persagy.dmp.rwd.edit.entity.QChangeRecord;
|
|
|
|
import com.persagy.dmp.rwd.edit.entity.QFuncidDefChangeRecord;
|
|
import com.persagy.dmp.rwd.edit.entity.QFuncidDefChangeRecord;
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefChangeRecordRepository;
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefChangeRecordRepository;
|
|
@@ -40,7 +39,7 @@ public class FuncidDefChangeRecordService {
|
|
|
|
|
|
private List<BooleanExpression> parse(ObjectNode object) {
|
|
private List<BooleanExpression> parse(ObjectNode object) {
|
|
List<BooleanExpression> list = new LinkedList<>();
|
|
List<BooleanExpression> list = new LinkedList<>();
|
|
- QChangeRecord qt = QChangeRecord.changeRecord;
|
|
|
|
|
|
+ QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
|
|
list.addAll(CriteriaUtils.parse(qt.id, object.get("id")));
|
|
list.addAll(CriteriaUtils.parse(qt.id, object.get("id")));
|
|
list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
|
|
list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
|
|
list.addAll(CriteriaUtils.parse(qt.operationType, object.get("operationType"), EnumOperationType.class));
|
|
list.addAll(CriteriaUtils.parse(qt.operationType, object.get("operationType"), EnumOperationType.class));
|
|
@@ -80,7 +79,7 @@ public class FuncidDefChangeRecordService {
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- QChangeRecord qt = QChangeRecord.changeRecord;
|
|
|
|
|
|
+ QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
|
|
BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(1));
|
|
BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(1));
|
|
Iterable<FuncidDefChangeRecord> all = repository.findAll(ex);
|
|
Iterable<FuncidDefChangeRecord> all = repository.findAll(ex);
|
|
List<FuncidDefChangeRecord> list = new ArrayList<>();
|
|
List<FuncidDefChangeRecord> list = new ArrayList<>();
|