|
@@ -11,11 +11,8 @@ import com.persagy.common.web.PagedResponse;
|
|
|
import com.persagy.dmp.rwd.edit.config.web.UserUtils;
|
|
|
import com.persagy.dmp.rwd.edit.entity.ClassDefChangeRecord;
|
|
|
import com.persagy.dmp.rwd.edit.entity.QClassDefChangeRecord;
|
|
|
-import com.persagy.dmp.rwd.edit.entity.QRwdeditVersionChangeRecord;
|
|
|
-import com.persagy.dmp.rwd.edit.entity.RwdeditVersionChangeRecord;
|
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
|
|
|
import com.persagy.dmp.rwd.edit.repository.ClassDefChangeRecordRepository;
|
|
|
-import com.persagy.dmp.rwd.edit.repository.RwdeditVersionChangeRecordRepository;
|
|
|
import com.persagy.dmp.rwd.model.ClassDefModel;
|
|
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -26,13 +23,10 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.transaction.Transactional;
|
|
|
import java.io.*;
|
|
|
import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
@Slf4j
|
|
|
@Service
|
|
|
public class ClassDefChangeRecordService {
|
|
|
- @Autowired
|
|
|
- RwdeditVersionChangeRecordRepository versionChangeRecordRepository;
|
|
|
|
|
|
@Autowired
|
|
|
ClassDefChangeRecordRepository repository;
|
|
@@ -57,19 +51,11 @@ public class ClassDefChangeRecordService {
|
|
|
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.version, object.get("version")));
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
public PagedResponse<ClassDefChangeRecord> query(JacksonCriteria criteria) {
|
|
|
- String versionId = criteria.getString("versionId");
|
|
|
- if (versionId != null) {
|
|
|
- QRwdeditVersionChangeRecord qt = QRwdeditVersionChangeRecord.rwdeditVersionChangeRecord;
|
|
|
- Iterable<RwdeditVersionChangeRecord> all = versionChangeRecordRepository.findAll(qt.versionId.eq(versionId).and(qt.type.eq(1)));
|
|
|
- List<RwdeditVersionChangeRecord> list = new ArrayList<>();
|
|
|
- all.forEach(list::add);
|
|
|
- List<Integer> changeIdList = list.stream().map(RwdeditVersionChangeRecord::getChangeId).collect(Collectors.toList());
|
|
|
- criteria.add("id").in(changeIdList);
|
|
|
- }
|
|
|
return criteriaUtils.query(QClassDefChangeRecord.classDefChangeRecord, this::parse, criteria);
|
|
|
}
|
|
|
|