Commit b4a406bd by 邹磊浩

修改代码

parent 623fc9f8
...@@ -172,4 +172,6 @@ public class DbwzOrderVo { ...@@ -172,4 +172,6 @@ public class DbwzOrderVo {
private String evaluationContent; private String evaluationContent;
private Date createTime; private Date createTime;
private String eName;
} }
...@@ -152,4 +152,6 @@ public class ZyphOrderVo { ...@@ -152,4 +152,6 @@ public class ZyphOrderVo {
private String isSatisfaction; private String isSatisfaction;
private String evaluationContent; private String evaluationContent;
private String eName;
} }
...@@ -21,6 +21,7 @@ import com.pz.system.domain.TotalOrder; ...@@ -21,6 +21,7 @@ import com.pz.system.domain.TotalOrder;
import com.pz.system.domain.YypzOrder; import com.pz.system.domain.YypzOrder;
import com.pz.system.domain.bo.OrderFinishedBo; import com.pz.system.domain.bo.OrderFinishedBo;
import com.pz.system.mapper.TotalOrderMapper; import com.pz.system.mapper.TotalOrderMapper;
import com.pz.system.mapper.UserVsitorMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -54,6 +55,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService ...@@ -54,6 +55,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
private final TotalOrderMapper totalOrderMapper; private final TotalOrderMapper totalOrderMapper;
private final EmployeesMapper employeesMapper; private final EmployeesMapper employeesMapper;
private final OrderDelayQueue delayQueue; private final OrderDelayQueue delayQueue;
private final UserVsitorMapper userVsitorMapper;
private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
...@@ -71,6 +73,14 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService ...@@ -71,6 +73,14 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
@Override @Override
public TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery) { public TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery) {
Page<ZyphOrderVo> result = baseMapper.findZyphOrderVoPage(pageQuery.build(), bo); Page<ZyphOrderVo> result = baseMapper.findZyphOrderVoPage(pageQuery.build(), bo);
Optional.ofNullable(result.getRecords()).ifPresent(zyphOrderVos -> {
zyphOrderVos.forEach(dbwzOrderVo -> {
Optional.ofNullable(userVsitorMapper.selectVoById(dbwzOrderVo.getVisitor())).ifPresent(
// 就诊人员
dbwzOrderVo::setUserVsitorVo
);
});
});
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
tlo.evaluation_content AS evaluationContent, tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime, yyod.over_time AS overtime,
yyod.voucher AS voucher, yyod.voucher AS voucher,
yyod.visitor AS visitor,
yyod.create_time as createTime yyod.create_time as createTime
FROM dbgh_order AS yyod FROM dbgh_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
yyod.voucher AS voucher, yyod.voucher AS voucher,
yyod.start_day, yyod.start_day,
yyod.end_day, yyod.end_day,
yyod.visitor AS visitor,
yyod.start_time, yyod.start_time,
yyod.end_time, yyod.end_time,
yyod.create_time yyod.create_time
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment