Commit 1acae9ba by zhangxingmin

push

parent 19ada207
...@@ -3,6 +3,8 @@ package com.yd.csf.api.service.impl; ...@@ -3,6 +3,8 @@ package com.yd.csf.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sun.org.apache.bcel.internal.generic.I2F; import com.sun.org.apache.bcel.internal.generic.I2F;
import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.utils.SecurityUtil;
import com.yd.common.constant.CodeGeneratorConstants; import com.yd.common.constant.CodeGeneratorConstants;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode; import com.yd.common.enums.ResultCode;
...@@ -253,6 +255,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -253,6 +255,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//为空设置,方便新建暂存公用方法 //为空设置,方便新建暂存公用方法
dto = new ApiAppointmentInfoDto(); dto = new ApiAppointmentInfoDto();
} }
//获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
Appointment appointment = new Appointment(); Appointment appointment = new Appointment();
BeanUtils.copyProperties(dto,appointment); BeanUtils.copyProperties(dto,appointment);
//生成预约信息主表唯一业务ID //生成预约信息主表唯一业务ID
...@@ -261,6 +265,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -261,6 +265,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
appointment.setAppointmentNo(CodeGenerator.generateCode(CodeGeneratorConstants.APPOINTMENT)); appointment.setAppointmentNo(CodeGenerator.generateCode(CodeGeneratorConstants.APPOINTMENT));
//预约状态 //预约状态
appointment.setStatus(status); appointment.setStatus(status);
appointment.setCreatorName(authUserDto.getUsername());
iAppointmentService.saveOrUpdate(appointment); iAppointmentService.saveOrUpdate(appointment);
return Result.success(appointment); return Result.success(appointment);
} }
......
...@@ -85,4 +85,9 @@ public class ApiAppointmentPageResponse { ...@@ -85,4 +85,9 @@ public class ApiAppointmentPageResponse {
* 创建时间 * 创建时间
*/ */
private LocalDateTime createTime; private LocalDateTime createTime;
/**
* 创建人用户名
*/
private String creatorName;
} }
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
) as time, ) as time,
a.business_represent_account1, a.business_represent_account1,
a.creator_id, a.creator_id,
a.create_time a.create_time,
a.creator_name
from appointment a from appointment a
left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0 left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0
left join policyholder p on a.appointment_biz_id = p.appointment_biz_id and p.is_deleted = 0 left join policyholder p on a.appointment_biz_id = p.appointment_biz_id and p.is_deleted = 0
......
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