From 8cf706fa6e9cdc52c70f80872dc17c14405fdd06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <3226558941@qq.com> Date: Thu, 12 Oct 2023 14:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppletLoginServiceImpl.java | 17 -- ...NurseAppletPersonWorkOrderServiceImpl.java | 18 -- .../impl/NursePersonAppLoginServiceImpl.java | 31 --- .../AppointmentOrderProcessRecordMapper.java | 72 ------- .../impl/AppointmentOrderServiceImpl.java | 18 -- .../AppointmentOrderProcessRecordMapper.xml | 187 ------------------ .../OrderEvaluatePictureInfoMapper.xml | 0 7 files changed, 343 deletions(-) delete mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.java delete mode 100644 xinelu-nurse-manage/src/main/resources/mapper/manage/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.xml rename xinelu-nurse-manage/src/main/resources/{ => mapper/manage}/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml (100%) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/appletlogin/impl/AppletLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/appletlogin/impl/AppletLoginServiceImpl.java index 3f5d240..d1ce709 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/appletlogin/impl/AppletLoginServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/appletlogin/impl/AppletLoginServiceImpl.java @@ -24,12 +24,10 @@ import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.appointmentorder.AppointmentOrder; import com.xinelu.manage.domain.appointmentorderdetails.AppointmentOrderDetails; -import com.xinelu.manage.domain.appointmentorderprocessrecord.AppointmentOrderProcessRecord; import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.sysarea.SysArea; import com.xinelu.manage.mapper.appointmentorder.AppointmentOrderMapper; import com.xinelu.manage.mapper.appointmentorderdetails.AppointmentOrderDetailsMapper; -import com.xinelu.manage.mapper.appointmentorderprocessrecord.AppointmentOrderProcessRecordMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.sysarea.SysAreaMapper; import com.xinelu.manage.vo.patientinfo.PatientInfoVO; @@ -76,8 +74,6 @@ public class AppletLoginServiceImpl implements AppletLoginService { private AppointmentOrderDetailsMapper appointmentOrderDetailsMapper; @Resource private AppletAccessTokenUtil appletAccessTokenUtil; - @Resource - private AppointmentOrderProcessRecordMapper appointmentOrderProcessRecordMapper; /** @@ -444,19 +440,6 @@ public class AppletLoginServiceImpl implements AppletLoginService { log.info("新增预约订单主表失败，失败原因：[{}]", appointmentOrder); throw new ServiceException("预约护理信息失败，请联系管理员！"); } - //新增预约订单流程记录信息表 - AppointmentOrderProcessRecord appointment = new AppointmentOrderProcessRecord(); - appointment.setOperatePersonId(dto.getPatientId()); - appointment.setAppointmentOrderId(appointmentOrder.getId()); - appointment.setAppointmentOrderNo(orderNo); - appointment.setOperateTime(LocalDateTime.now()); - appointment.setOperateType(OrderProcessOperateTypeEnum.PLACE_ORDER.getInfo()); - appointment.setOperateDetails("预约订单下单操作"); - appointment.setCreateTime(LocalDateTime.now()); - int count = appointmentOrderProcessRecordMapper.insertAppointmentOrderProcessRecord(appointment); - if (count <= 0) { - throw new ServiceException("预约订单流程记录失败，请联系管理员！"); - } } /** diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseappletpersonworkorder/Impl/NurseAppletPersonWorkOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseappletpersonworkorder/Impl/NurseAppletPersonWorkOrderServiceImpl.java index 1c82e10..bdf26ed 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseappletpersonworkorder/Impl/NurseAppletPersonWorkOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseappletpersonworkorder/Impl/NurseAppletPersonWorkOrderServiceImpl.java @@ -4,13 +4,10 @@ package com.xinelu.applet.service.nurseappletpersonworkorder.Impl; import com.xinelu.applet.dto.nursepersonapplogin.OrderFallbackDTO; import com.xinelu.applet.service.nurseappletpersonworkorder.NurseAppletPersonWorkOrderService; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.enums.OrderProcessOperateTypeEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; -import com.xinelu.manage.domain.appointmentorderprocessrecord.AppointmentOrderProcessRecord; import com.xinelu.manage.mapper.appointmentorder.AppointmentOrderMapper; import com.xinelu.manage.mapper.appointmentorderdetails.AppointmentOrderDetailsMapper; -import com.xinelu.manage.mapper.appointmentorderprocessrecord.AppointmentOrderProcessRecordMapper; import com.xinelu.manage.service.stationmessagepush.StationMessagePushService; import com.xinelu.manage.vo.appointmentorder.AppointmentReceivingOrderVO; import lombok.extern.slf4j.Slf4j; @@ -18,7 +15,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.time.LocalDateTime; import java.util.Objects; /** @@ -33,8 +29,6 @@ public class NurseAppletPersonWorkOrderServiceImpl implements NurseAppletPersonW @Resource private AppointmentOrderMapper appointmentOrderMapper; @Resource - private AppointmentOrderProcessRecordMapper appointmentOrderProcessRecordMapper; - @Resource private StationMessagePushService stationMessagePushService; @Resource private AppointmentOrderDetailsMapper appointmentOrderDetailsMapper; @@ -56,18 +50,6 @@ public class NurseAppletPersonWorkOrderServiceImpl implements NurseAppletPersonW if (update < 0) { throw new ServiceException("接单失败，请联系管理员！"); } - AppointmentOrderProcessRecord appointmentOrderProcessRecord = new AppointmentOrderProcessRecord(); - appointmentOrderProcessRecord.setAppointmentOrderNo(orderFallbackDTO.getAppointmentOrderNo()); - appointmentOrderProcessRecord.setCreateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperatePersonId(orderFallbackDTO.getStationPersonId()); - appointmentOrderProcessRecord.setOperateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperateType(OrderProcessOperateTypeEnum.RECEIVE_ORDER.getInfo()); - appointmentOrderProcessRecord.setAppointmentOrderId(orderFallbackDTO.getAppointmentOrderId()); - appointmentOrderProcessRecord.setOperateDetails("接单"); - int count = appointmentOrderProcessRecordMapper.insertAppointmentOrderProcessRecord(appointmentOrderProcessRecord); - if (count <= 0) { - throw new ServiceException("增加预约订单流程记录失败，请联系管理员！"); - } //异步发送消息 stationMessagePushService.receivingOrdersOperationsPush(appointmentReceivingOrder); return AjaxResult.success(); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursepersonapplogin/impl/NursePersonAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursepersonapplogin/impl/NursePersonAppLoginServiceImpl.java index 4d112f3..31e4fd1 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursepersonapplogin/impl/NursePersonAppLoginServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursepersonapplogin/impl/NursePersonAppLoginServiceImpl.java @@ -7,7 +7,6 @@ import com.xinelu.applet.service.nursepersonapplogin.INursePersonAppLoginService import com.xinelu.applet.vo.nursepersonapplogin.*; import com.xinelu.common.config.XinELuConfig; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.enums.OrderProcessOperateTypeEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.AgeUtil; @@ -16,12 +15,10 @@ import com.xinelu.common.utils.file.MimeTypeUtils; import com.xinelu.common.utils.regex.RegexUtil; import com.xinelu.common.utils.sign.Md5Utils; import com.xinelu.manage.domain.appointmentorderdetails.AppointmentOrderDetails; -import com.xinelu.manage.domain.appointmentorderprocessrecord.AppointmentOrderProcessRecord; import com.xinelu.manage.domain.nursestationperson.NurseStationPerson; import com.xinelu.manage.domain.nursestationpersonrevenue.NurseStationPersonRevenue; import com.xinelu.manage.domain.patientdiseaseinfo.PatientDiseaseInfo; import com.xinelu.manage.mapper.appointmentorderdetails.AppointmentOrderDetailsMapper; -import com.xinelu.manage.mapper.appointmentorderprocessrecord.AppointmentOrderProcessRecordMapper; import com.xinelu.manage.mapper.nursestation.NurseStationMapper; import com.xinelu.manage.mapper.nursestationperson.NurseStationPersonMapper; import com.xinelu.manage.mapper.nursestationpersonrevenue.NurseStationPersonRevenueMapper; @@ -71,8 +68,6 @@ public class NursePersonAppLoginServiceImpl implements INursePersonAppLoginServi @Resource private XinELuConfig xinYiLuConfig; @Resource - private AppointmentOrderProcessRecordMapper appointmentOrderProcessRecordMapper; - @Resource private NurseStationPersonRevenueMapper nurseStationPersonRevenueMapper; @Resource private PatientDiseaseInfoMapper patientDiseaseInfoMapper; @@ -173,19 +168,6 @@ public class NursePersonAppLoginServiceImpl implements INursePersonAppLoginServi if (update <= 0) { throw new ServiceException("任务退回失败，请联系管理员！"); } - //流程记录 - AppointmentOrderProcessRecord appointmentOrderProcessRecord = new AppointmentOrderProcessRecord(); - appointmentOrderProcessRecord.setAppointmentOrderNo(orderFallbackDTO.getAppointmentOrderNo()); - appointmentOrderProcessRecord.setCreateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperatePersonId(orderFallbackDTO.getStationPersonId()); - appointmentOrderProcessRecord.setOperateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperateType(OrderProcessOperateTypeEnum.ACTIVE_BACK_ORDER.getInfo()); - appointmentOrderProcessRecord.setOperateDetails(orderFallbackDTO.getTaskReturnReason()); - appointmentOrderProcessRecord.setAppointmentOrderId(orderFallbackDTO.getAppointmentOrderId()); - int count = appointmentOrderProcessRecordMapper.insertAppointmentOrderProcessRecord(appointmentOrderProcessRecord); - if (count <= 0) { - throw new ServiceException("预约订单流程记录失败，请联系管理员！"); - } //异步发送信息 stationMessagePushService.refusalOrdersOperationsPush(appointmentReceivingOrder); return AjaxResult.success(); @@ -227,19 +209,6 @@ public class NursePersonAppLoginServiceImpl implements INursePersonAppLoginServi if (stationPersonRevenue <= 0) { throw new ServiceException("新增护理员订单佣金收益记录失败，请联系管理员！"); } - //新增预约订单流程记录信息表 - AppointmentOrderProcessRecord appointment = new AppointmentOrderProcessRecord(); - appointment.setOperatePersonId(Objects.isNull(orderDetails.getNurseStationPersonId()) ? null : orderDetails.getNurseStationPersonId()); - appointment.setAppointmentOrderId(Objects.isNull(orderDetails.getId()) ? null : orderDetails.getId()); - appointment.setAppointmentOrderNo(StringUtils.isBlank(orderDetails.getOrderNo()) ? "" : orderDetails.getOrderNo()); - appointment.setOperateTime(LocalDateTime.now()); - appointment.setOperateType(OrderProcessOperateTypeEnum.FINISH_ORDER.getInfo()); - appointment.setOperateDetails("预约订单任务完成操作"); - appointment.setCreateTime(LocalDateTime.now()); - int count = appointmentOrderProcessRecordMapper.insertAppointmentOrderProcessRecord(appointment); - if (count <= 0) { - throw new ServiceException("预约订单流程记录失败，请联系管理员！"); - } //更新护理员账户总金额 Long nurseStationPersonId = Objects.isNull(orderDetails.getNurseStationPersonId()) ? 0 : orderDetails.getNurseStationPersonId(); BigDecimal orderCommissionAmount = Objects.isNull(orderDetails.getOrderCommissionAmount()) ? BigDecimal.ZERO : orderDetails.getOrderCommissionAmount(); diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.java deleted file mode 100644 index e2930c4..0000000 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.xinelu.manage.mapper.appointmentorderprocessrecord; - - - -import com.xinelu.manage.domain.appointmentorderprocessrecord.AppointmentOrderProcessRecord; - -import java.util.List; - - -/** - * 预约订单流程记录信息Mapper接口 - * - * @author xinyilu - * @date 2023-03-29 - */ -public interface AppointmentOrderProcessRecordMapper { - /** - * 查询预约订单流程记录信息 - * - * @param id 预约订单流程记录信息主键 - * @return 预约订单流程记录信息 - */ - AppointmentOrderProcessRecord selectAppointmentOrderProcessRecordById(Long id); - - /** - * 查询预约订单流程记录信息列表 - * - * @param appointmentOrderProcessRecord 预约订单流程记录信息 - * @return 预约订单流程记录信息集合 - */ - List selectAppointmentOrderProcessRecordList(AppointmentOrderProcessRecord appointmentOrderProcessRecord); - - /** - * 新增预约订单流程记录信息 - * - * @param appointmentOrderProcessRecord 预约订单流程记录信息 - * @return 结果 - */ - int insertAppointmentOrderProcessRecord(AppointmentOrderProcessRecord appointmentOrderProcessRecord); - - /** - * 修改预约订单流程记录信息 - * - * @param appointmentOrderProcessRecord 预约订单流程记录信息 - * @return 结果 - */ - int updateAppointmentOrderProcessRecord(AppointmentOrderProcessRecord appointmentOrderProcessRecord); - - /** - * 删除预约订单流程记录信息 - * - * @param id 预约订单流程记录信息主键 - * @return 结果 - */ - int deleteAppointmentOrderProcessRecordById(Long id); - - /** - * 批量删除预约订单流程记录信息 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - int deleteAppointmentOrderProcessRecordByIds(Long[] ids); - - /** - * 批量新增预约订单流程记录信息 - * - * @param appointmentOrderProcessRecordList 预约订单流程记录信息 - * @return 结果 - */ - int insertAppointmentOrderProcessRecordList(List appointmentOrderProcessRecordList); -} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/appointmentorder/impl/AppointmentOrderServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/appointmentorder/impl/AppointmentOrderServiceImpl.java index 44dc677..e019e27 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/appointmentorder/impl/AppointmentOrderServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/appointmentorder/impl/AppointmentOrderServiceImpl.java @@ -3,18 +3,15 @@ package com.xinelu.manage.service.appointmentorder.impl; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.AppointmentOrderTypeEnum; -import com.xinelu.common.enums.OrderProcessOperateTypeEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.manage.domain.appointmentorder.AppointmentOrder; import com.xinelu.manage.domain.appointmentorderconsumable.AppointmentOrderConsumable; import com.xinelu.manage.domain.appointmentorderdetails.AppointmentOrderDetails; -import com.xinelu.manage.domain.appointmentorderprocessrecord.AppointmentOrderProcessRecord; import com.xinelu.manage.mapper.appointmentorder.AppointmentOrderMapper; import com.xinelu.manage.mapper.appointmentorderconsumable.AppointmentOrderConsumableMapper; import com.xinelu.manage.mapper.appointmentorderdetails.AppointmentOrderDetailsMapper; -import com.xinelu.manage.mapper.appointmentorderprocessrecord.AppointmentOrderProcessRecordMapper; import com.xinelu.manage.service.appointmentorder.IAppointmentOrderService; import com.xinelu.manage.service.stationmessagepush.StationMessagePushService; import com.xinelu.manage.vo.appointmentorder.AppointmentOrderVO; @@ -47,8 +44,6 @@ public class AppointmentOrderServiceImpl implements IAppointmentOrderService { private AppointmentOrderConsumableMapper appointmentOrderConsumableMapper; @Resource private StationMessagePushService stationMessagePushService; - @Resource - private AppointmentOrderProcessRecordMapper appointmentOrderProcessRecordMapper; /** * 查询预约订单信息 @@ -183,19 +178,6 @@ public class AppointmentOrderServiceImpl implements IAppointmentOrderService { if (updateAppointmentOrderStatus <= 0) { throw new ServiceException("派单失败,请联系管理员！"); } - //记录订单流程信息 - AppointmentOrderProcessRecord appointmentOrderProcessRecord = new AppointmentOrderProcessRecord(); - appointmentOrderProcessRecord.setAppointmentOrderNo(appointmentOrder.getOrderNo()); - appointmentOrderProcessRecord.setCreateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperatePersonId(appointmentOrder.getNurseStationPersonId()); - appointmentOrderProcessRecord.setOperateTime(LocalDateTime.now()); - appointmentOrderProcessRecord.setOperateType(OrderProcessOperateTypeEnum.DISPATCH_ORDER.getInfo()); - appointmentOrderProcessRecord.setAppointmentOrderId(appointmentOrders.getId()); - appointmentOrderProcessRecord.setOperateDetails("派单"); - int count = appointmentOrderProcessRecordMapper.insertAppointmentOrderProcessRecord(appointmentOrderProcessRecord); - if (count <= 0) { - throw new ServiceException("增加预约订单流程记录失败，请联系管理员！"); - } stationMessagePushService.waitReceiveMessagePush(appointmentOrder); return AjaxResult.success(); } diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.xml deleted file mode 100644 index 541d12e..0000000 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/appointmentorderprocessrecord/AppointmentOrderProcessRecordMapper.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, - operate_person_id, - appointment_order_id, - appointment_order_no, - operate_time, - operate_type, - operate_details, - create_by, - create_time, - update_by, - update_time - from appointment_order_process_record - - - - - - - - insert into appointment_order_process_record - - operate_person_id, - - appointment_order_id, - - appointment_order_no, - - operate_time, - - operate_type, - - operate_details, - - create_by, - - create_time, - - update_by, - - update_time, - - - - #{operatePersonId}, - - #{appointmentOrderId}, - - #{appointmentOrderNo}, - - #{operateTime}, - - #{operateType}, - - #{operateDetails}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - - - - - - update appointment_order_process_record - - operate_person_id = - #{operatePersonId}, - - appointment_order_id = - #{appointmentOrderId}, - - appointment_order_no = - #{appointmentOrderNo}, - - operate_time = - #{operateTime}, - - operate_type = - #{operateType}, - - operate_details = - #{operateDetails}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - - - where id = #{id} - - - - delete - from appointment_order_process_record - where id = #{id} - - - - delete from appointment_order_process_record where id in - - #{id} - - - - - insert into appointment_order_process_record( - appointment_order_id, - appointment_order_no, - operate_time, - operate_type, - operate_details, - create_time - ) values - - ( - #{appointmentOrderProcessRecordList.appointmentOrderId}, - #{appointmentOrderProcessRecordList.appointmentOrderNo}, - #{appointmentOrderProcessRecordList.operateTime}, - #{appointmentOrderProcessRecordList.operateType}, - #{appointmentOrderProcessRecordList.operateDetails}, - #{appointmentOrderProcessRecordList.createTime} - ) - - - diff --git a/xinelu-nurse-manage/src/main/resources/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml similarity index 100% rename from xinelu-nurse-manage/src/main/resources/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml rename to xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluatepictureinfo/OrderEvaluatePictureInfoMapper.xml