|
@@ -43,7 +43,14 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public HttpResult query(OrderTaskPoolsVo orderTaskPoolsVo) {
|
|
public HttpResult query(OrderTaskPoolsVo orderTaskPoolsVo) {
|
|
|
|
|
+ //后线可以查所有,非后线只能查自己代客的
|
|
|
String userId = getUserId();
|
|
String userId = getUserId();
|
|
|
|
|
+ //查询当前工号是否为后线人员
|
|
|
|
|
+ boolean isBachUser = false;
|
|
|
|
|
+ List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId,"20");
|
|
|
|
|
+ if(userList!=null && userList.size()>0){
|
|
|
|
|
+ isBachUser = true;
|
|
|
|
|
+ }
|
|
|
BaseMapper<InsOrders> baseMapper = insOrdersService.getBaseMapper();
|
|
BaseMapper<InsOrders> baseMapper = insOrdersService.getBaseMapper();
|
|
|
LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getOrderNo()), InsOrders::getOrderno, orderTaskPoolsVo.getOrderNo())
|
|
wrapper.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getOrderNo()), InsOrders::getOrderno, orderTaskPoolsVo.getOrderNo())
|
|
@@ -62,6 +69,9 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getEndDate()), InsOrders::getCreatetime, orderTaskPoolsVo.getStartDate(), orderTaskPoolsVo.getEndDate())
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getEndDate()), InsOrders::getCreatetime, orderTaskPoolsVo.getStartDate(), orderTaskPoolsVo.getEndDate())
|
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getPolicyStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getPolicyEndDate()), InsOrders::getJqstartdate, orderTaskPoolsVo.getPolicyStartDate(), orderTaskPoolsVo.getPolicyEndDate())
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getPolicyStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getPolicyEndDate()), InsOrders::getJqstartdate, orderTaskPoolsVo.getPolicyStartDate(), orderTaskPoolsVo.getPolicyEndDate())
|
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getPolicyStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getPolicyEndDate()), InsOrders::getSystartdate, orderTaskPoolsVo.getPolicyStartDate(), orderTaskPoolsVo.getPolicyEndDate());
|
|
.between(!StringUtils.isEmpty(orderTaskPoolsVo.getPolicyStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getPolicyEndDate()), InsOrders::getSystartdate, orderTaskPoolsVo.getPolicyStartDate(), orderTaskPoolsVo.getPolicyEndDate());
|
|
|
|
|
+ if(!isBachUser){//若非后线角色,只能查自己代客录单的单子
|
|
|
|
|
+ wrapper.eq(!StringUtils.isEmpty(userId), InsOrders::getOperatorid, userId);
|
|
|
|
|
+ }
|
|
|
//保司条件不为空时,拼接保司条件
|
|
//保司条件不为空时,拼接保司条件
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotEmpty(orderTaskPoolsVo.getInsCompany())) {
|
|
if (org.apache.commons.lang3.StringUtils.isNotEmpty(orderTaskPoolsVo.getInsCompany())) {
|
|
|
List<InsAreaCompany> list = insAreaCompanyService.query()
|
|
List<InsAreaCompany> list = insAreaCompanyService.query()
|