|
|
@ -23,6 +23,7 @@ import org.jeecg.modules.userCode.service.UserService; |
|
|
import org.jeecg.modules.userRole.entity.TbUserRole; |
|
|
import org.jeecg.modules.userRole.entity.TbUserRole; |
|
|
import org.jeecg.modules.utils.ValidateTool; |
|
|
import org.jeecg.modules.utils.ValidateTool; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
import org.yaml.snakeyaml.events.Event; |
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
@ -65,7 +66,7 @@ public class OrderController { |
|
|
/** |
|
|
/** |
|
|
* 通过id查询订单详情 |
|
|
* 通过id查询订单详情 |
|
|
* |
|
|
* |
|
|
* @param id |
|
|
|
|
|
|
|
|
* @param |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
//@AutoLog(value = "tb_user_role-通过id查询") |
|
|
//@AutoLog(value = "tb_user_role-通过id查询") |
|
|
@ -88,13 +89,30 @@ public class OrderController { |
|
|
@RequestParam(name = "orderStatus", defaultValue = "0") Integer orderStatus |
|
|
@RequestParam(name = "orderStatus", defaultValue = "0") Integer orderStatus |
|
|
) { |
|
|
) { |
|
|
|
|
|
|
|
|
|
|
|
//先按0全部、1待聘用、2待进行、3待确认、4已完成、6已取消来做状态吧 |
|
|
//订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消 |
|
|
//订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消 |
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); |
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); |
|
|
QueryWrapper<TbOrder> queryWrapper = new QueryWrapper<>(); |
|
|
QueryWrapper<TbOrder> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("boss_id", hanHaiMember.getId()); |
|
|
queryWrapper.eq("boss_id", hanHaiMember.getId()); |
|
|
//orderStatus==0 全部订单 |
|
|
//orderStatus==0 全部订单 |
|
|
Page<TbOrder> page = new Page<TbOrder>(pageNo, pageSize); |
|
|
Page<TbOrder> page = new Page<TbOrder>(pageNo, pageSize); |
|
|
|
|
|
if (orderStatus == 1) { |
|
|
|
|
|
queryWrapper.eq("order_status",0); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 2) { |
|
|
|
|
|
queryWrapper.eq("order_status",1); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 3) { |
|
|
|
|
|
queryWrapper.eq("order_status",2); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 4) { |
|
|
|
|
|
queryWrapper.eq("order_status",6); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 5) { |
|
|
|
|
|
queryWrapper.eq("order_status",7); |
|
|
|
|
|
} |
|
|
IPage<TbOrder> pageList = tbOrderService.page(page, queryWrapper); |
|
|
IPage<TbOrder> pageList = tbOrderService.page(page, queryWrapper); |
|
|
|
|
|
|
|
|
return Result.OK(pageList); |
|
|
return Result.OK(pageList); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -102,9 +120,9 @@ public class OrderController { |
|
|
@ApiOperation(value = "求职方订单分页列表查询", notes = "求职方订单分页列表查询") |
|
|
@ApiOperation(value = "求职方订单分页列表查询", notes = "求职方订单分页列表查询") |
|
|
@GetMapping(value = "/workOrderList") |
|
|
@GetMapping(value = "/workOrderList") |
|
|
public Result<IPage<TbOrder>> workOrderList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
public Result<IPage<TbOrder>> workOrderList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
|
@RequestHeader("X-Access-Token") String token, |
|
|
|
|
|
@RequestParam(name = "orderStatus", defaultValue = "0") Integer orderStatus |
|
|
|
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
|
@RequestHeader("X-Access-Token") String token, |
|
|
|
|
|
@RequestParam(name = "orderStatus", defaultValue = "0") Integer orderStatus |
|
|
) { |
|
|
) { |
|
|
|
|
|
|
|
|
//订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消 |
|
|
//订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消 |
|
|
@ -113,10 +131,24 @@ public class OrderController { |
|
|
queryWrapper.eq("work_id", hanHaiMember.getId()); |
|
|
queryWrapper.eq("work_id", hanHaiMember.getId()); |
|
|
//orderStatus==0 全部订单 |
|
|
//orderStatus==0 全部订单 |
|
|
Page<TbOrder> page = new Page<TbOrder>(pageNo, pageSize); |
|
|
Page<TbOrder> page = new Page<TbOrder>(pageNo, pageSize); |
|
|
|
|
|
if (orderStatus == 1) { |
|
|
|
|
|
queryWrapper.eq("order_status",0); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 2) { |
|
|
|
|
|
queryWrapper.eq("order_status",1); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 3) { |
|
|
|
|
|
queryWrapper.eq("order_status",2); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 4) { |
|
|
|
|
|
queryWrapper.eq("order_status",6); |
|
|
|
|
|
} |
|
|
|
|
|
if (orderStatus == 5) { |
|
|
|
|
|
queryWrapper.eq("order_status",7); |
|
|
|
|
|
} |
|
|
IPage<TbOrder> pageList = tbOrderService.page(page, queryWrapper); |
|
|
IPage<TbOrder> pageList = tbOrderService.page(page, queryWrapper); |
|
|
return Result.OK(pageList); |
|
|
return Result.OK(pageList); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
cgx