工时报告接口

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

@@ -300,6 +300,7 @@ public class ReportController {
                                     .setContent(content[i])
                                     .setDegreeId(degreeId[i])
                                     .setState(0)
+                                    .setCompanyId(user.getCompanyId())
                                     .setPicAdd(pics!=null?pics[i]:null)
                                     .setStage(stage != null && stage.length > 0 && !StringUtil.isEmpty(stage[i])?stage[i]:null)
                                     .setCreateDate(localStartDate)
@@ -337,6 +338,7 @@ public class ReportController {
                                         .setDegreeId(degreeId[i])
                                         .setStage(stage!=null && stage.length > 0  && !StringUtil.isEmpty(stage[i])?stage[i]:null)
                                         .setState(1)//代填，直接是审核通过状态
+                                        .setCompanyId(user.getCompanyId())
                                         .setPicAdd(pics!=null?pics[i]:null)
                                         .setCreateDate(localStartDate)
                                         .setCreatorId(subsUser.getId());
@@ -389,6 +391,7 @@ public class ReportController {
                                 .setDegreeId(degreeId[i])
                                 .setStage(stage!=null && stage.length > 0  && !StringUtil.isEmpty(stage[i])?stage[i]:null)
                                 .setState(0)
+                                .setCompanyId(user.getCompanyId())
                                 .setPicAdd(pics!=null?pics[i]:null)
                                 .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                                 .setCreatorId(token);
@@ -430,6 +433,7 @@ public class ReportController {
                                     .setDegreeId(degreeId[i])
                                     .setStage(stage!=null && stage.length > 0  && !StringUtil.isEmpty(stage[i])?stage[i]:null)
                                     .setState(1)//代填的就直接审核通过了
+                                    .setCompanyId(user.getCompanyId())
                                     .setPicAdd(pics!=null?pics[i]:null)
                                     .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                                     .setCreatorId(subsUser.getId());
@@ -461,7 +465,6 @@ public class ReportController {
                             }
                         }
                     }
-
                 }
             }
         } catch (NullPointerException e) {

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

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2021-12-18
+ * @since 2021-12-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -208,6 +208,12 @@ public class Report extends Model<Report> {
 
     @TableField(exist = false)
     private List<HashMap> degreeList;
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -56,6 +56,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Map<String, Object>> getOvertimeList(Integer companyId, String startDate, String endDate, Integer projectId);
 
-    List<Map<String, Object>> getDegreeCost(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId);
+    List<Map<String, Object>> getDegreeCost(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId, @Param("companyId") Integer companyId);
 
 }

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

@@ -1580,7 +1580,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getDegreeCost(String startDate, String endDate, Integer projectId, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = projectMapper.getDegreeCost(startDate, endDate, projectId);
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        msg.data = projectMapper.getDegreeCost(startDate, endDate, projectId, user.getCompanyId());
         return msg;
     }
 }

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

@@ -279,6 +279,7 @@
         left join report_extra_degree b on b.id = a.degree_id
         WHERE
          a.state = 1
+         and a.company_id = #{companyId}
          <if test="projectId != null">
              and a.project_id = #{projectId}
          </if>

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

@@ -29,11 +29,12 @@
         <result column="reject_username" property="rejectUsername" />
         <result column="reject_userid" property="rejectUserid" />
         <result column="degree_id" property="degreeId" />
+        <result column="company_id" property="companyId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, creator_id, project_id, create_date, working_time, content, state, create_time, time_type, cost, start_time, end_time, report_time_type, sub_project_id, task_id, is_overtime, progress, department_audit_state, stage, pic_str, multi_worktime, reject_reason, reject_username, reject_userid, degree_id
+        id, creator_id, project_id, create_date, working_time, content, state, create_time, time_type, cost, start_time, end_time, report_time_type, sub_project_id, task_id, is_overtime, progress, department_audit_state, stage, pic_str, multi_worktime, reject_reason, reject_username, reject_userid, degree_id, company_id
     </sql>