huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!73 工作流程发起以及审批异常，NotEmpty校验Long类型异常

Browse Source 
Merge pull request !73 from zhuqi7/master
This commit is contained in:
芋道源码 2022-02-09 16:03:23 +00:00 committed by Gitee
commit cd42846bec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java
View File

@ -21,7 +21,7 @@ public class BpmMessageSendWhenTaskCreatedReqDTO {
*/ */
@NotEmpty(message = "流程实例的名字不能为空") @NotEmpty(message = "流程实例的名字不能为空")
private String processInstanceName; private String processInstanceName;
@NotEmpty(message = "发起人的用户编号") @NotNull(message = "发起人的用户编号")
private Long startUserId; private Long startUserId;
@NotEmpty(message = "发起人的昵称") @NotEmpty(message = "发起人的昵称")
private String startUserNickname; private String startUserNickname;

4
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
View File

@ -73,7 +73,8 @@ public interface BpmTaskConvert {
@Mappings({ @Mappings({
@Mapping(source = "id", target = "taskId"), @Mapping(source = "id", target = "taskId"),
@Mapping(source = "assignee", target = "assigneeUserId"), @Mapping(source = "assignee", target = "assigneeUserId"),
@Mapping(source = "createdDate", target = "createTime") @Mapping(source = "createdDate", target = "createTime"),
@Mapping(target = "id", ignore = true)
}) })
BpmTaskExtDO convert(org.activiti.api.task.model.Task bean); BpmTaskExtDO convert(org.activiti.api.task.model.Task bean);
@ -104,6 +105,7 @@ public interface BpmTaskConvert {
BpmTaskRespVO convert3(HistoricTaskInstance bean); BpmTaskRespVO convert3(HistoricTaskInstance bean);
BpmTaskRespVO.User convert3(AdminUserRespDTO bean); BpmTaskRespVO.User convert3(AdminUserRespDTO bean);
@Mapping(target = "id", ignore = true)
void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to); void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to);
@Mappings({ @Mappings({

5
yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@ApiModel("用户 APP - 退款订单 Req VO") @ApiModel("用户 APP - 退款订单 Req VO")
@Data @Data
@ -15,11 +16,11 @@ import javax.validation.constraints.NotEmpty;
public class AppPayRefundReqVO { public class AppPayRefundReqVO {
@ApiModelProperty(value = "支付订单编号自增", required = true, example = "10") @ApiModelProperty(value = "支付订单编号自增", required = true, example = "10")
@NotEmpty(message = "支付订单编号自增") @NotNull(message = "支付订单编号自增")
private Long payOrderId; private Long payOrderId;
@ApiModelProperty(value = "退款金额", required = true, example = "1") @ApiModelProperty(value = "退款金额", required = true, example = "1")
@NotEmpty(message = "退款金额") @NotNull(message = "退款金额")
private Long amount; private Long amount;
@ApiModelProperty(value = "退款原因", required = true, example = "不喜欢") @ApiModelProperty(value = "退款原因", required = true, example = "不喜欢")