|
|
@@ -4,6 +4,7 @@ import cn.com.qmth.stmms.ms.commons.utils.SqlUtil;
|
|
|
import cn.com.qmth.stmms.ms.commons.utils.specification.PagingAndSortingDTO;
|
|
|
import cn.com.qmth.stmms.ms.commons.web.PageableDTO;
|
|
|
import cn.com.qmth.stmms.ms.core.domain.*;
|
|
|
+import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
|
|
|
import cn.com.qmth.stmms.ms.core.domain.user.Role;
|
|
|
import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
|
|
|
import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
|
|
|
@@ -18,6 +19,7 @@ import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.persistence.criteria.CriteriaBuilder;
|
|
|
@@ -98,6 +100,14 @@ public class MarkLogController {
|
|
|
if (Objects.nonNull(workId)) {
|
|
|
predicates.add(cb.equal(root.get("workId").as(Long.class), workId));
|
|
|
}
|
|
|
+ List<Map> mapList = MarkLogOperType.listTypes();
|
|
|
+ if (mapList != null && mapList.size() > 0) {
|
|
|
+ CriteriaBuilder.In<Object> in = cb.in(root.get("operType"));
|
|
|
+ for (Map map : mapList) {
|
|
|
+ in.value(map.get("id"));
|
|
|
+ }
|
|
|
+ predicates.add(cb.and(cb.and(in)));
|
|
|
+ }
|
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
};
|
|
|
Page<MarkLog> result = markLogRepo.findAll(specification, pageable);
|
xiaof