已填工时情况表增加状态颜色显示

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

@@ -1189,7 +1189,7 @@ public class ReportController {
                     double sum = reportList.stream().filter(rl -> rl.getCreateDate().equals(report.getCreateDate()) && rl.getCreatorId().equals(report.getCreatorId())).mapToDouble(Report::getWorkingTime).sum();
                     BigDecimal bigDecimal=new BigDecimal(sum);
                     bigDecimal=bigDecimal.subtract(new BigDecimal(comTimeType.getAllday()));
-                    if(report.getOvertimeHours() != null && report.getOvertimeHours()>0 && Math.abs(report.getOvertimeHours()-bigDecimal.doubleValue()) > 0.001){
+                    if(report.getOvertimeHours() != null && report.getOvertimeHours()>0 && report.getOvertimeHours()-bigDecimal.doubleValue() > 0.001){
                         httpRespMsg.setError("加班时长不得超过总工作时长-正常工作时长");
                         return httpRespMsg;
                     }

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

@@ -4385,10 +4385,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             String deptId = String.valueOf(data.get("deptId"));
             String corpwxUserId = (String) data.get("corpwxUserId");
             Integer corpwxDeptId = (Integer) data.get("corpwxDeptId");
+            Integer state = (Integer) data.get("state");
             Map<String, Object> map = new HashMap<>();
             String date = new SimpleDateFormat("yyyy-MM-dd").format((Date)data.get("createDate"));
             map.put("workingTime", data.get("workingTime"));
             map.put("createDate", date);
+            map.put("state", state);
             if (id.equals(lastUserId)) {
                 //同一个用户的数据
                 lastUserData.worktimeList.add(map);

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

@@ -892,7 +892,7 @@
         WHERE r.create_date BETWEEN #{startDate} AND #{endDate} AND r.creator_id = #{userId} GROUP BY r.create_date
     </select>
     <select id="getUserDailyWorkTime" resultType="java.util.Map">
-        SELECT user.id, user.name,department.department_name as departmentName,department.department_id as deptId,department.corpwx_deptid as corpwxDeptId, report.create_date as createDate, sum(working_time) as workingTime,user.inactive_date as inactiveDate,user.corpwx_userid as corpwxUserId
+        SELECT user.id, user.name,department.department_name as departmentName,department.department_id as deptId,department.corpwx_deptid as corpwxDeptId, report.create_date as createDate,IF (MAX(report.state) = 1, MIN(report.state), MAX(report.state)) AS state, sum(working_time) as workingTime,user.inactive_date as inactiveDate,user.corpwx_userid as corpwxUserId
         FROM user
         left join report on user.id = report.creator_id
         left join department on department.department_id = user.department_id

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

@@ -1446,9 +1446,9 @@
                 this.containerHeight = window.innerHeight - 130
                 // this.containerHeight = window.innerHeight - 200
             };
-            if(this.permissions.countCost){
+            if(this.permissions.countCost && !this.permissions.countHours){
                 this.yAxisValue = '0'
-            }else{
+            }else {
                 this.yAxisValue = '1'
             }
             if (this.user.timeType.fixMonthcost == 0) {

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

@@ -2568,12 +2568,21 @@
                     const filterData = worktimeList.filter(item => item.createDate == dateSingle)
 
                     const isWorkDate = filterData[0] && filterData[0].workingTime
-                    if(isWorkDate < times) {
-                        return "backgroundColor: #FC3D49"
-                    }
-                    if(isWorkDate > times) {
-                        return "backgroundColor: #20a0ff"
+                    const state = filterData[0] && filterData[0].state
+                    if (state == 1) {
+                        //审核通过
+                        return "backgroundColor: #32CD32"
+                    } else if (state == 2) {
+                        return "backgroundColor: #FF0000"
+                    } else {
+                        if(isWorkDate < times) {
+                            return "backgroundColor: #FC3D49"
+                        }
+                        if(isWorkDate > times) {
+                            return "backgroundColor: #20a0ff"
+                        }
                     }
+                    
                 }
             },
             // 判断当前账号是否有某一块定制权限（返回 boolean 类型）