Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.core.text.Convert;
 import cn.iocoder.yudao.module.core.text.ServletUtils;
+import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.service.IPartnerWorkerService;
 import cn.iocoder.yudao.module.payment.service.OrderInfoService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
@@ -21,6 +22,7 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
@@ -98,7 +100,7 @@ public class InspectionMallPartnersController extends BaseController {
      * 工单管理
      */
     @GetMapping("/workOrder")
-    public TableDataInfo workOrder(String carNum,String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime,Integer pageSize,Integer pageNum)
+    public CommonResult<IPage<?>> workOrder(String carNum,String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime,Integer pageSize,Integer pageNum)
     {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         Set<Long> userRoleIdListByUserId = permissionService.getUserRoleIdListByUserId(user.getId());
@@ -110,33 +112,24 @@ public class InspectionMallPartnersController extends BaseController {
             queryWrapper.eq(ShopMallPartners::getUserId,user.getId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
             partner = shopMallPartnersService.getOne(queryWrapper);
             if (ObjectUtil.isEmpty(partner)){
-                TableDataInfo dataInfo =new TableDataInfo();
-                dataInfo.setCode(500);
-                dataInfo.setRows(new ArrayList<>());
-                dataInfo.setMsg("信息有误");
-                return dataInfo;
+                return error();
             }
         }else if (roles.contains("jcworker")){
             LambdaQueryWrapper<PartnerWorker> queryWrapperWork =new LambdaQueryWrapper<>();
             queryWrapperWork.eq(PartnerWorker::getUserId,user.getId());
             PartnerWorker worker = partnerWorkerService.getOne(queryWrapperWork);
             if (ObjectUtil.isEmpty(worker)){
-                TableDataInfo dataInfo =new TableDataInfo();
-                dataInfo.setCode(500);
-                dataInfo.setRows(new ArrayList<>());
-                dataInfo.setMsg("信息有误");
-                return dataInfo;
+                return error();
             }
             partner.setPartnerId(worker.getPartnerId());
         }
-//        Page<InspectionInfo> page = new Page<>(pageNum,pageSize);
-        PageHelper.startPage(pageNum,pageSize);
-        List<InspectionInfo> list = orderInfoService.workOrder(partner.getPartnerId(),carNum,goodsTitle, customerSource, payType,startTime,roleId,endTime);
-        return getDataTable(list);
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionInfo> list = orderInfoService.pageWorkOrder(partner.getPartnerId(),carNum,goodsTitle, customerSource, payType,startTime,roleId,endTime,page);
+        return CommonResult.success(list);
     }
 
     @GetMapping("/delWorkOrder")
-    public TableDataInfo delWorkOrder(String carNum,String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime,Integer pageSize,Integer pageNum)
+    public CommonResult<IPage<?>> delWorkOrder(String carNum,String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime,Integer pageSize,Integer pageNum)
     {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         Set<Long> userRoleIdListByUserId = permissionService.getUserRoleIdListByUserId(user.getId());
@@ -150,29 +143,24 @@ public class InspectionMallPartnersController extends BaseController {
             queryWrapper.eq(ShopMallPartners::getUserId,user.getId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
             partner = shopMallPartnersService.getOne(queryWrapper);
             if (ObjectUtil.isEmpty(partner)){
-                TableDataInfo dataInfo =new TableDataInfo();
-                dataInfo.setCode(500);
-                dataInfo.setRows(new ArrayList<>());
-                dataInfo.setMsg("信息有误");
-                return dataInfo;
+                return error();
             }
         }else if (roles.contains("jcworker")){
             LambdaQueryWrapper<PartnerWorker> queryWrapperWork =new LambdaQueryWrapper<>();
             queryWrapperWork.eq(PartnerWorker::getUserId,user.getId());
             PartnerWorker worker = partnerWorkerService.getOne(queryWrapperWork);
             if (ObjectUtil.isEmpty(worker)){
-                TableDataInfo dataInfo =new TableDataInfo();
-                dataInfo.setCode(500);
-                dataInfo.setRows(new ArrayList<>());
-                dataInfo.setMsg("信息有误");
-                return dataInfo;
+                return error();
             }
             partner.setPartnerId(worker.getPartnerId());
         }
 //        Page<InspectionInfo> page = new Page<>(pageNum,pageSize);
-        PageHelper.startPage(pageNum,pageSize);
-        List<InspectionInfo> list = orderInfoService.delworkOrder(partner.getPartnerId(),carNum,goodsTitle, customerSource, payType,startTime,roleId,endTime);
-        return getDataTable(list);
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+
+//        List<InspectionInfo> list = orderInfoService.delworkOrder(partner.getPartnerId(),carNum,goodsTitle, customerSource, payType,startTime,roleId,endTime);
+        IPage<InspectionInfo> list = orderInfoService.pageWorkOrder(partner.getPartnerId(),carNum,goodsTitle, customerSource, payType,startTime,roleId,endTime,page);
+
+        return CommonResult.success(list);
     }
 
     @PostMapping("/exportWorkOrder")

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.inspection.vo.SysDictData;
+import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerBalanceDetail;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
 import cn.iocoder.yudao.module.partner.service.IPartnerWorkerService;
@@ -18,6 +19,7 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService;
 import cn.iocoder.yudao.module.system.service.dict.DictTypeService;
 import cn.iocoder.yudao.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
@@ -322,17 +324,16 @@ public class PartnerOwnController  extends BaseController {
      * 获取员工信息
      */
     @GetMapping("/getWorkList")
-    public TableDataInfo getWorkList(Long partnerId,String workName,String phoneNum,Long postId,Integer pageNum,Integer pageSize)
+    public CommonResult<IPage<?>> getWorkList(Long partnerId, String workName, String phoneNum, Long postId, Integer pageNum, Integer pageSize)
     {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partnersTmp = partnerList.getById(partnerId);
         if (!partnersTmp.getUserId().equals(user.getId())){
             return null;
         }
-//        Page<PartnerWorker> page = new Page<>(pageNum, pageSize);
-        PageHelper.startPage(pageNum,pageSize);
-        List<PartnerWorker> workList = partnerList.getWorkList(partnerId,postId, workName, phoneNum);
-        return   getDataTable(workList);
+        Page<LabelRespVO> page = new Page<>(pageNum, pageSize);
+        IPage<PartnerWorker> workList = partnerList.pageWorkList(partnerId,postId, workName, phoneNum,page);
+        return CommonResult.success(workList);
     }
 
     @PostMapping("/delWorker")

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.inspection.mapper;
 
+import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
 import cn.iocoder.yudao.module.payment.entity.OrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
 import cn.iocoder.yudao.module.inspection.query.PartnerListQuery;
 import cn.iocoder.yudao.module.inspection.vo.*;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,6 +35,7 @@ public interface AppInspectionPartnerMapper extends BaseMapper<ShopMallPartners>
     List<GoodsVo> manageGoodsList(@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
     List<OrderAppDetail> orderList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
     List<PartnerWorker> getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum);
+    IPage<PartnerWorker> pageWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum,Page<LabelRespVO> page);
     List<InspectionInfo> inspectionList(Page<InspectionInfo> page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum);
     List<InspectionInfo> workerInspectionList(@Param("workerId")Long workerId,@Param("status") String status, @Param("searchValue")String searchValue);
     List<OrderInfo> validationList(@Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -69,11 +70,18 @@ public interface InspectionInfoMapper  extends BaseMapper<InspectionInfo>
     List<InspectionInfo> workOrder(@Param("partnerId") Long partnerId, @Param("carNum")String carNum, @Param("goodsTitle")String goodsTitle
             , @Param("customerSource")String customerSource, @Param("payType")String payType, @Param("startTime")String startTime
             , @Param("roleId") Long roleId, @Param("endTime")String endTime);
+    IPage<InspectionInfo> pageWorkOrder(@Param("partnerId") Long partnerId, @Param("carNum")String carNum, @Param("goodsTitle")String goodsTitle
+            , @Param("customerSource")String customerSource, @Param("payType")String payType, @Param("startTime")String startTime
+            , @Param("roleId") Long roleId, @Param("endTime")String endTime,Page<InspectionInfo> page);
 
     List<InspectionInfo> delworkOrder(@Param("partnerId") Long partnerId, @Param("carNum")String carNum, @Param("goodsTitle")String goodsTitle
             ,@Param("customerSource")String customerSource,@Param("payType")String payType,@Param("startTime")String startTime
             ,@Param("roleId") Long roleId,@Param("endTime")String endTime);
 
+    IPage<InspectionInfo> pageDelWorkOrder(@Param("partnerId") Long partnerId, @Param("carNum")String carNum, @Param("goodsTitle")String goodsTitle
+            , @Param("customerSource")String customerSource, @Param("payType")String payType, @Param("startTime")String startTime
+            , @Param("roleId") Long roleId, @Param("endTime")String endTime,Page<InspectionInfo> page);
+
     Map<String, Object> workOrderData(@Param("partnerId") Long partnerId, @Param("carNum")String carNum, @Param("goodsTitle")String goodsTitle
             , @Param("customerSource")String customerSource, @Param("payType")String payType, @Param("startTime")String startTime
             , @Param("roleId") Long roleId, @Param("endTime")String endTime);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import cn.iocoder.yudao.module.label.vo.LabelPageReqVO;
+import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerBalance;
 import cn.iocoder.yudao.module.partner.entity.PartnerBalanceDetail;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
 import cn.iocoder.yudao.module.payment.entity.OrderInfo;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.*;
@@ -62,6 +65,8 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
    void addWorker(Long partnerId,String realName,String phoneNum,Long postId) throws Exception;
    List<PartnerWorker> getWorkList(Long partnerId, Long postId, String workName, String phoneNum);
 
+   IPage<PartnerWorker> pageWorkList(Long partnerId, Long postId, String workName, String phoneNum, Page<LabelRespVO> page);
+
    void delWorker(Long partnerId,Long workId);
 
    List<InspectionInfo> inspectionList(Page<InspectionInfo> page,Long partnerId, String status, String carNum);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
@@ -62,9 +63,15 @@ public interface IInspectionInfoService  extends IService<InspectionInfo>
      * @return 结果
      */
     public int deleteInspectionInfoById(Long id);
+
     List<InspectionInfo> workOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
+
+    IPage<InspectionInfo> pageWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
+
+
     List<InspectionInfo> delworkOrder(Long partnerId, String carNum, String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime);
 
+    IPage<InspectionInfo> pageDelWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
 
     Map<String,Object> workOrderData(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import cn.iocoder.yudao.module.config.service.IInspSysConfigService;
+import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerBalance;
 import cn.iocoder.yudao.module.partner.entity.PartnerBalanceDetail;
 import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
@@ -39,6 +40,7 @@ import cn.iocoder.yudao.util.VehicleLicenseOCR;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -1082,6 +1084,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         return baseMapper.getWorkList(partnerId,postId,workName,phoneNum);
     }
 
+    @Override
+    public IPage<PartnerWorker> pageWorkList(Long partnerId, Long postId, String workName, String phoneNum, Page<LabelRespVO> page) {
+        return baseMapper.pageWorkList(partnerId,postId,workName,phoneNum,page);
+    }
+
     @Override
     public void delWorker(Long partnerId, Long workId) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
@@ -1413,14 +1420,14 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         PostPageReqVO post =new PostPageReqVO();
         post.setCode("inspection");
 
-        PageResult<PostDO> postPage = postService.getPostPage(post);
+        List<PostDO>  postPage = postService.listPostPage(post);
 
-        List<PostDO> sysPosts = postPage.getList();
-        PostDO sysPost = new PostDO();
-        sysPost.setId(null);
-        sysPost.setName("全部");
-        sysPosts.add(0,sysPost);
-        return sysPosts;
+//        List<PostDO> sysPosts = postPage.getList();
+//        PostDO sysPost = new PostDO();
+//        sysPost.setId(null);
+//        sysPost.setName("全部");
+//        sysPosts.add(sysPost);
+        return postPage;
     }
 
     @Override

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.util.SendSmsUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.StringUtils;
@@ -301,11 +302,21 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
         return baseMapper.workOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime,roleId,endTime);
     }
 
+    @Override
+    public IPage<InspectionInfo> pageWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime, Page<InspectionInfo> page) {
+        return baseMapper.pageWorkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime,roleId,endTime,page);
+    }
+
     @Override
     public List<InspectionInfo> delworkOrder(Long partnerId, String carNum, String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime){
         return baseMapper.delworkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime,roleId,endTime);
     }
 
+    @Override
+    public IPage<InspectionInfo> pageDelWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime, Page<InspectionInfo> page) {
+        return baseMapper.pageDelWorkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime,roleId,endTime,page);
+    }
+
     @Override
     public Map<String, Object> workOrderData(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime) {
         return baseMapper.workOrderData(partnerId,carNum,goodsTitle, customerSource, payType, startTime,roleId,endTime);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java

@@ -27,10 +27,14 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     List<InspectionInfo> workOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
 
+    IPage<InspectionInfo> pageWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
+
     Map<String, Object> workOrderData(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
 
     List<InspectionInfo> delworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
 
+    IPage<InspectionInfo> pageDelworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
+
     List<OrderInfo> orderListSystem(OrderInfo orderInfo);
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java

@@ -117,6 +117,18 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return iInspectionInfoService.workOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime, roleId,endTime);
     }
 
+    @Override
+    public IPage<InspectionInfo> pageWorkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime, Page<InspectionInfo> page) {
+        if (StringUtils.isNotEmpty(startTime)){
+            startTime = startTime+" 00:00:00";
+        }
+        if (StringUtils.isNotEmpty(endTime)){
+            endTime = endTime+" 23:59:59";
+        }
+
+        return iInspectionInfoService.pageWorkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime, roleId,endTime,page);
+    }
+
     @Override
     public Map<String, Object> workOrderData(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime) {
         if (StringUtils.isNotEmpty(startTime)){
@@ -139,6 +151,17 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return iInspectionInfoService.delworkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime, roleId,endTime);
     }
 
