Merge remote-tracking branch 'origin/master' into dev-lili

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -60,7 +60,8 @@ public class OcrTaskchildDubiousFileController  {
     @RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET)
     public ResultVo dubiousfilelist(HttpServletRequest request,
                                   @RequestParam(value = "pageNo", required = false, defaultValue = "0") int pageNo,
-                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize) {
+                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
+                                    @RequestParam(value = "orderbyname", required = true, defaultValue = "0") String orderbyname) {
 
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
@@ -80,6 +81,17 @@ public class OcrTaskchildDubiousFileController  {
         wrapper.in("ID",list.stream().map(i->i.getPictureId()).collect(Collectors.toList()));
 
 
+        if(orderbyname.equals("desc")){
+            wrapper.orderByDesc("create_time");
+        }else {
+            wrapper.orderByAsc("create_time");
+        }
+
+
+
+
+
+
         //执行查询方法
         IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
 
@@ -118,39 +130,9 @@ public class OcrTaskchildDubiousFileController  {
 
 
         //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据
-        boolean b = ocrTaskchildDubiousFileService.removeByIds(fileList);
-        return ResultVoUtil.success(b);
-    }
-
-//    /**
-//     * 通过 ID 查询 单条 信息
-//     *
-//     * @param request
-//     * @param id      编号
-//     * @return
-//     */
-//    @RequestMapping(value = "", method = RequestMethod.GET)
-//    public ResponseEntity<?> findById(HttpServletRequest request, @PathVariable("id") Integer id) {
-//        //获取用户信息
-//        User user = userService.getUserInfo(request);
-//        OcrTaskchildDubiousFile ocrTaskchildDubiousFile= ocrTaskchildDubiousFileService.selectById(id);
-//        return new ResponseEntity<OcrTaskchildDubiousFile>(ocrTaskchildDubiousFile, HttpStatus.OK);
-//    }
-//
-//    /** 修改操作
-//     * @param request
-//     * @param ocrTaskchildDubiousFile
-//     * @return
-//     */
-//    @RequestMapping(value = "", method = RequestMethod.PATCH)
-//    public ResponseEntity<?> update(HttpServletRequest request, @RequestBody OcrTaskchildDubiousFile ocrTaskchildDubiousFile) {
-//        //获取用户信息
-//        User user = userService.getUserInfo(request);
-//        ocrTaskchildDubiousFileService.insertOrUpdate(ocrTaskchildDubiousFile);
-//        //此处需要手工处理 返回需要将修改后的数据返回
-//        return new ResponseEntity<OcrTaskchildDubiousFile>(HttpStatus.CREATED);
-//    }
 
+        return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error();
+    }
     /**
      * 添加
      * @param request
@@ -177,7 +159,7 @@ public class OcrTaskchildDubiousFileController  {
             ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis());
 
             QueryWrapper<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
-            wrapper.select("PICTUREID as pictureid").eq("ID",asd);
+            wrapper.eq("ID",asd);
             OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
             ocrtaskchilddubiousfile.setPictureId(one.getPictureid());
 
@@ -189,8 +171,8 @@ public class OcrTaskchildDubiousFileController  {
             list.add(ocrtaskchilddubiousfile);
         }
 
-        boolean b = ocrTaskchildDubiousFileService.saveBatch(list);
 
-        return ResultVoUtil.success(b);
+
+        return ocrTaskchildDubiousFileService.saveBatch(list)?ResultVoUtil.success():ResultVoUtil.error();
     }
 }