针对明夷开启新的审核模式

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

@@ -449,42 +449,6 @@ public class ReportController {
         List<Integer> integers = Arrays.asList(projectId);
         List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", integers));
 
-        //HARDCODE: 成都明夷电子，需要根据考勤重新计算每日工作时长;
-//        if (company.getCompanyName().equals("成都明夷电子科技有限公司")) {
-//            if (createDate.length > 0) {
-//                workingTime = new Double[projectId.length];
-//                String createDateOne = createDate[0];
-//                if (createDateOne.contains("@")) {
-//                    //批量填报；代填
-//                    String[] dateArray = createDateOne.split("@");
-//                    List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(dateArray[0], dateArray[dateArray.length - 1], comTimeType.getIncludeWeekends());
-//                    for (int i=0;i<workDaysListInRange.size(); i++) {
-//                        LocalDate date = workDaysListInRange.get(i);
-//                        //获取当天考勤
-//                        UserFvTime fvTime = userFvTimeService.getOne(new QueryWrapper<UserFvTime>().eq("work_date", date).eq("company_id", user.getCompanyId()).eq("user_id", user.getId()));
-//                        if (fvTime == null) {
-//                            //无考勤按八小时填报
-//                            workingTime[i] = 8.0 * progress[i]/100;
-//                        } else {
-//                            workingTime[i] = fvTime.getWorkHours().doubleValue() * progress[i]/100;
-//                        }
-//                    }
-//                } else{
-//                    UserFvTime fvTime = userFvTimeService.getOne(new QueryWrapper<UserFvTime>().eq("work_date", createDateOne).eq("company_id", user.getCompanyId()).eq("user_id", user.getId()));
-//                    for (int i=0;i<workingTime.length; i++) {
-//                        if (fvTime == null) {
-//                            //无考勤按八小时填报
-//                            workingTime[i] = 8.0 * progress[i]/100;
-//                        } else {
-//                            workingTime[i] = fvTime.getWorkHours().doubleValue() * progress[i]/100;
-//                        }
-//                    }
-//                }
-//
-//            }
-//        }
-
-
         List<ReportAuditorSetting> auditorSettingList = null;
         if (comTimeType.getReportAuditType() == 3) {
             //员工自由选择审批人

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

@@ -616,13 +616,13 @@
                 for (var i=0;i<this.multipleSelection.length; i++) {
                     var line = this.multipleSelection[i];
                     var array = line.data;
-                    // if (this.user.company.companyName == '成都明夷电子科技有限公司') {
-                    //     ids += line.reportIds+',';
-                    // } else {
+                    if (this.user.company.companyName == '成都明夷电子科技有限公司') {
+                        ids += line.reportIds+',';
+                    } else {
                         for (var m=0;m<array.length; m++) {
                             ids += array[m].id+',';
                         }
-                    // }
+                    }
                 }
                 if (ids.length > 0) {
                     ids = ids.substring(0, ids.length-1);
@@ -754,9 +754,9 @@
                 }
                 //明夷电子特殊处理
                 let url = this.port.report.portList;
-                // if (this.user.company.companyName == '成都明夷电子科技有限公司') {
-                //     url = '/report-batch/getAuditList';
-                // }
+                if (this.user.company.companyName == '成都明夷电子科技有限公司') {
+                    url = '/report-batch/getAuditList';
+                }
                 this.http.post(url, this.search,
                 res => {
                     this.listLoading = false;
@@ -783,13 +783,13 @@
             approve(id,date, item) {
                 let ids = '';
                 let data = item.data;
-                // if (this.user.company.companyName == '成都明夷电子科技有限公司') {
-                //     ids = item.reportIds;
-                // } else {
+                if (this.user.company.companyName == '成都明夷电子科技有限公司') {
+                    ids = item.reportIds;
+                } else {
                     data.forEach(element => {
                         ids +=(element.id+',');
                     });
-                // }
+                }
                 
                 this.isbatch = false
                 this.approveinData = {
@@ -871,14 +871,14 @@
             showDenyDialog(id,i, date, item) {
                 this.denyReasonDialog = true;
                 var ids = '';
-                // if (this.user.company.companyName == '成都明夷电子科技有限公司') {
-                //     ids = item.reportIds;
-                // } else {
+                if (this.user.company.companyName == '成都明夷电子科技有限公司') {
+                    ids = item.reportIds;
+                } else {
                     var data = item.data;
                     data.forEach(element => {
                         ids +=(element.id+',');
                     });
-                // }
+                }
                 
                 this.denyForm = {id: id ,i:i, date: date, reportIds: ids, reason:null};
             },