完成已报名模块、且修正招工中间表类型

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

@@ -0,0 +1,21 @@
+package com.ruoyi.wgz.bo.req;
+
+import com.ruoyi.common.bo.PageReq;
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("已报名项目请求对象")
+public class WgzAppRegisteredProjectReq extends PageReq {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ruoyi.wgz.bo.req;
+
+import com.ruoyi.common.bo.PageReq;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("项目进行中请求对象")
+public class WgzAppUnderwayReq extends PageReq {
+}

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

@@ -0,0 +1,95 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.ruoyi.wgz.bo.rests.WgzAppCancelRegistrationProjectDetailsTwo;
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("已报名·项目详情返回对象")
+public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+
+	//==============
+	@ApiModelProperty("封面图（多个逗号分隔）")
+	private String coverPlan;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("招工名称")
+	private String recruitName;
+
+	@ApiModelProperty("招工金额")
+	private BigDecimal recruitAmount;
+
+	@ApiModelProperty("招工数量")
+	private Integer recruitStaffNum;
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("任务名称")
+	private String taskName;
+
+	@ApiModelProperty("任务地址")
+	private String taskAddress;
+
+	@ApiModelProperty("招工描述")
+	private String subDescribe;
+
+	@ApiModelProperty("招工开始时间")
+	private String recruitBeginTime;
+
+	@ApiModelProperty("联系人")
+	private String recruitContactPerson;
+
+	@ApiModelProperty("联系电话")
+	private String recruitContactPhone;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+	@ApiModelProperty("招工要求")
+	private String recruitRequirement;
+
+	@ApiModelProperty("已报名数量")
+	private Integer numberOfRegistered;
+
+	@ApiModelProperty("已报名务工者")
+	private List<WgzAppCancelRegistrationProjectDetailsTwo> userList;
+
+	//---------
+	//---------
+	//---------
+	@ApiModelProperty("上班时间")
+	private LocalTime beginWorkTime;
+
+	@ApiModelProperty("下班时间")
+	private LocalTime endWorkTime;
+
+	@ApiModelProperty("标段ID")
+	private Long sectionId;
+
+	@ApiModelProperty("分包ID")
+	private Long subId;
+
+	@ApiModelProperty("招工地址")
+	private String recruitAddress;
+}

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

@@ -0,0 +1,17 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.ruoyi.common.bo.PageReq;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("项目进行中返回对象")
+public class WgzAppDailyRecordRes implements Serializable {
+
+}

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

@@ -89,32 +89,4 @@ public class WgzAppProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工地址")
 	private String recruitAddress;
 
-
-
-
-
-
-
-
-	@ApiModelProperty("创建者ID")
-	private Long userId;
-
-	@ApiModelProperty("删除标志（0代表存在 2代表删除）")
-	private String delFlag;
-
-	/**
-	 * 更新者
-	 */
-	@Excel(name = "更新者")
-	@ApiModelProperty("更新者")
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty("更新时间")
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private LocalDateTime updateTime;
 }

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

@@ -0,0 +1,60 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("已报名项目返回对象")
+public class WgzAppRegisteredProjectRes implements Serializable {
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+
+	@ApiModelProperty("招工名称")
+	private String recruitName;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("封面图（多个逗号分隔）")
+	private String coverPlan;
+
+	@ApiModelProperty("招工数量")
+	private Integer recruitStaffNum;
+
+	@ApiModelProperty("招工金额")
+	private BigDecimal recruitAmount;
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("任务名称")
+	private String taskName;
+
+	@ApiModelProperty("任务地址")
+	private String taskAddress;
+
+	@ApiModelProperty("招工要求")
+	private String recruitRequirement;
+
+	@ApiModelProperty("已报名数量")
+	private Integer numberOfRegistered;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppCancelRegistrationProjectDetailsTwo.java

@@ -0,0 +1,36 @@
+package com.ruoyi.wgz.bo.rests;
+
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("已报名·项目详情返回对象")
+public class WgzAppCancelRegistrationProjectDetailsTwo implements Serializable {
+
+	@ApiModelProperty("务工者ID")
+	private Long userId;
+
+	@ApiModelProperty("务工者名称")
+	private String username;
+
+	@ApiModelProperty("务工者头像")
+	private String avatar_name;
+
+	@ApiModelProperty("务工者评分")
+	private Double score;
+
+
+
+
+}