diff --git a/src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java b/src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java index 805ea1d..ea8b543 100644 --- a/src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java +++ b/src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java @@ -37,8 +37,8 @@ public class MySummaryQueryDto extends Page{ private String endTime; @NotNull(message = ValidationMsg.NOTNULL) - @DecimalMax(value = "2",message = ValidationMsg.DECIMALMAX+" 只能为 0我发起的 1抄送我的 2我审批的") - @DecimalMin(value = "0",message = ValidationMsg.DECIMALMIN+" 只能为 0我发起的 1抄送我的 2我审批的") + @DecimalMax(value = "3",message = ValidationMsg.DECIMALMAX+" 只能为 0我发起的 1抄送我的 2我审批的 3全部") + @DecimalMin(value = "0",message = ValidationMsg.DECIMALMIN+" 只能为 0我发起的 1抄送我的 2我审批的 3全部") @ApiModelProperty(value = "0我发起的 1抄送我的 2我审批的", example = "0") private Integer type; diff --git a/src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml b/src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml index 6e47019..486fb7a 100644 --- a/src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml +++ b/src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml @@ -150,8 +150,13 @@ spmk_executor WHERE emp_num = #{param.empNum}) - - and type = #{param.type} + + <if test="param.type == 3"> + and type in (0,1,2) + </if> + <if test="param.type != 3"> + and type = #{param.type} + </if> ) </if>