diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java index b3669ab..38026e7 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java @@ -95,7 +95,7 @@ public class ProjectController extends BaseController @PostMapping("/team") public AjaxResult personnelChanges(@RequestBody ProjectTeam team) { - return toAjax(teamService.personnelChanges(team)); + return success(teamService.personnelChanges(team)); } /** * 删除项目 diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/dto/ProjectQueryDto.java b/pms-business/src/main/java/tech/unissense/pms/business/project/dto/ProjectQueryDto.java index 1d12345..9ad3bac 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/dto/ProjectQueryDto.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/dto/ProjectQueryDto.java @@ -8,7 +8,7 @@ import java.util.Date; * @author : ch * @version : 1.0 * @ClassName : ProjectQueryDto - * @Description : TODO(用一句话描述该类做什么) + * @Description : 请求参数 * @DATE : Created in 14:51 2024/10/10 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java index fbcb86d..31e2bef 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java @@ -83,7 +83,7 @@ public class ProjectServiceImpl implements IProjectService { } if (user.getRoles().stream().anyMatch(item-> "企业管理员".equals(item.getRoleName())|| "公司领导".equals(item.getRoleName()))){ - }else if (user.getRoles().stream().anyMatch(item -> "项目管理员".equals(item.getRoleName()))){ + }else if (user.getRoles().stream().anyMatch(item -> "项目经理".equals(item.getRoleName()))){ sql.append("and (t1.project_id in (select project_id from pms_project_team where user_id={} ) or t1.project_leader={})"); project.getParams().put("dataScope", StringUtils.format(sql.toString(), user.getUserId(), user.getUserId())); }else{ @@ -160,6 +160,7 @@ public class ProjectServiceImpl implements IProjectService { TeamStaticsVo teamStaticsVo = new TeamStaticsVo(); teamStaticsVo.setTeamId(item.getTeamId()); teamStaticsVo.setUserName(item.getUserName()); + teamStaticsVo.setUserId(item.getUserId()); teamStaticsVo.setPostId(item.getPostId()); teamStaticsVo.setWorkDay(workDay); return teamStaticsVo; diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectExecutionVo.java b/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectExecutionVo.java index b5369c9..89a1d76 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectExecutionVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectExecutionVo.java @@ -9,7 +9,7 @@ import java.util.List; * @author : ch * @version : 1.0 * @ClassName : ProjectExecutionVo - * @Description : TODO(用一句话描述该类做什么) + * @Description : 项目执行情况 * @DATE : Created in 11:20 2024/10/10 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectWorkInfoVo.java b/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectWorkInfoVo.java index 154d115..5109363 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectWorkInfoVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/vo/ProjectWorkInfoVo.java @@ -11,7 +11,7 @@ import java.util.List; * @author : ch * @version : 1.0 * @ClassName : ProjectExecutionVo - * @Description : TODO(用一句话描述该类做什么) + * @Description : 项目执行vo * @DATE : Created in 11:20 2024/10/10 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
diff --git a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/IProjectTeamService.java b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/IProjectTeamService.java index edd0a98..f16a5d9 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/IProjectTeamService.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/IProjectTeamService.java @@ -55,5 +55,5 @@ public interface IProjectTeamService { void insertBatch(List projectTeamList); - int personnelChanges(ProjectTeam teamList); + ProjectTeam personnelChanges(ProjectTeam teamList); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/impl/ProjectTeamServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/impl/ProjectTeamServiceImpl.java index 475cd7e..27da99d 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/impl/ProjectTeamServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/service/impl/ProjectTeamServiceImpl.java @@ -86,11 +86,12 @@ public class ProjectTeamServiceImpl implements IProjectTeamService { } @Override - public int personnelChanges(ProjectTeam team) { + public ProjectTeam personnelChanges(ProjectTeam team) { if (team.getTeamId()!=null){ - return projectTeamMapper.update(team); + projectTeamMapper.update(team); }else { - return projectTeamMapper.insert(team); + projectTeamMapper.insert(team); } + return team; } } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/vo/TeamStaticsVo.java b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/vo/TeamStaticsVo.java index 6a3f01c..3e8d163 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/projectteam/vo/TeamStaticsVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/projectteam/vo/TeamStaticsVo.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; * @author : ch * @version : 1.0 * @ClassName : TeamStaticsVo - * @Description : TODO(用一句话描述该类做什么) + * @Description : 项目人员工时 * @DATE : Created in 15:25 2024/10/9 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
@@ -21,6 +21,7 @@ import java.math.BigDecimal; public class TeamStaticsVo { private Integer teamId; private String userName; + private Integer userId; private String postId; private BigDecimal workDay; } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java index e8e0be1..6cc62ab 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java @@ -143,7 +143,7 @@ public class WorkLoggerServiceImpl implements IWorkLoggerService { BigDecimal::add )); - // 生成StaticsHourVo列表 + return generateStaticsHourVoList(projects, workHourMap, Project::getProjectId, Project::getProjectName); } @@ -178,7 +178,8 @@ public class WorkLoggerServiceImpl implements IWorkLoggerService { Function idExtractor, Function nameExtractor) { return items.stream() // 对每个项目项创建一个StaticsHourVo对象 - .map(item -> createStaticsHourVo(nameExtractor.apply(item), workDayMap.getOrDefault(idExtractor.apply(item), BigDecimal.ZERO))) + .map(item -> createStaticsHourVo(nameExtractor.apply(item), workDayMap.getOrDefault(idExtractor.apply(item), BigDecimal.ZERO) + ,idExtractor.apply(item))) .collect(Collectors.toList()); } @@ -186,13 +187,14 @@ public class WorkLoggerServiceImpl implements IWorkLoggerService { private List generateStaticsHourVoList(Map workDayMap) { return workDayMap.entrySet().stream() // 对每个用户创建一个StaticsHourVo对象 - .map(entry -> createStaticsHourVo(entry.getKey(), entry.getValue())) + .map(entry -> createStaticsHourVo(entry.getKey(), entry.getValue(),null)) .collect(Collectors.toList()); } // 创建StaticsHourVo对象,计算工时并格式化为字符串 - private StaticsHourVo createStaticsHourVo(String name, BigDecimal workDay) { + private StaticsHourVo createStaticsHourVo(String name, BigDecimal workDay,Integer projectId) { StaticsHourVo vo = new StaticsHourVo(); + vo.setProjectId(projectId); vo.setName(name); // 将总工时除以8,表示为工作日,并保留两位小数 vo.setWorkDay(workDay); diff --git a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/CalendarVo.java b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/CalendarVo.java index af1f27c..a31f7b0 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/CalendarVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/CalendarVo.java @@ -8,7 +8,7 @@ import java.util.Date; * @author : ch * @version : 1.0 * @ClassName : CalendarVo - * @Description : TODO(用一句话描述该类做什么) + * @Description : 工作日历显示 * @DATE : Created in 11:40 2024/10/9 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
diff --git a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/StaticsHourVo.java b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/StaticsHourVo.java index 1912be4..dfd972c 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/StaticsHourVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/vo/StaticsHourVo.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; * @author : ch * @version : 1.0 * @ClassName : CalendarVo - * @Description : TODO(用一句话描述该类做什么) + * @Description : 工时统计 * @DATE : Created in 11:40 2024/10/9 *
       Copyright: Copyright(c)2024     
*
       Company :   	紫光汇智信息技术有限公司		           
@@ -19,6 +19,7 @@ import java.math.BigDecimal; */ @Data public class StaticsHourVo { + private Integer projectId; private String name; private BigDecimal workDay; diff --git a/pms-business/src/main/resources/mapper/business/WorkLogger/WorkLoggerMapper.xml b/pms-business/src/main/resources/mapper/business/WorkLogger/WorkLoggerMapper.xml index 8f503f4..0f494c4 100644 --- a/pms-business/src/main/resources/mapper/business/WorkLogger/WorkLoggerMapper.xml +++ b/pms-business/src/main/resources/mapper/business/WorkLogger/WorkLoggerMapper.xml @@ -191,7 +191,7 @@