考勤统计与工种

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java

@@ -132,6 +132,9 @@ public class BgtProjectRecruit implements Serializable {
 	@ApiModelProperty("下班时间")
 	private LocalTime endWorkTime;
 
+	@ApiModelProperty("工种")
+	private String typeOfWork;
+
 	@ApiModelProperty("创建者ID")
 	private Long userId;
 

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruitApply.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -45,10 +46,10 @@ public class BgtProjectRecruitApply implements Serializable {
 	private String status;
 
 	@ApiModelProperty("进场时间")
-	private String entryTime;
+	private LocalDate entryTime;
 
 	@ApiModelProperty("离场时间")
-	private String leaveTime;
+	private LocalDate leaveTime;
 
     /** 删除标志（0代表存在 2代表删除） */
     @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtAttendanceDTO.java

@@ -0,0 +1,23 @@
+package com.ruoyi.bgt.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头总体考勤查询对象")
+public class BgtAttendanceDTO {
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("日期")
+	private String date;
+
+	@ApiModelProperty("日期类型（1日 2月）")
+	private String dateType;
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectRecruitApplyConsentDTO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -25,7 +26,7 @@ public class BgtProjectRecruitApplyConsentDTO implements Serializable {
     private Long id;
 
 	@ApiModelProperty("进场时间")
-	private String entryTime;
+	private LocalDate entryTime;
 
 	@ApiModelProperty("入场材料")
 	List<AnnexDTO> entryMaterials;

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendanceCountVO.java

@@ -0,0 +1,36 @@
+package com.ruoyi.bgt.domain.vo;
+
+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.LocalDate;
+
+/**
+ * 考勤打卡对象 wgz_attendance
+ *
+ * @author ruoyi
+ * @date 2025-02-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("包工头考勤打卡统计对象")
+public class BgtAttendanceCountVO implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+	@ApiModelProperty("到岗人数")
+	private Integer reportToDutyNum;
+
+	@ApiModelProperty("总人数")
+	private Integer totalNum;
+
+	@ApiModelProperty("日期")
+	private LocalDate date;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendanceVO.java

@@ -0,0 +1,45 @@
+package com.ruoyi.bgt.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头总体考勤视图对象")
+public class BgtAttendanceVO {
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("任务名")
+	private String taskName;
+
+	@ApiModelProperty("到岗人数")
+	private Integer reportToDutyNum;
+
+	@ApiModelProperty("总人数")
+	private Integer totalNum;
+
+	@ApiModelProperty("缺勤人数")
+	private Integer absenceDutyNum;
+
+	@ApiModelProperty("请假人数")
+	private Integer leaveNum;
+
+	@ApiModelProperty("迟到人数")
+	private Integer lateNum;
+
+	@ApiModelProperty("考勤列表")
+	List<BgtAttendanceCountVO> countVOS;
+
+	//务工者列表
+	@ApiModelProperty("申请者列表")
+	List<BgtProjectRecruitApplyVO> applyList;
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitDetailVO.java

@@ -75,6 +75,9 @@ public class BgtProjectRecruitDetailVO implements Serializable {
     @ApiModelProperty("招工要求")
     private String recruitRequirement;
 
+	@ApiModelProperty("工种")
+	private String typeOfWork;
+
 	@ApiModelProperty("创建者ID")
 	private Long userId;
 

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitVO.java

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