diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java new file mode 100644 index 0000000000..896d3b1cb3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/11/26 5:19 下午 + * @DESC + */ +@Data +public class CancelAppointmentFormDTO implements Serializable { + + private static final long serialVersionUID = 8646430374802086292L; + + public interface CancelAppointmentForm{} + + @NotBlank(message = "recordId不能为空",groups = CancelAppointmentForm.class) + private String recordId; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java index ae76c66052..84813a4f47 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java @@ -40,6 +40,8 @@ public class AppointmentRecordResultDTO implements Serializable { */ private String remark; + private String recordId; + /** * 预约时间 */ @@ -55,5 +57,6 @@ public class AppointmentRecordResultDTO implements Serializable { this.appointmentPhone = ""; this.remark = ""; this.appointmentTime = new ArrayList<>(); + this.recordId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java index 2f015ec216..02c1175d07 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java @@ -190,4 +190,17 @@ public class IcPartyServiceCenterController { return new Result>().ok(icPartyServiceCenterService.appointmentRecord(formDTO)); } + /** + * @Description 取消预约 + * @param formDTO + * @author zxc + * @date 2021/11/26 5:21 下午 + */ + @PostMapping("cancelappointment") + public Result cancelAppointment(@RequestBody CancelAppointmentFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,CancelAppointmentFormDTO.CancelAppointmentForm.class); + icPartyServiceCenterService.cancelAppointment(formDTO); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java index 586bf7dda6..9bbfcaf44e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java @@ -158,4 +158,12 @@ public interface IcPartyServiceCenterService extends BaseService appointmentRecord(AppointmentRecordFormDTO formDTO); + /** + * @Description 取消预约 + * @param formDTO + * @author zxc + * @date 2021/11/26 5:21 下午 + */ + void cancelAppointment(CancelAppointmentFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index 6fd12822f0..d884a47e99 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -394,6 +394,17 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl getTimeList(String start,String end,Integer interval){ List result = new ArrayList<>(); List intervalTimeList = getIntervalTimeList(start, end, interval); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml index 0cdf818653..79c21f6c04 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml @@ -10,7 +10,8 @@ ar.APPOINTMENT_PHONE, ar.REMARK, ar.TIME_ID, - cm.MATTER_NAME + cm.MATTER_NAME, + ar.ID AS recordId FROM ic_matter_appointment_record ar LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0) WHERE ar.DEL_FLAG = 0