|
|
@@ -37,6 +37,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
|
|
|
@Override
|
|
|
public HttpResult query(OrderTaskPoolsVo orderTaskPoolsVo) {
|
|
|
+ String userId = getUserId();
|
|
|
BaseMapper<InsOrders> baseMapper = insOrdersService.getBaseMapper();
|
|
|
LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getOrderNo()), InsOrders::getOrderno, orderTaskPoolsVo.getOrderNo())
|
|
|
@@ -50,6 +51,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getUsername()), InsOrders::getUsername, orderTaskPoolsVo.getUsername())
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getInsureName()), InsOrders::getInsuredname, orderTaskPoolsVo.getInsureName())
|
|
|
.eq(!StringUtils.isEmpty(orderTaskPoolsVo.getAuditId()), InsOrders::getAgreeid, orderTaskPoolsVo.getAuditId())
|
|
|
+ .eq(!StringUtils.isEmpty(userId), InsOrders::getOperatorid, userId)
|
|
|
.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.getPolicyStartDate()) && !StringUtils.isEmpty(orderTaskPoolsVo.getPolicyEndDate()), InsOrders::getJqstartdate, orderTaskPoolsVo.getPolicyStartDate(), orderTaskPoolsVo.getPolicyEndDate())
|
|
|
@@ -77,8 +79,9 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
|
|
|
history.setStatus(insOrders.getOrderstatus());
|
|
|
history.setRemark("任务转发给:" + sysUser.getName());
|
|
|
insTaskHistoryService.insert(history);
|
|
|
- insOrders.setUserid(sysUser.getId());
|
|
|
- insOrders.setUsername(sysUser.getName());
|
|
|
+ /*insOrders.setUserid(sysUser.getId());
|
|
|
+ insOrders.setUsername(sysUser.getName());*/
|
|
|
+ insOrders.setOperatorid(sysUser.getId());
|
|
|
insOrdersService.updateById(insOrders);
|
|
|
return HttpResult.ok("保存成功");
|
|
|
}
|