Browse Source

按周审核日报过滤功能

zhouyy 4 months ago
parent
commit
ff401410ca

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -636,6 +636,10 @@ public class TimeType extends Model<TimeType> {
     @TableField("project_progress_check")
     @TableField("project_progress_check")
     private Integer projectProgressCheck;
     private Integer projectProgressCheck;
 
 
+    /**按周审核日报过滤功能,0-不开启,1-开启*/
+    @TableField("weekly_charge_filter")
+    private Integer weeklyChargeFilter;
+
 
 
     @TableField(exist = false)
     @TableField(exist = false)
     private List<User> userList;
     private List<User> userList;

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

@@ -1876,6 +1876,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     }
                 }
                 }
             }
             }
+//            if(1 == timeType.getWeeklyChargeFilter()){
+//
+//            }
             httpRespMsg.data = nameList;
             httpRespMsg.data = nameList;
         } catch (NullPointerException e) {
         } catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");
             //httpRespMsg.setError("验证失败");