新增消息列表及其它细节修改

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

@@ -18,9 +18,10 @@ public class WgzAppGetMessageListReq extends PageReq {
 	@Hidden
 	private Long recipientId;
 
-	@ApiModelProperty("大类型（字典）")
-	private String messageLargeType;
+	@ApiModelProperty("0 全部 1报名 2工资 3其他")
+	@Hidden
+	private String largeType;
 
-	@ApiModelProperty("小类型（字典,大类型为【其它】才复制给它）")
-	private String messageSmallType;
+	@ApiModelProperty("largeType为3填写 (0补卡 1系统)")
+	private String smallType;
 }

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

@@ -6,10 +6,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel("首页-招工列表请求对象")
-public class WgzAppJobListingReq extends BaseEntity {
+public class WgzAppJobListingReq implements Serializable {
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
 	private Integer pageSize;

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

@@ -1,15 +1,68 @@
 package com.ruoyi.wgz.bo.res;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
 @ApiModel("获取消息列表返回参数")
 public class WgzAppGetMessageListRes implements Serializable {
+	//消息主表
+	@ApiModelProperty("消息主键自增ID")
+	private Long id;
+
+	@ApiModelProperty("主标题")
+	private String headline;
+
+	@ApiModelProperty("副标题")
+	private String subheading;
+
+	@ApiModelProperty("表ID")
+	private Long tableId;
+
+	@ApiModelProperty("表名")
+	private String tableName;
+
+	@ApiModelProperty("读状态（0未读 1已读）")
+	private String readStatus;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	//报名
+	@ApiModelProperty("报名·招工主键ID")
+	private Long recruitId;
+
+	@ApiModelProperty("报名·招工标题")
+	private String recruitName;
+
+	//工资
+	@ApiModelProperty("工资·结算主键ID")
+	private Long jsId;
+
+	@ApiModelProperty("工资·结算招工标题")
+	private String jsName;
+
+	//其它·补卡
+	@ApiModelProperty("其它·补卡·补卡ID")
+	private Long otherId;
+
+	@ApiModelProperty("其它·补卡·补卡时间")
+	private Long otherFillingTime;
+
+	@ApiModelProperty("其它·补卡·补卡理由")
+	private Long otherReason;
+
+	@ApiModelProperty("其它·补卡·申请人")
+	private Long otherApplicant;
+
+	@ApiModelProperty("其它·补卡·申请时间")
+	private Long otherApplicationDate;
 }

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

@@ -43,6 +43,13 @@ public class WgzAppJobListingRes implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private LocalDateTime createTime;
 
+	@ApiModelProperty("工种")
+	private String typeOfWork;
+
 	@ApiModelProperty("申请者列表")
 	List<BgtProjectRecruitApplyVO> applylist;
+
+
+
+
 }