Merge remote-tracking branch 'origin/master'

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

@@ -1371,7 +1371,7 @@ public class ReportController {
                                         } else {
                                             //检查是否超过预设的提醒百分比;设置的数值是剩余的百分比
                                             if (hasReport.divide(multiply, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).compareTo(new BigDecimal(100 - estimateTimeSetting.getGroupWarningPercent())) > 0) {
-                                                warningGroupPercent += (tgp.getTaskGroupCode() != null?tgp.getTaskGroupCode():"")+"-"+tgp.getName() + ",";
+                                                warningGroupPercent += (tgp.getTaskGroupCode() != null?tgp.getTaskGroupCode()+"-":"")+tgp.getName() + ",";
                                                 sendReportTimeWarningMsg(company, null, first.get().getProjectName(), tgp);
                                             }
                                         }
@@ -1794,10 +1794,9 @@ public class ReportController {
         }
 
 
-        //个人和代填都要检验考勤时长
         if (createDate[0].contains("@")) {
             //个人批量填报，判断是否需要考勤校验
-            if (comTimeType.getSyncCorpwxTime() == 1) {
+            if (comTimeType.getSyncCorpwxTime() == 1 && targetUids == null) {
                 String[] dateArr = createDate[0].split("@");
                 List<UserCorpwxTime> cardTimeList = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>().eq("corpwx_userid", user.getCorpwxUserid()).between("create_date", dateArr[0], dateArr[1]));
                 if (company.getId() == 3918 || company.getId() == 4281) {

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

@@ -625,10 +625,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         r.setWorktimeList(list);
                     }
                 }
-
+                Project project = allProjectList.stream().filter(p -> p.getId().equals(r.getProjectId())).findFirst().get();
                 //处理维度列表数据
                 if (timeTypeMapper.selectById(companyId).getCustomDegreeActive() == 1) {
-                    Project project = allProjectList.stream().filter(p -> p.getId().equals(r.getProjectId())).findFirst().get();
                     String associateDegrees = project.getAssociateDegrees();
                     List<HashMap> degreeMapList = new ArrayList<>();
                     if (associateDegrees != null) {
@@ -677,7 +676,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //项目的审核人
                 if (reportAuditType == 0) {
                     //对于简单模式的非项目，直接获取部门主管作为审核人
-                    if (company.getNonProjectSimple() == 1) {
+                    if (company.getNonProjectSimple() == 1 && project.getIsPublic() == 1) {
                         User user = userMapper.selectById(r.getCreatorId());
                         Department department = departmentMapper.selectById(user.getDepartmentId());
                         if (department != null) {
@@ -4745,7 +4744,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         for (UserMonthWork userMonthWork : userMonthWorks) {
             List<Map<String, Object>> worktimeList = userMonthWork.worktimeList;
             //获取到该员工请假的数据
-            List<UserCorpwxTime> curUserCorpTime = userCorpwxTimeList.stream().filter(s->s.getCorpwxUserid().equals(userMonthWork.corpwxUserId)).collect(Collectors.toList());
+            List<UserCorpwxTime> curUserCorpTime = userCorpwxTimeList.stream().filter(s->s.getCorpwxUserid() != null && s.getCorpwxUserid().equals(userMonthWork.corpwxUserId)).collect(Collectors.toList());
 //            for (Map<String, Object> corpWx : userCorpwxTimeMapList) {
 //                if (((String)corpWx.get("corpwx_userid")).equals(userMonthWork.corpwxUserId)) {
 //                    curUserCorpTime.add(corpWx);

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -20,7 +20,7 @@
                     </van-field>
                     <template #right-icon>
                         <!--先开放几家，试一下-->
-                        <span style="color:#20a0ff;" @click="getAIReport()" v-if="!hasWrittenReport && (user.companyId==10||user.companyId==7||user.companyId==7030)">智能填报</span>
+                        <span style="color:#20a0ff;" @click="getAIReport()" v-if="!substitute && !hasWrittenReport && (user.companyId==10||user.companyId==7||user.companyId==7030)">智能填报</span>
                     </template>
                 </van-cell>
                 
@@ -2283,8 +2283,6 @@ export default {
                 }
             }
             this.dateAr = alp
-            console.log(this.reportTimeType, this.dateAr, '<=== this.reportTimeType')
-
             const { timeCanOverlap } = this.reportTimeType // timeCanOverlap 为零时校验不允许重叠
             if (this.dateAr.length > 0 && timeCanOverlap == 0) {
                 let trus = this.fns()
@@ -2374,7 +2372,8 @@ export default {
                     return;
                 }
             }
-            if (this.user.timeType.notAllowedNoAttendance == 1 && this.isDraft == 0) {
+            //非代填情况下要校验考勤
+            if (!this.substitute && this.user.timeType.notAllowedNoAttendance == 1 && this.isDraft == 0) {
                 if (this.report.time) {
                     if (this.report.time.workHours == 0) {
                         this.$toast.fail('无考勤记录不可填报')
@@ -2386,7 +2385,7 @@ export default {
                 }
             }
             //针对凡己，不校验考勤时长
-            if (this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && this.reportTimeType.type == 1 && this.report.time) {
+            if (!this.substitute && this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && this.reportTimeType.type == 1 && this.report.time) {
                 var totalTime = 0;
                 for (var t = 0; t < this.form.domains.length; t++) {
                     totalTime += parseFloat(this.form.domains[t].workingTime);

fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -266,7 +266,7 @@
             }
             let href = window.location.href;
             //优先处理企业微信工作台点击进入，后台已经处理过，有userId传过来了
-            if (this.isCorpWX && href.indexOf("userId") > 0) {
+            if (href.indexOf("userId") > 0) {
                 //判断企业微信，是否存在授权
                 var loginUserId = href.substring(href.indexOf("userId=")+"userId=".length);
                 if (loginUserId.includes('#/')) {