yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询工单接口，默认只查询当天的，并且进行中的添加未过期时间

This commit is contained in:
yangjun 2026-01-21 13:49:19 +08:00
parent 3c2f8e7b82
commit ac00eb180d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
View File

@ -69,22 +69,21 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
@Override @Override
public IPage<DirectiveOrderEntity> queryOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req) { public IPage<DirectiveOrderEntity> queryOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req) {
String nowDate = DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"); String nowDate = DateUtils.formatDate(new Date(),"yyyy-MM-dd");
DirectiveOrder directiveOrder = new DirectiveOrder(); DirectiveOrder directiveOrder = new DirectiveOrder();
BeanUtils.copyProperties(directiveOrderEntity, directiveOrder); BeanUtils.copyProperties(directiveOrderEntity, directiveOrder);
QueryWrapper<DirectiveOrder> queryWrapper = new QueryWrapper<>(); QueryWrapper<DirectiveOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("nu_id", directiveOrderEntity.getNuId()); queryWrapper.eq("nu_id", directiveOrderEntity.getNuId());
queryWrapper.eq(StringUtils.isNotBlank(directiveOrderEntity.getEmployeeId()),"employee_id",directiveOrderEntity.getEmployeeId()); queryWrapper.eq(StringUtils.isNotBlank(directiveOrderEntity.getEmployeeId()),"employee_id",directiveOrderEntity.getEmployeeId());
queryWrapper.like("start_time", nowDate);//默认查询当天
/**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/ /**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/
if (StringUtils.equals("1", directiveOrderEntity.getWorkType())) { if (StringUtils.equals("1", directiveOrderEntity.getWorkType())) {
queryWrapper.eq("iz_start", "N"); queryWrapper.eq("iz_start", "N");
queryWrapper.eq("iz_finish", "N"); queryWrapper.eq("iz_finish", "N");
queryWrapper.apply("start_time > now()"); queryWrapper.apply("start_time > now()");
queryWrapper.orderByAsc("start_time");
} else if (StringUtils.equals("2", directiveOrderEntity.getWorkType())) { } else if (StringUtils.equals("2", directiveOrderEntity.getWorkType())) {
queryWrapper.eq("iz_start", "Y"); queryWrapper.eq("iz_start", "Y");
queryWrapper.eq("iz_finish", "N"); queryWrapper.eq("iz_finish", "N");
queryWrapper.orderByAsc("start_time");
} else if (StringUtils.equals("3", directiveOrderEntity.getWorkType())) { } else if (StringUtils.equals("3", directiveOrderEntity.getWorkType())) {
queryWrapper.eq("iz_start", "Y"); queryWrapper.eq("iz_start", "Y");
queryWrapper.eq("iz_finish", "Y"); queryWrapper.eq("iz_finish", "Y");
@ -93,10 +92,9 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
queryWrapper.eq("iz_finish", "N"); queryWrapper.eq("iz_finish", "N");
queryWrapper.apply("start_time < now()"); queryWrapper.apply("start_time < now()");
} else if (StringUtils.equals("5", directiveOrderEntity.getWorkType())) { } else if (StringUtils.equals("5", directiveOrderEntity.getWorkType())) {
queryWrapper.apply("((iz_start = 'N' and iz_finish='N') or (iz_start='Y' and iz_finish='N'))"); queryWrapper.apply("((iz_start = 'N' and iz_finish='N') or (iz_start='Y' and iz_finish='N')) and DATE_ADD(end_time, INTERVAL ifnull(timeout_duration,0) MINUTE) > NOW()");
} }
queryWrapper.orderByAsc("start_time");
Page<DirectiveOrder> page = new Page<>(pageNo, pageSize); Page<DirectiveOrder> page = new Page<>(pageNo, pageSize);
List<DirectiveOrder> list = baseMapper.selectList(page, queryWrapper); List<DirectiveOrder> list = baseMapper.selectList(page, queryWrapper);
IPage<DirectiveOrderEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); IPage<DirectiveOrderEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());