Merge remote-tracking branch 'origin/master'

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

@@ -1752,7 +1752,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         }
                         if (showLog) System.out.println("工作时长==" + workHours);
 
-                        if (corpInfo.getCompanyId() == 481 || corpInfo.getCompanyId() == 469) {
+                        if (corpInfo.getCompanyId() == 481) {
                             //给盛立安元和赛元微电子0.5单位进位
                             ct.setWorkHours(DateTimeUtil.getHalfHoursFromDouble(workHours));
                         } else {
@@ -1826,12 +1826,13 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         JSONObject otInfo = jsonObject.getJSONObject("ot_info");
                         if (otInfo != null && otInfo.getIntValue("ot_duration") > 0 && otInfo.getIntValue("ot_status") == 1) {
                             double otTime = DateTimeUtil.getHoursFromSeconds(otInfo.getIntValue("ot_duration"));
-                            ct.setWorkHours(otTime);
+                            double hourValue = DateTimeUtil.getHoursFromDouble(otTime);
+                            ct.setWorkHours(hourValue);
                             ct.setCardTime(0.0);
                             ct.setAskLeaveTime(0.0);
                             ct.setOutdoorTime(0.0);
                             ct.setOtStatus(1);
-                            ct.setOtTime(otTime);
+                            ct.setOtTime(hourValue);
                             JSONArray holidayItems = jsonObject.getJSONArray("holiday_infos");
                             for (int t = 0; t < holidayItems.size(); t++) {
                                 JSONObject holiday = holidayItems.getJSONObject(t);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1352,6 +1352,7 @@ public class TimingTask {
         }
     }
 
+    //每天下午五点到七点，每半小时获取一次当天考勤记录
     @Scheduled(cron = "0 30,0/5 17-19 * * ?")
     public void  getClockRecordWithCorpWx(){
         if(isDev) return;

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

@@ -1359,7 +1359,6 @@
                             </span>
                         </div>
                     </el-tooltip>
-
                 </el-form-item>
                 <el-form-item :label="$t('xuan-ze-fen-zu')" v-if="isAddGroupPerson">
                     <el-select v-model="addGroupPersonData.group" multiple :placeholder="$t('selectagroup')" style="width:100%">
@@ -1376,8 +1375,8 @@
                 <el-button type="primary" @click="addProPersonSure()" v-else>{{ $t('btn.determine') }}</el-button>
             </div>
 
-            <el-dialog append-to-body :title="$t('screening.selectPeople')" v-if="addGroupPersonPdialog" :visible.sync="addGroupPersonPdialog" width="40%">
-                <div class="tree" style="height:300px">
+            <el-dialog append-to-body :title="$t('screening.selectPeople')" v-if="addGroupPersonPdialog" :visible.sync="addGroupPersonPdialog" width="40%" top="6.5vh">
+                <div class="tree" style="height:50vh">
                     <el-scrollbar style="height:100%">
                         <el-input
                         :placeholder="$t('keywordfiltering')"
@@ -2072,7 +2071,8 @@ a {
                 participatorValue: [],
                 batchChangeStageDialogVisible: false,
                 batchChangeStageLoading: false,
-                batchProjectTaskParticipantVisible: false
+                batchProjectTaskParticipantVisible: false,
+                batchDepartment: []
             };
         },
         // 过滤器
@@ -3081,6 +3081,7 @@ a {
             },
             addGroupPersonP(){
                 this.filterText2 = ''
+                this.chosenMembCount = this.addGroupPersonDataPersonNames && this.addGroupPersonDataPersonNames.length || 0
                 this.addGroupPersonPdialog = true
             },
             addPersonCheck(){
@@ -3104,7 +3105,7 @@ a {
                 this.addGroupPersonData.person = listIDs
                 this.addGroupPersonData.personNames = listNames
                 this.addGroupPersonDataPersonNames = listNamesList
-                console.log('触发', this.addGroupPersonDataPersonNames)
+                this.batchDepartment = chosenList.filter(item => !item.isUser).map(item => item.id)
             },
             addGroupPersonSure(){
                 if(this.addGroupPersonData.group.length == 0 || this.addGroupPersonData.person == null){
@@ -3233,6 +3234,7 @@ a {
                     this.$message(this.$t('defaultText.pleaseSelectSnItem'))
                     return
                 }
+                this.batchDepartment = []
                 this.addGroupPersonDialog = true
                 this.isAddGroupPerson = false
             },
@@ -3253,7 +3255,8 @@ a {
                 // proArr = proArr.substring(0,proArr.length - 1)
                 this.http.post('/project/batchSetParticipation',{
                     userIds: JSON.stringify(this.addGroupPersonData.person),
-                    projectIdArray: JSON.stringify(proArr)
+                    projectIdArray: JSON.stringify(proArr),
+                    deptIds: JSON.stringify(this.batchDepartment)
                 },res => {
                     if(res.code == 'ok'){
                         this.addGroupPersonDialog = false,