总包方

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProgressListDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 @Accessors(chain = true)
 @ApiModel("总包方任务进度列表查询对象")
@@ -16,6 +18,7 @@ public class ZbfProgressListDTO {
 	@ApiModelProperty("当前页数")
 	private Integer pageNum;
 
-	@ApiModelProperty("项目ID")
-	private Long projectId;
+	@ApiModelProperty("项目分包Id")
+	@NotNull(message = "项目分包Id不能为空")
+	private Long subId;
 }

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfSubBgtListDTO.java

@@ -0,0 +1,21 @@
+package com.ruoyi.zbf.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("总包方分包详情班组长列表查询条件")
+public class ZbfSubBgtListDTO {
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("分包ID")
+	@NotNull(message = "分包ID不能为空")
+	private Long subId;
+}

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfSubSwitchListDTO.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel("分包商项目分包切换列表查询条件")
+@ApiModel("总包方项目分包切换列表查询条件")
 public class ZbfSubSwitchListDTO {
 
 	@ApiModelProperty("分页大小")

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfWageApplicationListDTO.java

@@ -0,0 +1,35 @@
+package com.ruoyi.zbf.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分包商工资申请分页查询对象 fbs_wage_application
+ *
+ * @author ruoyi
+ * @date 2025-03-26
+ */
+
+@Data
+@ApiModel("总包方工资审核查询对象")
+public class ZbfWageApplicationListDTO {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("类型：0-申请中 1-已结算")
+	private Integer type;
+
+	@ApiModelProperty("项目Id")
+	private Long projectId;
+
+	@ApiModelProperty("项目分包Id")
+	private Long subId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfWageAuditDTO.java

@@ -0,0 +1,28 @@
+package com.ruoyi.zbf.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 包工头工资申请分页查询对象 bgt_wage_application
+ *
+ * @author ruoyi
+ * @date 2025-02-20
+ */
+
+@Data
+@ApiModel("App包工头工资申请分页查询对象")
+public class ZbfWageAuditDTO {
+
+	@ApiModelProperty("主键ID")
+	@NotNull(message = "主键ID不能为空")
+	private Long id;
+
+	@ApiModelProperty("审核状态（1审核中 2已审核 3未通过）")
+	private String auditStatus;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZfbUserInfoUpdateDTO.java

@@ -0,0 +1,16 @@
+package com.ruoyi.zbf.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel("分包商修改用户信息")
+public class ZfbUserInfoUpdateDTO {
+
+	@ApiModelProperty("头像")
+	@NotBlank(message = "头像不能为空")
+	private String avatarName;
+}

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProgressListVO.java

@@ -16,6 +16,6 @@ public class ZbfProgressListVO {
 	@ApiModelProperty("进度")
 	private Integer progress;
 
-	@ApiModelProperty("项目名称")
+	@ApiModelProperty("任务名称")
 	private String taskName;
 }

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProgressVO.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @Accessors(chain = true)
 @ApiModel("App总包方项目详情-任务进度视图对象")
-public class ZbfProjectDetailProgressVO {
+public class ZbfProgressVO {
 
 	@ApiModelProperty("总进度")
 	private Integer totalProgress = 0;

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfSubBgtListVO.java

@@ -0,0 +1,29 @@
+package com.ruoyi.zbf.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("总包方分包详情班组长列表视图对象")
+public class ZbfSubBgtListVO {
+
+	@ApiModelProperty("主键ID")
+	private String id;
+
+	@ApiModelProperty("唯一标识")
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
+	private Long userId;
+
+	@ApiModelProperty("姓名")
+	private String username;
+
+	@ApiModelProperty("联系电话")
+	private String phone;
+
+	@ApiModelProperty("头像地址")
+	private String avatarName;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfSubPersonCountVO.java

@@ -0,0 +1,23 @@
+package com.ruoyi.zbf.domain.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("总包方分包用工数量统计")
+public class ZbfSubPersonCountVO {
+
+	@ApiModelProperty("人员总数")
+	private Integer totalCount;
+
+	@ApiModelProperty("进场总数")
+	private Integer entryCount;
+
+	@ApiModelProperty("退场总数")
+	private Integer leaveCount;
+
+
+
+}