项目看板模块方法修改联调
This commit is contained in:
wangna0328
parent
15086236ea
commit
ba2f7ecbea
|
|
@ -17,21 +17,21 @@ import java.util.List;
|
|||
@ApiModel(value="ProjectKanbanDataResp对象", description="项目看板数据响应")
|
||||
public class ProjectKanbanDataResp {
|
||||
|
||||
@ApiModelProperty("待施工项目列表")
|
||||
@ApiModelProperty("未开工项目列表")
|
||||
private List<ProjectKanbanItem> pendingProjects;
|
||||
|
||||
@ApiModelProperty("施工中项目列表")
|
||||
@ApiModelProperty("筹备中项目列表")
|
||||
private List<ProjectKanbanItem> preparingProjects;
|
||||
|
||||
@ApiModelProperty("开工中项目列表")
|
||||
private List<ProjectKanbanItem> inProgressProjects;
|
||||
|
||||
@ApiModelProperty("暂停中项目列表")
|
||||
private List<ProjectKanbanItem> suspendedProjects;
|
||||
|
||||
@ApiModelProperty("已完工项目列表")
|
||||
private List<ProjectKanbanItem> completedProjects;
|
||||
|
||||
@ApiModelProperty("已审核项目列表")
|
||||
private List<ProjectKanbanItem> auditedProjects;
|
||||
|
||||
@ApiModelProperty("已验收项目列表")
|
||||
private List<ProjectKanbanItem> acceptedProjects;
|
||||
|
||||
@ApiModelProperty("验收中项目列表")
|
||||
private List<ProjectKanbanItem> acceptanceProjects;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,18 +19,18 @@ public class ProjectKanbanStatsResp {
|
|||
@ApiModelProperty("待施工项目数")
|
||||
private Long pendingProjectCount;
|
||||
|
||||
@ApiModelProperty("施工中项目数")
|
||||
@ApiModelProperty("筹备中项目数")
|
||||
private Long preparingProjectCount;
|
||||
|
||||
@ApiModelProperty("开工中项目数")
|
||||
private Long inProgressProjectCount;
|
||||
|
||||
@ApiModelProperty("暂停中项目数")
|
||||
private Long suspendedProjectCount;
|
||||
|
||||
@ApiModelProperty("已完工项目数")
|
||||
private Long completedProjectCount;
|
||||
|
||||
@ApiModelProperty("已审核项目数")
|
||||
private Long auditedProjectCount;
|
||||
|
||||
@ApiModelProperty("已验收项目数")
|
||||
private Long acceptedProjectCount;
|
||||
|
||||
@ApiModelProperty("验收中项目数")
|
||||
private Long acceptanceProjectCount;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ import java.util.List;
|
|||
@AllArgsConstructor
|
||||
public enum ProjectStatusEnum {
|
||||
PENDING(0, "未开工"),
|
||||
IN_PREPARATION(1, "筹备中"),
|
||||
PREPARING(1, "筹备中"),
|
||||
IN_PROGRESS(2, "开工中"),
|
||||
AUDITED(3, "已审核"),
|
||||
SUSPENDED(3, "暂停中"),
|
||||
COMPLETED(4, "已完工"),
|
||||
ACCEPTED(5, "已验收"),
|
||||
IN_ACCEPTANCE(5, "验收中"),
|
||||
IN_COLLECTION(6, "回款中"),
|
||||
SETTLED(7, "已结算");
|
||||
|
||||
|
|
|
|||
|
|
@ -455,12 +455,11 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|||
// 统计项目数量
|
||||
resp.setTotalProjectsCount(projectService.count());
|
||||
resp.setPendingProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 0).count()); // 未开工
|
||||
resp.setInProgressProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 1).count()); // 筹备中
|
||||
resp.setCompletedProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 2).count()); // 开工中
|
||||
resp.setAuditedProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 3).count()); // 已审核
|
||||
resp.setAcceptedProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 4).count()); // 已完工
|
||||
// 新增状态统计
|
||||
resp.setAcceptanceProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 5).count()); // 已验收
|
||||
resp.setPreparingProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 1).count()); // 筹备中
|
||||
resp.setInProgressProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 2).count()); // 开工中
|
||||
resp.setSuspendedProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 3).count()); // 暂停中
|
||||
resp.setCompletedProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 4).count()); // 已完工
|
||||
resp.setAcceptanceProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 5).count()); // 验收中
|
||||
resp.setCollectionProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 6).count()); // 回款中
|
||||
resp.setSettledProjectCount(projectService.lambdaQuery().eq(ProjectEntity::getStatus, 7).count()); // 已结算
|
||||
|
||||
|
|
@ -495,12 +494,11 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|||
|
||||
// 获取各状态的项目列表
|
||||
resp.setPendingProjects(getProjectKanbanItems(0)); // 未开工
|
||||
resp.setInProgressProjects(getProjectKanbanItems(1)); // 筹备中
|
||||
resp.setCompletedProjects(getProjectKanbanItems(2)); // 开工中
|
||||
resp.setAuditedProjects(getProjectKanbanItems(3)); // 已审核
|
||||
resp.setAcceptedProjects(getProjectKanbanItems(4)); // 已完工
|
||||
// 新增状态项目列表
|
||||
resp.setAcceptanceProjects(getProjectKanbanItems(5)); // 已验收
|
||||
resp.setPreparingProjects(getProjectKanbanItems(1)); // 筹备中
|
||||
resp.setInProgressProjects(getProjectKanbanItems(2)); // 开工中
|
||||
resp.setSuspendedProjects(getProjectKanbanItems(3)); // 暂停中
|
||||
resp.setCompletedProjects(getProjectKanbanItems(4)); // 已完工
|
||||
resp.setAcceptanceProjects(getProjectKanbanItems(5)); // 验收中
|
||||
resp.setCollectionProjects(getProjectKanbanItems(6)); // 回款中
|
||||
resp.setSettledProjects(getProjectKanbanItems(7)); // 已结算
|
||||
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ public class TurbineServiceImpl extends ServiceImpl<TurbineMapper, TurbineEntity
|
|||
if (turbine == null) {
|
||||
return;
|
||||
}
|
||||
if (turbine.getStatus() == ProjectStatusEnum.AUDITED.getCode()) {
|
||||
if (turbine.getStatus() == ProjectStatusEnum.PREPARING.getCode()) {
|
||||
return;
|
||||
}
|
||||
List<TurbineStatusResp> turbineStatusList = jobService.calCrewStatus(ListUtil.of(turbineId));
|
||||
|
|
@ -234,7 +234,7 @@ public class TurbineServiceImpl extends ServiceImpl<TurbineMapper, TurbineEntity
|
|||
&& status4.contains(turbineStatusVo.getAntiThunderWorkStatus())
|
||||
&& status4.contains(turbineStatusVo.getSummaryWorkStatus())) {
|
||||
// 全部审批已审批
|
||||
turbine.setStatus(ProjectStatusEnum.AUDITED.getCode());
|
||||
turbine.setStatus(ProjectStatusEnum.PREPARING.getCode());
|
||||
} else if (status2.contains(turbineStatusVo.getInWorkStatus())
|
||||
|| status2.contains(turbineStatusVo.getOutWorkStatus())
|
||||
|| status2.contains(turbineStatusVo.getAntiThunderWorkStatus())
|
||||
|
|
@ -267,12 +267,12 @@ public class TurbineServiceImpl extends ServiceImpl<TurbineMapper, TurbineEntity
|
|||
if (!statusList.contains(ProjectStatusEnum.PENDING.getCode()) &&
|
||||
!statusList.contains(ProjectStatusEnum.IN_PROGRESS.getCode())) {
|
||||
status = ProjectStatusEnum.COMPLETED.getCode();
|
||||
// 如果机组列表没有状态为 待施工、施工中、已完工 的则项目 已审核
|
||||
// 如果机组列表没有状态为 待施工、施工中、已完工 的则项目 筹备中
|
||||
if (!statusList.contains(ProjectStatusEnum.COMPLETED.getCode())) {
|
||||
status = ProjectStatusEnum.AUDITED.getCode();
|
||||
// 如果机组列表没有状态为 待施工、施工中、已完工、已审核 的则项目 已验收
|
||||
if (!statusList.contains(ProjectStatusEnum.AUDITED.getCode())) {
|
||||
status = ProjectStatusEnum.ACCEPTED.getCode();
|
||||
status = ProjectStatusEnum.PREPARING.getCode();
|
||||
// 如果机组列表没有状态为 待施工、施工中、已完工、筹备中 的则项目 验收中
|
||||
if (!statusList.contains(ProjectStatusEnum.PREPARING.getCode())) {
|
||||
status = ProjectStatusEnum.IN_ACCEPTANCE.getCode();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,5 +79,13 @@ public class UserController {
|
|||
userService.deleteById(userId);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "根据姓名模糊查询用户", httpMethod = "GET")
|
||||
@GetMapping("/searchByName")
|
||||
public PageResult<UserListResp> searchByName(@RequestParam String name) {
|
||||
UserListReq req = new UserListReq();
|
||||
req.setName(name);
|
||||
return PageResult.ok(userService.list(req));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue