建筑工程专业版：修改完成度为各专业汇总的进度

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

@@ -136,6 +136,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Resource
     ProviderInfoMapper providerInfoMapper;
     @Resource
+    PpMembsMapper ppMembsMapper;
+    @Resource
     ProjectMainMapper projectMainMapper;
     @Resource
     ProjectLevelMapper projectLevelMapper;
@@ -292,6 +294,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     projectSeparateList = projectSeparateMapper.selectList(new QueryWrapper<ProjectSeparate>().in("id", projectIds));
                 }
             }
+            //建筑工程版项目总进度计算
+            Company company = companyMapper.selectById(companyId);
+            List<PpMembs> ppMembList = null;
+            List<ProjectProfession> ppList = null;
+            if (company.getPackageEngineering() == 1) {
+                ppMembList = ppMembsMapper.selectList(new QueryWrapper<PpMembs>().in("project_id", projectIds));
+                ppList = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().in("project_id", projectIds));
+            }
+
             List<ProjectVO> list = new ArrayList<>();
             List<Map<String,Object>> particpationList=participationMapper.getAllParticipator(projectIds);
             for (Project project : projectList) {
@@ -360,6 +371,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             projectVO.setProjectSeparate(first1.get());
                         }
                 }
+                //工程专业版：计算当前项目的总进度
+                if (company.getPackageEngineering() == 1) {
+                    List<PpMembs> curProjectPMList = ppMembList.stream().filter(pp->pp.getProjectId().equals(project.getId())).collect(Collectors.toList());
+                    List<ProjectProfession> curPPList = ppList.stream().filter(pp->pp.getProjectId().equals(project.getId())).collect(Collectors.toList());
+                    int totalProgress = 0;
+                    for (PpMembs memb : curProjectPMList) {
+                        System.out.println("getProgress=="+memb.getProgress()+""+memb.getPercentage());
+                        Optional<ProjectProfession> first1 = curPPList.stream().filter(pp -> pp.getProfessionId().equals(memb.getProfessionId())).findFirst();
+                        if (first1.isPresent()) {
+                            totalProgress += memb.getProgress()*memb.getPercentage()*first1.get().getPercentage();
+                        }
+
+                        System.out.println("getProgress==totalProgress="+totalProgress);
+                    }
+                    totalProgress = totalProgress/100/100;
+                    System.out.println("totalProgress=="+totalProgress);
+                    projectVO.setProgress(totalProgress);
+                }
                 list.add(projectVO);
             }
             List<String> stringList = providerCategoryList.stream().distinct().map(ProviderCategory::getProviderCategoryName).collect(Collectors.toList());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -219,9 +219,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Integer> allVisibleDeptIdList = getAllVisibleDeptIdList(user, null);
                 //需要看可见部门（部门主要负责人和其他负责人以及查看本部门工时权限）所有人员的日报
                 if (allVisibleDeptIdList.size() > 0) {
-                    for (Integer ids : allVisibleDeptIdList) {
-                        System.out.println(ids);
-                    }
                     if (nameList.size() > 0) {
                         //自己填写的日报
                         List<Map<String, Object>> deptNameList = reportMapper.getReportNameByDateAndDept(date,
@@ -235,7 +232,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         nameList = reportMapper.getReportNameByDateAndDept(date,
                                 allVisibleDeptIdList, targetUid, null);
                     }
-                    System.out.println("有可见部门==="+nameList.size());
                     if (nameList.size() > 0) {
                         List<String> userIds = new ArrayList<>();
                         nameList.forEach(n->{
@@ -1840,7 +1836,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         for (User u : userList) {
             //入职日期在当前日期之后的，不要显示
             if (u.getInductionDate() != null && u.getInductionDate().isAfter(curDate)) {
-                System.out.println("========"+u.getName());
                 continue;
             }
             HashMap<String, Object> user = new HashMap<String, Object>();

fhKeeper/formulahousekeeper/octopus/build.bat

@@ -0,0 +1 @@
+npm run build

fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -19,8 +19,10 @@
                     </el-row>
                     <el-row :gutter="10">
                         <el-col :span="5" ><span class="gray_label">状态:</span></el-col><el-col :span="7" ><span >{{project.status==null?'-':statusTxt[project.status]}}</span></el-col>
-                        <el-col :span="5" ><span class="gray_label">完成度: </span></el-col><el-col :span="7" ><span>
-                            <el-progress  :percentage="project.progress == null?0:project.progress"></el-progress></span></el-col>
+                        <el-col :span="5" v-if="user.company.packageEngineering==0"><span class="gray_label">完成度: </span></el-col><el-col :span="7" >
+                        <span v-if="user.company.packageEngineering==0">
+                            <el-progress  :percentage="project.progress == null?0:project.progress"></el-progress>
+                        </span></el-col>
                     </el-row>
                     <el-row :gutter="10">
                         <el-col :span="5" ><span class="gray_label">项目编号: </span></el-col><el-col :span="7" ><span >{{project.projectCode}}&nbsp;</span></el-col>