判断是部门审核还是直属领导审核

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

@@ -1711,13 +1711,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Report> updateReportList = new ArrayList<>();
                 //人员所属部门负责人审核或者直属领导审核
                 boolean hasAuditAllPri = sysFunctionService.hasPriviledge(user.getRoleId(), "审核全员日报");
-                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, creator_id, create_date, project_id,audit_dept_managerid,department_audit_state, project_auditor_id").in("id", ids));
+                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, creator_id, create_date, project_id,audit_dept_managerid,department_audit_state, project_auditor_id, is_dept_audit").in("id", ids));
                 for (Report r : reportList) {
                     //直属领导审核或者部门负责人审核
                     Report newReport = new Report();
                     newReport.setId(r.getId());
-                    if(hasAuditAllPri || ((r.getProjectAuditorId() != null &&  user.getId().equals(r.getProjectAuditorId()))
-                        || (r.getProjectAuditorId() == null && user.getId().equals(r.getAuditDeptManagerid())))){
+                    if(hasAuditAllPri || ((r.getIsDeptAudit() == 0 &&  user.getId().equals(r.getProjectAuditorId()))
+                        || (r.getIsDeptAudit() == 1 && user.getId().equals(r.getAuditDeptManagerid())))){
                         newReport.setState(1);
                         newReport.setDepartmentAuditState(1);
                         newReport.setProjectAuditState(1);
@@ -2781,14 +2781,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Report> updateReportList = new ArrayList<>();
                 //人员所属部门负责人审核或者直属领导审核
                 boolean hasAuditAllPri = sysFunctionService.hasPriviledge(user.getRoleId(), "审核全员日报");
-                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, creator_id, create_date, project_id,audit_dept_managerid,department_audit_state, project_auditor_id").in("id", ids));
+                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, creator_id, create_date, project_id,audit_dept_managerid,department_audit_state, project_auditor_id, is_dept_audit").in("id", ids));
                 allReports = reportList;
                 for (Report r : reportList) {
                     //直属领导审核或者部门负责人审核
                     Report newReport = new Report();
                     newReport.setId(r.getId());
-                    if(hasAuditAllPri || ((r.getProjectAuditorId() != null &&  user.getId().equals(r.getProjectAuditorId()))
-                            || (r.getProjectAuditorId() == null && user.getId().equals(r.getAuditDeptManagerid())))){
+                    if(hasAuditAllPri || ((r.getIsDeptAudit() == 0 &&  user.getId().equals(r.getProjectAuditorId()))
+                            || (r.getIsDeptAudit() == 1 && user.getId().equals(r.getAuditDeptManagerid())))){
                         r.setState(1);
                         r.setDepartmentAuditState(1);
                         r.setProjectAuditState(1);

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

@@ -363,7 +363,7 @@
                         v-if="!isBatch && user.timeType.syncCorpwxTime==1 && (workForm.createDate == today || !workForm.time || workForm.time.workHours <= 0)" icon="el-icon-refresh" 
                                 @click="refreshWXCardTime(workForm.createDate)"></el-button>
                         <!-- AI智能填报 -->
-                        <el-button type="primary" @click="getAIReport()" v-if="user.companyId == 7 || user.companyId == 10" size="mini" style="margin-left:5px;" >AI智能填报</el-button>
+                        <el-button type="primary" @click="getAIReport()" v-if="(user.companyId == 7 || user.companyId == 10) && !hasWrittenReport" size="mini" style="margin-left:5px;" >AI智能填报</el-button>
                     </el-form-item>
                     <!-- 000000 -->
                     <div v-for="(domain, index) in workForm.domains" :key="domain.id" :style="index>0?'margin-top:10px;':''">
@@ -630,7 +630,7 @@
                                 </el-select>
                                 <template v-if="user.timeType.mainProjectState != 1">
                                 <span  v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
-                                    style="margin-left:45px;"><span v-if="user.timeType.subProMustFill==1" style="color:red;">*</span>{{$t('lable.subproject')}}</span>{{$t('lable.subproject')}}
+                                    style="margin-left:45px;"><span v-if="user.timeType.subProMustFill==1" style="color:red;">*</span>{{$t('lable.subproject')}}</span>
                                 <!--子项目 -->
                                 <el-select v-model="domain.subProjectId" :placeholder="$t('defaultText.PleaseSelectaSub-item')" style="width:200px;margin-left:10px;" clearable="true"
                                 v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
@@ -1713,6 +1713,7 @@
         },
         data() {
             return {
+                hasWrittenReport: false,
                 today:null,
                 syncTimeLoading: false,
                 seluserText: '',
@@ -4592,7 +4593,8 @@
                         //从后端接口的数据设置是否是周末，后端会判断节假日以及中航工业一周6天工作日的情况
                         this.isWeekend = !this.report.isWorkDay;
                         
-                        this.canCancelInDialog = false
+                        this.canCancelInDialog = false;
+                        this.hasWrittenReport = list.report.length != 0;
                         if(list.report.length != 0) {
                             var arr = [];
                             this.canEdit = false;