修改消息小类型的全部查询

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java

@@ -17,9 +17,9 @@ public class WgzAppGetMessageListReq extends PageReq {
 	@ApiModelProperty(value = "接收人",hidden = true)
 	private Long recipientId;
 
-	@ApiModelProperty("0 全部 1报名 2工资 3其他")
+	@ApiModelProperty("字典（message_large_type）")
 	private String largeType;
 
-	@ApiModelProperty("largeType为3填写 (0补卡 1系统)")
+	@ApiModelProperty("字典（message_small_type）largeType为3填写")
 	private String smallType;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppJobListingReq.java

@@ -7,9 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
 @ApiModel("首页-招工列表请求对象")
 public class WgzAppJobListingReq extends PageReq {
+	@ApiModelProperty(value = "唯一标识",hidden = true)
+	private Long userId;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppSubmitTheClockReq.java

@@ -19,9 +19,10 @@ import java.io.Serializable;
 public class WgzAppSubmitTheClockReq implements Serializable {
 	@ApiModelProperty("上下班打卡标识（0上班 1下班）")
 	@NotBlank(message = "上下班打卡标识不能为空")
-	@Pattern(regexp = "[01]", message = "上下班打卡标识只能为 0 或 1")
+	@Pattern(regexp = "^[01]$", message = "上下班打卡标识只能是0或1")
 	private String type;
 
+
 	@ApiModelProperty("打卡位置")
 	@NotBlank(message = "打卡位置不能为空")
 	private String pnchOsition;

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppGetMessageListRes.java

@@ -33,6 +33,12 @@ public class WgzAppGetMessageListRes implements Serializable {
 	@ApiModelProperty("读状态（0未读 1已读）")
 	private String readStatus;
 
+	@ApiModelProperty("大类型")
+	private String messageLargeType;
+
+	@ApiModelProperty("小类型")
+	private String messageSmallType;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 
@@ -55,14 +61,33 @@ public class WgzAppGetMessageListRes implements Serializable {
 	private Long otherId;
 
 	@ApiModelProperty("其它·补卡·补卡时间")
-	private Long otherFillingTime;
+	private LocalDateTime otherFillingTime;
 
 	@ApiModelProperty("其它·补卡·补卡理由")
-	private Long otherReason;
+	private String otherReason;
 
 	@ApiModelProperty("其它·补卡·申请人")
-	private Long otherApplicant;
+	private String otherApplicant;
 
 	@ApiModelProperty("其它·补卡·申请时间")
-	private Long otherApplicationDate;
+	private LocalDateTime otherApplicationDate;
+
+	//其它·请假
+	@ApiModelProperty("其它·请假·请假ID")
+	private Long qjID;
+
+	@ApiModelProperty("其它·请假·请假起始时间")
+	private LocalDateTime qjStartingTime;
+
+	@ApiModelProperty("其它·请假·请假结算时间")
+	private LocalDateTime qjEndTime;
+
+	@ApiModelProperty("其它·请假·理由")
+	private String qjReason;
+
+	@ApiModelProperty("其它·请假·请假人")
+	private String qjName;
+
+	@ApiModelProperty("其它·请假·请假时间")
+	private LocalDateTime qjLeaveTime;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppMessageTypeStatisticsRes.java

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @NoArgsConstructor
@@ -17,6 +18,6 @@ import java.util.List;
 @ApiModel("消息类型统计返回参数")
 public class WgzAppMessageTypeStatisticsRes implements Serializable {
 	@ApiModelProperty("消息类型")
-	private List<WgzAppMessageTypeStatisticsTwo> list;
+	private Map<String,Integer> mp;
 
 }