Explorar el Código

工时成本统计按项目导出BUG修复

yurk hace 2 años
padre
commit
86e1595e60

+ 5 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1151,6 +1151,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").in("dept_id", allMyManagedDeptIds));
                     List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").in("dept_id", allMyManagedDeptIds));
                     deptRelatedProjectIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
                     deptRelatedProjectIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
                 }
                 }
+                if(functionDpartList.size()>0){
+                    if(functionTimeList.size()>0||functionCostList.size()>0){
+                        deptIds.addAll(allMyManagedDeptIds);
+                    }
+                }
                 //没有查看全公司的权限 只能先判断当前部门/父级别是否在负责部门才能获取数据
                 //没有查看全公司的权限 只能先判断当前部门/父级别是否在负责部门才能获取数据
                 if(deptId!=null){
                 if(deptId!=null){
                     Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(deptId)).findFirst();
                     Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(deptId)).findFirst();

+ 2 - 2
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  * </p>
  *
  *
  * @author Seyason
  * @author Seyason
- * @since 2022-10-12
+ * @since 2022-10-14
  */
  */
 @Data
 @Data
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
@@ -384,7 +384,7 @@ public class TimeType extends Model<TimeType> {
     private Integer stageHasEvtime;
     private Integer stageHasEvtime;
 
 
     /**
     /**
-     * 考勤为0不可填报
+     * 无考勤记录无法填报
      */
      */
     @TableField("no_work_to_report")
     @TableField("no_work_to_report")
     private Integer noWorkToReport;
     private Integer noWorkToReport;