diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java index 9a82fc9872..5eae36c969 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java @@ -41,7 +41,7 @@ public class IcServiceFeedbackV2AddFormDTO implements Serializable { */ private String satisfaction; /** - * 服务状态[服务状态,cancel:取消,closed:已关闭,underway:进行中] + * 服务状态[in_service服务中;completed:已完成;cancel:取消] */ private String serviceStatus; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java index 615e9b7a20..fff02eb997 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; import java.util.List; @@ -48,7 +49,7 @@ public class IcServiceRecordV2AddEditFormDTO implements Serializable { /** * 政策依据Id */ - private Integer policyId; + private String policyId; /** * 经办人姓名 */ @@ -62,13 +63,13 @@ public class IcServiceRecordV2AddEditFormDTO implements Serializable { */ @NotNull(message = "起始服务时间不能为空", groups = {AddGroup.class}) @JsonFormat(pattern = "yyyy-MM-dd") - private String serviceTimeStart; + private Date serviceTimeStart; /** * 终止服务时间 */ @NotNull(message = "终止服务时间不能为空", groups = {AddGroup.class}) @JsonFormat(pattern = "yyyy-MM-dd") - private String serviceTimeEnd; + private Date serviceTimeEnd; /** * 备注信息 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java index 01cc032b9b..e647c1ae7a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java @@ -45,9 +45,9 @@ public class IcServiceFeedbackV2Controller { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcServiceFeedbackV2AddFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); + ValidatorUtils.validateEntity(formDTO, AddGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); icServiceFeedbackV2Service.save(formDTO); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index 8698c3d08c..f451fafc81 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -48,9 +48,9 @@ public class IcServiceRecordV2Controller { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcServiceRecordV2AddEditFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); + ValidatorUtils.validateEntity(formDTO, AddGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); icServiceRecordV2Service.save(formDTO); @@ -58,7 +58,7 @@ public class IcServiceRecordV2Controller { } @NoRepeatSubmit - @PostMapping("update") + @PostMapping("edit") public Result update(@RequestBody IcServiceRecordV2AddEditFormDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java index bf5997a1b8..62f1d9a433 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java @@ -125,6 +125,7 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl