zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-04-22 11:08:08 +08:00
parent 90c9c3e5d6
commit d99eaafd4c
17 changed files with 232 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfAttendanceDTO.java Normal file
View File

@ -0,0 +1,31 @@
package com.ruoyi.zbf.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("App总包方总体考勤查询对象")
public class ZbfAttendanceDTO {
@ApiModelProperty("项目ID")
@NotNull(message = "项目ID不能为空")
private Long projectId;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("日期")
private LocalDate date;
@ApiModelProperty("日期类型（1日 2月）")
private String dateType;
}

2
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectListDTO.java
View File

@ -26,7 +26,7 @@ public class ZbfProjectListDTO {
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
@ApiModelProperty("项目状态(1-已开工和未开工，2已竣工)")
private String projectStatus;
}

6
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectSubApplyListDTO.java
View File

@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
@ApiModel("分包商项目分包申请列表查询条件")
public class ZbfProjectSubApplyListDTO {
@ -17,9 +15,11 @@ public class ZbfProjectSubApplyListDTO {
private Integer pageNum;
@ApiModelProperty("分包ID")
@NotNull(message = "分包ID不能为空")
private Long subId;
@ApiModelProperty("分包申请ID")
private Long subApplyId;
@ApiModelProperty("名字")
private String username;
}

44
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfAttendanceVO.java Normal file
View File

@ -0,0 +1,44 @@
package com.ruoyi.zbf.domain.vo;
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 ZbfAttendanceVO {
@ApiModelProperty("任务ID")
private Long projectId;
@ApiModelProperty("任务名")
private String projectName;
@ApiModelProperty("到岗人数")
private Integer reportToDutyNum = 0;
@ApiModelProperty("总人数")
private Integer totalNum = 0;
@ApiModelProperty("缺勤人数")
private Integer absenceDutyNum = 0;
@ApiModelProperty("请假人数")
private Integer leaveNum = 0;
@ApiModelProperty("迟到人数")
private Integer lateNum = 0;
@ApiModelProperty("外勤人数")
private Integer outDutyNum = 0;
@ApiModelProperty("早退人数")
private Integer earlyLeaveNum = 0;
@ApiModelProperty("到岗率")
private Integer reportToDutyRate= 0;
}

3
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingApplyListVO.java
View File

@ -34,6 +34,9 @@ public class ZbfProjectSubcontractingApplyListVO {
@ApiModelProperty("头像")
private String avatarName;
@ApiModelProperty("公司ID")
private Long companyId;
@ApiModelProperty("公司名字")
private String companyName;

12
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java
View File

@ -688,7 +688,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
sectionDeleteIds.addAll(sectionAddIds);
zbfProjectSectionService.remove(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, dto.getId())
.notIn(CollectionUtil.isNotEmpty(sectionDeleteIds), ZbfProjectSection::getId, sectionUpdateIds)
.notIn(CollectionUtil.isNotEmpty(sectionDeleteIds), ZbfProjectSection::getId, sectionDeleteIds)
);
//删除分包
@ -696,7 +696,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
subDeleteIds.addAll(subAddIds);
zbfProjectSubcontractingService.remove(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getProjectId, dto.getId())
.notIn(CollectionUtil.isNotEmpty(subDeleteIds), ZbfProjectSubcontracting::getId, subUpdateIds)
.notIn(CollectionUtil.isNotEmpty(subDeleteIds), ZbfProjectSubcontracting::getId, subDeleteIds)
);
return update;
@ -793,7 +793,13 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
LambdaQueryWrapper<ZbfProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId());
wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName());
wrapper.eq(StrUtil.isNotBlank(dto.getProjectStatus()), ZbfProject::getProjectStatus, dto.getProjectStatus());
if(dto.getProjectStatus() != null){
if("1".equals(dto.getProjectStatus())){
wrapper.in(ZbfProject::getProjectStatus, ProjectStatus.getBuilding());
}else {
wrapper.eq(ZbfProject::getProjectStatus, dto.getProjectStatus());
}
}
wrapper.orderByDesc(ZbfProject::getId);
Page<ZbfProject> result = page(PageUtils.buildPage(), wrapper);
return PageUtils.buildDataInfo(result);