未提交人员列表增加待提交和已驳回的人员

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

@@ -7432,7 +7432,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<User> allRangeUserList = new ArrayList<>();
         Integer companyId = user.getCompanyId();
         TimeType timeType = timeTypeMapper.selectById(companyId);
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
         //获取部门的所有子部门
         List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
         List<Integer> branchDepartment = null;
@@ -7442,7 +7441,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<Map<String, Object>> list = null;
         //分角色权限：管理员看全部的，部门负责人看自己部门的，个人只能看自己的。
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全公司工时");
-        boolean hasDeptWorktimePriv = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看本部门工时").size() > 0;
         if (functionList.size() == 0) {
             List<Integer> allVisibleDeptIdList = getAllVisibleDeptIdList(user, null);
             //检查是不是部门负责人
@@ -7534,7 +7532,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     continue;
                 }
                 final String dateStr = dtf.format(date);
-                if (!list.stream().anyMatch(item->item.get("id").equals(curUser.getId())&&sdf.format((java.sql.Date)item.get("createDate")).equals(dateStr))) {
+                if (!list.stream().anyMatch(item->((Integer)item.get("state") == 0 || (Integer)item.get("state") == 1) && item.get("id").equals(curUser.getId())&&sdf.format((java.sql.Date)item.get("createDate")).equals(dateStr))) {
                     UserDailyWorkItem noRecord = new UserDailyWorkItem();
                     noRecord.userId = curUser.getId();
                     noRecord.departmentId = curUser.getDepartmentId();

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

@@ -1767,7 +1767,13 @@
               :label="$t('state.states')"
               align="center"
               prop="status"
-            />
+            >
+            <template slot-scope="scope">
+                    <span v-if="scope.row.status == '待提交'" style="color:orange" >{{ scope.row.status }}</span>
+                    <span v-else-if="scope.row.status == '已驳回'" style="color:red" >{{ scope.row.status }}</span>
+                    <span v-else >{{ scope.row.status }}</span>
+                </template>
+            </el-table-column>
             <el-table-column
               min-width="200"
               :label="$t('other.attendanceData')"