|
@@ -57,7 +57,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getUsername()), InsOrders::getUsername, orderTaskPoolsVo.getUsername())
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getUsername()), InsOrders::getUsername, orderTaskPoolsVo.getUsername())
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getInsureName()), InsOrders::getInsuredname, orderTaskPoolsVo.getInsureName())
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getInsureName()), InsOrders::getInsuredname, orderTaskPoolsVo.getInsureName())
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getAuditId()), InsOrders::getAgreeid, orderTaskPoolsVo.getAuditId())
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getAuditId()), InsOrders::getAgreeid, orderTaskPoolsVo.getAuditId())
|
|
|
- .eq(!StringUtils.isEmpty(userId), InsOrders::getOperatorid, userId)
|
|
|
|
|
|
|
+ //.eq(!StringUtils.isEmpty(userId), InsOrders::getOperatorid, userId)
|
|
|
.likeRight(!StringUtils.isEmpty(orderTaskPoolsVo.getDeptId()), InsOrders::getDeptid, orderTaskPoolsVo.getDeptId())
|
|
.likeRight(!StringUtils.isEmpty(orderTaskPoolsVo.getDeptId()), InsOrders::getDeptid, orderTaskPoolsVo.getDeptId())
|
|
|
.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())
|
|
@@ -101,4 +101,20 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
insOrdersService.updateById(insOrders);
|
|
insOrdersService.updateById(insOrders);
|
|
|
return HttpResult.ok("保存成功");
|
|
return HttpResult.ok("保存成功");
|
|
|
}
|
|
}
|
|
|
|
|
+ @Override
|
|
|
|
|
+ @Transactional
|
|
|
|
|
+ public HttpResult checkCurrentUserEdit(String orderNo){
|
|
|
|
|
+ String userId = getUserId();
|
|
|
|
|
+ InsOrders insOrders = insOrdersService.existOrder(orderNo);
|
|
|
|
|
+ if(org.apache.commons.lang3.StringUtils.isEmpty(insOrders.getOperatorid())){
|
|
|
|
|
+ return HttpResult.ok("非代客录单业务,允许编辑");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ SysUser sysUser = sysUserService.getById(insOrders.getOperatorid());
|
|
|
|
|
+ if(userId.equals(insOrders.getOperatorid())){
|
|
|
|
|
+ return HttpResult.ok("代客录单业务,当前操作员与当前编辑单相符,允许编辑");
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return HttpResult.error("已被"+insOrders.getOperatorid()+"--"+sysUser.getName()+"代客操作,可以线下联系进行任务转发");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|