timeType八爪鱼接口增加项目级别和日报审核类型

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

@@ -794,7 +794,6 @@ public class ReportController {
                 //计算本次填报的每个项目每个成本项合计的成本总额
                 for (Report report : reportList) {
                     //匹配当前项目的当前成本项已填的成本金额
-                    System.out.println("本次reportCost=="+report.getCost());
                     Optional<ProjectCurrentcost> first = projectCurrentcosts.stream().filter(p -> p.getProjectId().equals(report.getProjectId()) && p.getBaseId().equals(report.getBasecostId())).findFirst();
                     if (first.isPresent()) {
                         ProjectCurrentcost currentcost = first.get();

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

@@ -242,7 +242,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         queryWrapper);
             }
             List<Project> projectList = projectIPage.getRecords();
-            System.out.println(projectList);
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
             List<ProviderInfo> providerInfoList = providerInfoMapper.selectList(new QueryWrapper<ProviderInfo>().eq("company_id", companyId));
             List<ProviderCategory> providerCategoryList = providerCategoryMapper.selectList(new QueryWrapper<ProviderCategory>().eq("company_id", companyId));
@@ -298,7 +297,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }
                             map.put("providerInfoName",result);
                         }
-                        mapList.add(map);
+                        if (map.containsKey("providerCateGoryName")) {
+                            mapList.add(map);
+                        }
                     }
                     projectVO.setProviderInfoList(mapList);
                 }

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

@@ -677,7 +677,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     //新增或编辑报告
     @Override
     public HttpRespMsg editReport(List<Report> reportList, String date, List<User> userList, BigDecimal hourCost, Integer companyId) {
-        System.out.println("传过来的数据"+reportList.toString()+"=========="+reportList.size()+"===="+reportList.get(0));
+//        System.out.println("传过来的数据"+reportList.toString()+"=========="+reportList.size()+"===="+reportList.get(0));
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //删除不在本次更新名单中的老记录

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

@@ -407,7 +407,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             long total;
             List<Map<String, Object>> list;
             Page<User> page = new Page<>(pageIndex, pageSize);
-            System.out.println("pageSize==="+pageSize);
             if (departmentId == -1) {
                 //单独查找全部
                 list = userMapper.getUserByDepartment(page, companyId, null, keyword, status, roleId);

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-15
+ * @since 2022-07-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -270,6 +270,18 @@ public class TimeType extends Model<TimeType> {
     @TableField("main_project_state")
     private Integer mainProjectState;
 
+    /**
+     * 日报的审核类型， 0-项目审核人审核，1-分组负责人审核，2-先分组负责人审核再项目负责人(PM)审核
+     */
+    @TableField("report_audit_type")
+    private Integer reportAuditType;
+
+    /**
+     * 0-未开启 1-开启
+     */
+    @TableField("project_level_state")
+    private Integer projectLevelState;
+
 
     @Override
     protected Serializable pkVal() {