加密

src/main/java/com/sqx/modules/errand/controller/TransferRecordController.java

@@ -0,0 +1,29 @@
+package com.sqx.modules.errand.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.errand.service.ErrandEvaluateService;
+import com.sqx.modules.errand.service.TransferRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/admin/transferRecord")
+@Api(value = "管理端", tags = {"我的评价"})
+public class TransferRecordController {
+
+    @Autowired
+    private TransferRecordService transferRecordService;
+
+    @GetMapping(value = "queryTransferRecords")
+    @ApiOperation("查看转单记录分页数据")
+    public Result queryTransferRecords(Integer page, Integer limit, Integer orderId) {
+        return transferRecordService.transferRecordById(page, limit, orderId);
+    }
+
+
+}

src/main/java/com/sqx/modules/errand/controller/app/TransferRecordController.java

@@ -1,46 +0,0 @@
-package com.sqx.modules.errand.controller.app;
-
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sqx.common.exception.SqxException;
-import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Result;
-import com.sqx.modules.app.annotation.Login;
-import com.sqx.modules.app.entity.UserEntity;
-import com.sqx.modules.app.entity.queryRiderVo;
-import com.sqx.modules.app.service.UserService;
-import com.sqx.modules.common.service.CommonInfoService;
-import com.sqx.modules.errand.dto.*;
-import com.sqx.modules.errand.entity.*;
-import com.sqx.modules.errand.service.ErrandComplaintService;
-import com.sqx.modules.errand.service.TbIndentService;
-import com.sqx.modules.errand.service.TransferRecordService;
-import com.sqx.modules.errand.vo.queryOrderInfoVo;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@RestController
-@RequestMapping("/app/transferRecord")
-@Api(value = "转单记录", tags = {"转单记录"})
-@Slf4j
-public class TransferRecordController {
-    @Autowired
-    private TransferRecordService transferRecordService;
-
-    @GetMapping(value = "queryTransferRecords")
-    @ApiOperation("查看转单记录分页数据")
-    public Result queryTransferRecords( @RequestParam Long page, @RequestParam Long limit, @RequestParam Long orderId) {
-        return transferRecordService.transferRecordById(page, limit, orderId);
-    }
-}

src/main/java/com/sqx/modules/errand/dao/TransferRecordDao.java

@@ -21,5 +21,5 @@ import java.util.List;
 @Mapper
 public interface TransferRecordDao extends BaseMapper<TransferRecordEntity> {
 
-    IPage<TransferRecordVo> queryTransferRecordPages(Page<TransferRecordVo> pages, Long orderId);
+    IPage<TransferRecordVo> queryTransferRecordPages(Page<TransferRecordVo> pages, Integer orderId);
 }

src/main/java/com/sqx/modules/errand/service/TransferRecordService.java

@@ -5,6 +5,7 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.errand.entity.*;
 import com.sqx.modules.printInfo.entity.PrintInfo;
 
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.List;
 
 public interface TransferRecordService extends IService<TransferRecordEntity> {
@@ -12,5 +13,5 @@ public interface TransferRecordService extends IService<TransferRecordEntity> {
 
     boolean insertBatchPrintInfo(List<TransferRecordEntity> trs);
 
-    Result transferRecordById(Long page, Long limit, Long OrderId);
+    Result transferRecordById(Integer page, Integer limit, Integer OrderId);
 }

src/main/java/com/sqx/modules/errand/service/impl/TransferRecordServiceImpl.java

@@ -39,7 +39,7 @@ public class TransferRecordServiceImpl extends ServiceImpl<TransferRecordDao, Tr
     }
 
     @Override
-    public Result transferRecordById(Long page, Long limit, Long orderId) {
+    public Result transferRecordById(Integer page, Integer limit, Integer orderId) {
         Page<TransferRecordVo> pages = new Page<>(page, limit);
         PageUtils pageUtils = new PageUtils(transferRecordDao.queryTransferRecordPages(pages, orderId));
         return Result.success().put("data", pageUtils);