图集

olive-console/src/main/java/com/zrqx/olive/personnel/request/CompleteQueryForm.java

+package com.zrqx.olive.personnel.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 总完成工时预计统计分页form
+ * @Title: CompleteQueryForm.java
+ * @Package com.zrqx.olive.personnel.request
+ * @Description: TODO
+ * @author 任建彩
+ * @date 2021年9月17日
+ */
+@Data
+public class CompleteQueryForm {
+	
+	@ApiModelProperty(value = "人员类型 1在职 2离职" )
+	private String  isType;
+	@ApiModelProperty(value = "成员名称")
+	private String userName;
+	@ApiModelProperty(value = "开始日期")
+	private String startTime;
+
+	@ApiModelProperty(value = "结束日期")
+	private String endTime;
+	
+}

olive-console/src/main/java/com/zrqx/olive/personnel/request/StatisticsTaskTimeForm.java

+package com.zrqx.olive.personnel.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StatisticsTaskTimeForm {
+
+	@ApiModelProperty("人员名称")
+	private String account;
+	@ApiModelProperty("开始时间")
+	private String startTime;
+	@ApiModelProperty("结束时间")
+	private String endTime;
+	
+	/** 新增 */
+	@ApiModelProperty("项目id")
+	private Integer id;
+}

olive-console/src/main/java/com/zrqx/olive/personnel/vo/StatisticsTaskTime.java

+package com.zrqx.olive.personnel.vo;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "StatisticsTaskTime对象", description = "人员管理表")
+public class StatisticsTaskTime {
+	
+	
+	@ApiModelProperty("id，新增时不需要填写")
+	private Integer id;
+	
+	
+	@ApiModelProperty(value = "用户名")
+	private String realName;
+	
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+
+	@ApiModelProperty("最终工时")
+	private BigDecimal totalTime;
+	
+	@ApiModelProperty("工时基准量")
+	private Integer taskLevel;
+}

olive-console/src/main/java/com/zrqx/statistics/entity/StatisticsTask.java

+package com.zrqx.statistics.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StatisticsTask {
+	
+	@ApiModelProperty("id，新增时不需要填写")
+    private Integer id;
+	@ApiModelProperty(value = "项目名")
+	private String project;
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+    @ApiModelProperty(value = "任务描述")
+    private String taskDescription;
+    @ApiModelProperty(value = "预计工时")
+	private BigDecimal workingHours;
+	@ApiModelProperty(value = "完成时间")
+    private String completeTime;
+	@ApiModelProperty(value = "成员")
+	private String finishedBy;
+	
+	
+}