Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!326

src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java

@@ -37,8 +37,8 @@ public class MySummaryQueryDto extends Page{
 	private String endTime;
 	private String endTime;
 	
 	
 	@NotNull(message = ValidationMsg.NOTNULL)
 	@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")
 	@ApiModelProperty(value = "0我发起的 1抄送我的 2我审批的", example = "0")
 	private Integer type;
 	private Integer type;
 	
 	

src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml

@@ -151,7 +151,12 @@
 				 WHERE 
 				 WHERE 
 				 	emp_num = #{param.empNum}) 
 				 	emp_num = #{param.empNum}) 
 				 
 				 
+				 <if test="param.type == 3">
+				 	and type in (0,1,2)
+				 </if>
+				 <if test="param.type != 3">
 				 	and type = #{param.type}
 				 	and type = #{param.type}
+				 </if>
 			) 
 			) 
 			
 			
 			</if>
 			</if>