Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskProgressController.java

@@ -47,8 +47,8 @@ public class TaskProgressController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(Integer taskId) {
-        return taskProgressService.getList(taskId);
+    public HttpRespMsg list(Integer taskId,HttpServletRequest request) {
+        return taskProgressService.getList(taskId,request);
     }
 }
 

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

@@ -20,5 +20,5 @@ public interface TaskProgressService extends IService<TaskProgress> {
 
     HttpRespMsg deleteProgress(Integer id, HttpServletRequest request);
 
-    HttpRespMsg getList(Integer taskId);
+    HttpRespMsg getList(Integer taskId,HttpServletRequest request);
 }

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

@@ -7701,11 +7701,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             if (leaveSheet.getStartDate().isBefore(localStartDate)){
                                 //平均计算
                                 float DifDay = localStartDate.toEpochDay() - leaveSheet.getStartDate().toEpochDay();
-                                leaveTime+= timeHours*(DifDay/LeaveDay);
+                                leaveTime+= timeHours*(1 - DifDay/LeaveDay);
                             }else {
                                 //当请假时间结束时间跨月
                                 float DifDay = leaveSheet.getEndDate().toEpochDay() - localEndDate.toEpochDay();
-                                leaveTime+= timeHours*(DifDay/LeaveDay);
+                                leaveTime+= timeHours*(1 - DifDay/LeaveDay);
                             }
                         }
                     }

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

@@ -166,10 +166,26 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
     }
 
     @Override
-    public HttpRespMsg getList(Integer taskId) {
+    public HttpRespMsg getList(Integer taskId,HttpServletRequest request) {
+        String token = request.getHeader("token");
+        User user = userMapper.selectById(token);
         //倒序，最新的在最上面
         List<TaskProgress> taskProgressList
                 = taskProgressMapper.selectList(new QueryWrapper<TaskProgress>().eq("task_id", taskId).orderByDesc("id"));
+        List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+        for (TaskProgress taskProgress : taskProgressList) {
+            for (User item : users) {
+                if (item.getId().equals(taskProgress.getCreatorId())){
+                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                        taskProgress.setCreatorName(item.getCorpwxRealUserid());
+                    }else {
+                        taskProgress.setCreatorName(item.getName());
+                    }
+                    break;
+                }
+            }
+        }
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = taskProgressList;
         return msg;

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -298,7 +298,7 @@
             <div class="ctons">
             <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
                 <div style="display: inline-block;width: 350px">
-                    <el-input style="float:left;" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
+                    <el-input style="float:left;" v-if="user.userNameNeedTranslate != 1" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
                         <el-button slot="append" @click="statistical()" icon="el-icon-search"></el-button>
                     </el-input>
                 </div>

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

@@ -470,12 +470,12 @@
             <div style="display: inline-block;width: 18%;margin-left:1%">
               <el-button size="small" @click="changeAltime(0)">{{ $t('volumeset') }}</el-button>
             </div>
-            <div style="display: inline-block;width: 26%">
-              <el-input style="float:left;" v-model="keywordAl" v-if="user.userNameNeedTranslate != 1" class="input-with-select" :placeholder="$t('pleaseenterhepersonnamesearch')" clearable="true" size="small" @clear="clearsearchAl()">
+            <div style="display: inline-block;width: 26%" v-if="user.userNameNeedTranslate != 1">
+              <el-input style="float:left;" v-model="keywordAl" class="input-with-select" :placeholder="$t('pleaseenterhepersonnamesearch')" clearable="true" size="small" @clear="clearsearchAl()">
                   <el-button slot="append" @click="searchAl()" icon="el-icon-search"></el-button>
               </el-input>
             </div>
-            <div style="display: inline-block;width: 32%;margin-left:12%">
+            <div style="display: inline-block;width: 32%;">
               <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">{{ $t('screeningDepartment') }}</span>
               <el-cascader
                 ref="selectAl"