美术阅卷10月新增需求-新增纪检查询功能

stmms-ms-commons/pom.xml

@@ -46,5 +46,25 @@
             <artifactId>fastjson</artifactId>
             <version>1.1.30</version>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
     </dependencies>
 </project>

stmms-ms-core/pom.xml

@@ -25,11 +25,5 @@
             <groupId>cn.com.qmth</groupId>
             <artifactId>stmms-ms-commons</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
     </dependencies>
 </project>

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkLogRepo.java

@@ -3,11 +3,13 @@ package cn.com.qmth.stmms.ms.core.repository;
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author ting.yin
  * @date 2016年10月21日
  */
+@Repository
 public interface MarkLogRepo extends JpaRepository<MarkLog, Long>, JpaSpecificationExecutor<MarkLog> {
 
     /**

stmms-ms-log/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>stmms-ms-log</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth</groupId>
+            <artifactId>stmms-ms-commons</artifactId>
+        </dependency>
 		<dependency>
             <groupId>cn.com.qmth</groupId>
             <artifactId>stmms-ms-core</artifactId>
@@ -28,25 +32,5 @@
     		<groupId>org.springframework.boot</groupId>
     		<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
     </dependencies>
 </project>

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/controller/MarkLogController.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.ms.log.controller;
 
+import cn.com.qmth.stmms.ms.commons.utils.specification.PagingAndSortingDTO;
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
 import io.swagger.annotations.Api;
@@ -31,28 +32,28 @@ public class MarkLogController {
 
     @ApiOperation(value = "纪检审计查询接口")
     @GetMapping("/selectMarkLog")
-    public Page<MarkLog> selectMarkLog(@ApiParam(value = "科目", required = false) @RequestParam(required = false) String subject,
-                                       @ApiParam(value = "准考证号", required = false) @RequestParam(required = false) Long examNumber,
-                                       @ApiParam(value = "学生姓名", required = false) @RequestParam(required = false) String studentName,
-                                       @ApiParam(value = "操作类型(1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置)", required = false) @RequestParam(required = false) Integer operType,
-                                       @ApiParam(value = "开始时间", required = false) @RequestParam(required = false) String startTime,
-                                       @ApiParam(value = "结束时间", required = false) @RequestParam(required = false) String endTime,
-                                       @RequestParam Integer curPage,
-                                       @RequestParam Integer pageSize) {
+    public PagingAndSortingDTO selectMarkLog(@ApiParam(value = "科目", required = false) @RequestParam(required = false) String subject,
+                                             @ApiParam(value = "准考证号", required = false) @RequestParam(required = false) Long examNumber,
+                                             @ApiParam(value = "学生姓名", required = false) @RequestParam(required = false) String studentName,
+                                             @ApiParam(value = "操作类型(1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置)", required = false) @RequestParam(required = false) Integer operType,
+                                             @ApiParam(value = "开始时间", required = false) @RequestParam(required = false) String startTime,
+                                             @ApiParam(value = "结束时间", required = false) @RequestParam(required = false) String endTime,
+                                             @RequestParam Integer curPage,
+                                             @RequestParam Integer pageSize) {
         Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "createTime");
         Specification<MarkLog> specification = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             if (Objects.nonNull(subject)) {
-                predicates.add(cb.equal(root.get("subject"), subject));
+                predicates.add(cb.equal(root.get("subject").as(String.class), subject));
             }
             if (Objects.nonNull(examNumber)) {
-                predicates.add(cb.equal(root.get("examNumber"), examNumber));
+                predicates.add(cb.equal(root.get("examNumber").as(String.class), examNumber));
             }
             if (Objects.nonNull(studentName)) {
                 predicates.add(cb.like(root.get("studentName").as(String.class), "%" + studentName + "%"));
             }
             if (Objects.nonNull(operType)) {
-                predicates.add(cb.equal(root.get("operType"), operType));
+                predicates.add(cb.equal(root.get("operType").as(Integer.class), operType));
             }
             if (Objects.nonNull(startTime)) {
                 //大于或等于传入时间
@@ -64,6 +65,8 @@ public class MarkLogController {
             }
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
-        return markLogRepo.findAll(specification, pageable);
+        Page<MarkLog> result = markLogRepo.findAll(specification, pageable);
+        return new PagingAndSortingDTO(result.getNumber(), result.getSize(), result.getTotalPages(),
+                result.getTotalElements(), result.getContent());
     }
 }