1

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

@@ -11302,8 +11302,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }else{
             resultList=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,null,null,area,null,deptIds);
         }
+        //固定月工时数 163.125
+        double regularMonthTime=163.125;
+        //计算日期区间一共几个月
+        Period period = Period.between(timeStart, timeEnd);
         for (Map<String, Object> map : resultList) {
             map.put("FTE",Float.parseFloat(map.get("workTime") == null?"0":map.get("workTime").toString())/monthTime);
+            map.put("FTERegular",Float.parseFloat(map.get("workTime") == null?"0":map.get("workTime").toString())/(regularMonthTime*(period.getMonths()+1)));
         }
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUser.getCompanyId()));
         if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact().equals(1)){

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -963,6 +963,7 @@
                 </el-table-column>
                 <el-table-column align="center" prop="workTime" label="工时" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="FTE" label="FTE（工时/当月工时基数）" min-width="250"></el-table-column>
+                <el-table-column v-if="user.companyId==876" align="center" prop="FTERegular" label="FTE（工时/固定工时基数（163.125））" min-width="300"></el-table-column>
             </el-table>
 
             <!-- 有效工时率表 -->
@@ -2449,6 +2450,7 @@ export default {
           if (res.code == "ok") {
               for (var i in res.data.resultList) {
                 res.data.resultList[i].FTE = res.data.resultList[i].FTE.toFixed(2)
+                res.data.resultList[i].FTERegular = res.data.resultList[i].FTERegular.toFixed(2)
               }
               this.fTEDataList = res.data.resultList;
               this.total = res.data.total;