日报待审核增加部门的审核人显示

fhKeeper/formulahousekeeper/management-platform/build_package.bat

@@ -1 +1,3 @@
-mvn package
+mvn package
+cd target
+ren timesheet-3.4.0.jar timesheet.jar

fhKeeper/formulahousekeeper/management-platform/pom.xml

@@ -10,8 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.hssx.parent</groupId>
-    <artifactId>management-platform</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>timesheet</artifactId>
+    <version>3.4.0</version>
 
     <dependencies>
         <dependency>

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

@@ -766,6 +766,21 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         return httpRespMsg;
     }
 
+    //保存撤销的操作
+    private void saveCancelLog(String reportIds, User operator) {
+        List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(reportIds);
+        List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().in("id", ids));
+        Report report = reportList.get(0);
+        ReportLog log = new ReportLog();
+        log.setCreatorId(report.getCreatorId());
+        log.setCreateDate(report.getCreateDate());
+        log.setOperatorId(operator.getId());
+        log.setMsg(operator.getName()+"撤销了日报");
+        log.setCompanyId(report.getCompanyId());
+        log.setReportIds(reportIds);
+        reportLogMapper.insert(log);
+    }
+
     //保存提交日报的记录
     private void saveFillReportLog(List<Report> reportList) {
         Report r = reportList.get(0);
@@ -805,6 +820,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         Report r = reportList.get(0);
         List<ReportLog> addLogList = new ArrayList<>();
         Integer companyId = r.getCompanyId();
+//        List<Integer> projectIds = reportList.stream().map(Report::getProjectId).collect(Collectors.toList());
+//        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id, project_name").in("id", projectIds));
         //操作审核通过
         for (Report report : reportList) {
             ReportLog log = new ReportLog();
@@ -927,6 +944,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         if (reportMapper.delete(queryWrapper) == 0) {
             httpRespMsg.setError("操作失败");
+        } else {
+            //删除日报的日志
+            reportLogMapper.delete(new QueryWrapper<ReportLog>().eq("creator_id", userId).eq("create_date", date));
         }
         return httpRespMsg;
     }
@@ -1009,6 +1029,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 map2.put("state", list2.get(0).get("state"));
                 map2.put("auditDeptName", list2.get(0).get("auditDeptName"));
                 map2.put("isDeptAudit", list2.get(0).get("isDeptAudit"));
+                map2.put("deptAuditorName", list2.get(0).get("deptAuditorName"));
                 //增加填报人所属部门
                 map2.put("departmentName", list2.get(0).get("departmentName"));
             }
@@ -1986,6 +2007,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         if (cnt == 0) {
             msg.setError("只有待审核状态的报告才能撤回");
+        } else {
+            //记录撤销操作
+            saveCancelLog(reportIds, user);
         }
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -243,13 +243,14 @@
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
-        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText
+        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
         left join department on department.department_id = a.audit_deptid
+        left join user dept_manager on dept_manager.id = a.audit_dept_managerid
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         WHERE 1=1
@@ -272,7 +273,7 @@
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
-        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText
+        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName
         FROM report AS a
         left join user on user.id = a.creator_id
         JOIN project AS b ON a.project_id=b.id
@@ -280,6 +281,7 @@
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
         left join department on department.department_id = a.audit_deptid
+        left join user dept_manager on dept_manager.id = a.audit_dept_managerid
         left join department dept on dept.department_id = a.dept_id
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
@@ -349,13 +351,14 @@
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
-        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText
+        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
         left join department on department.department_id = a.audit_deptid
+        left join user dept_manager on dept_manager.id = a.audit_dept_managerid
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         WHERE 1=1

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

@@ -67,8 +67,8 @@
 
         <!-- 按部门/项目筛选 -->
         <el-select v-if="ins == 10" v-model="departmentOrProject" placeholder="请选择" size="small" @change="selcts(10)" style="margin-left:10px;width:120px">
-          <el-option label="按部门筛选" :value="0"></el-option>
-          <el-option label="按项目筛选" :value="1"></el-option>
+          <el-option label="查看项目审核人" :value="1"></el-option>
+          <el-option label="查看部门审核人" :value="0"></el-option>
         </el-select>
         <!-- 项目筛选 -->
         <el-select v-if="(ins != 4 && ins != 8 && ins != 9 && ins != 10) || (ins == 10 && departmentOrProject == 1)" v-model="proJuctId" placeholder="请选择项目" clearable filterable size="small" @change="selcts()" style="margin-left:10px">
@@ -651,7 +651,7 @@ export default {
       departmentList: [],
       departmentIdArray: [],
       selUserList: [],
-      departmentOrProject: 0
+      departmentOrProject: 1
 
     };
   },

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

@@ -2442,6 +2442,7 @@ a {
                                 type: "success"
                             });
                             this.getList();
+                            this.addFormVisible = false;
                         } else {
                             this.$message({
                                 message: res.msg,

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

@@ -115,7 +115,7 @@
                                     <!-- <span :style="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5?'color:red':''">{{item1.reportTime}}h</span> -->
                                     <span >{{item1.reportTime}}</span>h
                                 </span>
-                                <span class="approvalProcessBox">
+                                <span class="approvalProcessBox" v-if="user.timeType.showFillauditTime == 1">
                                     <i class="iconfont firerock-iconliucheng1"></i>
                                     <span class="approvalProcessClick" @click="getApprovalProcess(item1)">审批流程</span>
                                 </span>

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

@@ -72,7 +72,7 @@
                                                     </span>
                                                 </span>
                                                 <span v-else-if="item.isDeptAudit==1">
-                                                    {{('待'+item.auditDeptName+'审核')}}
+                                                    {{('待'+item.auditDeptName+('('+item.deptAuditorName+')')+'审核')}}
                                                 </span>
                                                  ]
                                 </span>
@@ -148,7 +148,7 @@
             </el-table-column>
             <el-table-column prop="state" label="状态" sortable>
                 <template slot-scope="scope">
-                    <span v-if="scope.row.state == 0" style="color:#DAA520;">{{scope.row.isDeptAudit==0?'待项目审核人审核':('待'+scope.row.auditDeptName+'审核')}}</span>
+                    <span v-if="scope.row.state == 0" style="color:#DAA520;">{{scope.row.isDeptAudit==0?'待项目审核人审核':('待'+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+'审核')}}</span>
                     <span v-else-if="scope.row.state == 1" style="color:#32CD32;">已通过</span>
                     <span v-else-if="scope.row.state == 2" style="color:#FF0000;">已驳回</span>
                 </template>