+    @Override
+    public IPage<InspectionInfo> pageDelworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime, Page<InspectionInfo> page) {
+        if (StringUtils.isNotEmpty(startTime)){
+            startTime = startTime+" 00:00:00";
+        }
+        if (StringUtils.isNotEmpty(endTime)){
+            endTime = endTime+" 23:59:59";
+        }
+        return iInspectionInfoService.pageDelWorkOrder(partnerId,carNum,goodsTitle, customerSource, payType, startTime, roleId,endTime,page);
+    }
+
     @Override
     public List<OrderInfo> orderListSystem(OrderInfo orderInfo) {
         return baseMapper.orderListSystem(orderInfo);

dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml

@@ -424,4 +424,23 @@ FROM
         where ipc.deleted = 0 and ia.deleted= 0 and ipc.partner_id = #{partnerId} and ia.appointment_day = #{formDate}
         order by ipc.create_time desc
     </select>
+    <select id="pageWorkList" resultType="cn.iocoder.yudao.module.partner.entity.PartnerWorker">
+        SELECT
+        pw.id,pw.user_id,su.nickname as workName,su.mobile as workPhone, su.avatar
+        FROM
+        partner_worker pw
+        INNER JOIN system_users su ON pw.user_id = su.id
+        left JOIN system_user_post sup on  sup.user_id = su.id
+        where pw.partner_id = #{partnerId}
+        <if test="workName!=null and workName!=''">
+            and su.nickname like concat('%',#{workName},'%')
+        </if>
+        <if test="phoneNum!=null and phoneNum!=''">
+            and su.mobile like concat('%',#{phoneNum},'%')
+        </if>
+        <if test="postId!=null and postId!=''">
+            and sup.post_id = #{postId}
+        </if>
+        order by pw.create_time desc
+    </select>
 </mapper>

dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml

@@ -208,4 +208,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ins.start_time between #{startTime} and #{endTime}
         </if>
     </select>
+    <select id="pageWorkOrder" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
+        select ins.*,oi.goods_title,su.nickname as buyName,su.mobile as buyPhone,oi.sku_name,oi.pay_money as realPayMoney
+        ,oi.pay_type,oi.order_status as orderStatus,oi.goods_id,oi.sku_id,oi.pay_time,oi.goods_price,ins.create_time
+        from inspection_info ins
+        left join order_info oi on oi.id = ins.inspection_order_id
+        left join system_users su on su.id = ins.user_id
+        left join system_user_role sur on sur.user_id = su.id
+        where 1=1
+        <if test="carNum!=null and carNum!=''">
+            and ins.car_num like concat('%',#{carNum},'%')
+        </if>
+        <if test="goodsTitle!=null and goodsTitle!=''">
+            and oi.goods_title like concat('%',#{goodsTitle},'%')
+        </if>
+        <if test="roleId!=null and roleId!=''">
+            and sur.role_id  = #{roleId}
+        </if>
+
+        <if test="customerSource!=null and customerSource!=''">
+            and ins.customer_source =#{customerSource}
+        </if>
+        <if test="payType!=null and payType!=''">
+            and oi.pay_type  =  #{payType}
+        </if>
+        <if test="startTime!=null and startTime!=''">
+            and ins.start_time between #{startTime} and #{endTime}
+        </if>
+        order by  ins.start_time desc
+    </select>
+    <select id="pageDelWorkOrder" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
+        select ins.*,oi.goods_title,su.nickname as buyName,su.mobile as buyPhone,oi.sku_name,oi.pay_money as realPayMoney
+        ,oi.pay_type,oi.order_status as orderStatus,oi.goods_id,oi.sku_id,oi.pay_time,oi.goods_price,ins.create_time
+        from del_inspection_info ins
+        left join del_order_info oi on oi.id = ins.inspection_order_id
+        left join system_users su on su.id = ins.user_id
+        left join system_user_role sur on sur.user_id = su.id
+        where 1=1
+        <if test="carNum!=null and carNum!=''">
+            and ins.car_num like concat('%',#{carNum},'%')
+        </if>
+        <if test="goodsTitle!=null and goodsTitle!=''">
+            and oi.goods_title like concat('%',#{goodsTitle},'%')
+        </if>
+        <if test="roleId!=null and roleId!=''">
+            and sur.role_id  = #{roleId}
+        </if>
+
+        <if test="customerSource!=null and customerSource!=''">
+            and ins.customer_source =#{customerSource}
+        </if>
+        <if test="payType!=null and payType!=''">
+            and oi.pay_type  =  #{payType}
+        </if>
+        <if test="startTime!=null and startTime!=''">
+            and ins.start_time between #{startTime} and #{endTime}
+        </if>
+        order by  ins.start_time desc
+    </select>
 </mapper>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java

@@ -19,6 +19,12 @@ public interface PostMapper extends BaseMapperX<PostDO> {
                 .inIfPresent(PostDO::getStatus, statuses));
     }
 
+    default List<PostDO> listPostPage(PostPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<PostDO>().likeIfPresent(PostDO::getCode, reqVO.getCode())
+                .likeIfPresent(PostDO::getName, reqVO.getName())
+                .eqIfPresent(PostDO::getStatus, reqVO.getStatus()));
+    }
+
     default PageResult<PostDO> selectPage(PostPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PostDO>()
                 .likeIfPresent(PostDO::getCode, reqVO.getCode())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java

@@ -38,7 +38,7 @@ public class OAuth2AccessTokenRedisDAO {
         accessTokenDO.setUpdater(null).setUpdateTime(null).setCreateTime(null).setCreator(null).setDeleted(null);
         long time = LocalDateTimeUtil.between(LocalDateTime.now(), accessTokenDO.getExpiresTime(), ChronoUnit.SECONDS);
         if (time > 0) {
-            stringRedisTemplate.opsForValue().set(redisKey, JsonUtils.toJsonString(accessTokenDO), time, TimeUnit.SECONDS);
+            stringRedisTemplate.opsForValue().set(redisKey, JsonUtils.toJsonString(accessTokenDO));
         }
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.lang.Nullable;
 
 import java.util.Collection;
@@ -63,6 +64,7 @@ public interface PostService {
      * @return 部门分页列表
      */
     PageResult<PostDO> getPostPage(PostPageReqVO reqVO);
+    List<PostDO> listPostPage(PostPageReqVO reqVO);
 
     /**
      * 获得岗位信息

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java

@@ -126,6 +126,11 @@ public class PostServiceImpl implements PostService {
         return postMapper.selectPage(reqVO);
     }
 
+    @Override
+    public List<PostDO> listPostPage(PostPageReqVO reqVO) {
+        return postMapper.listPostPage(reqVO);
+    }
+
     @Override
     public PostDO getPost(Long id) {
         return postMapper.selectById(id);