Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

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

@@ -412,12 +412,12 @@ public class ProjectController {
 
     //分页查询项目各个阶段的汇总工时成本
     @RequestMapping("/getProjectStagesCost")
-    public HttpRespMsg getProjectStagesCost(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, Integer projectId,String stageNames) {
-        return projectService.getProjectStagesCost(pageIndex, pageSize, projectId, request,stageNames);
+    public HttpRespMsg getProjectStagesCost(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, Integer projectId,String stageNames,String startDate,String endDate) {
+        return projectService.getProjectStagesCost(pageIndex, pageSize, projectId, request,stageNames,startDate,endDate);
     }
     @RequestMapping("/exportProjectStagesCost")
-    public HttpRespMsg exportProjectStagesCost(String stageNames) {
-        return projectService.exportProjectStagesCost(request,stageNames);
+    public HttpRespMsg exportProjectStagesCost(String stageNames,String startDate,String endDate) {
+        return projectService.exportProjectStagesCost(request,stageNames,startDate,endDate);
     }
     //导出项目任务报表
     @RequestMapping("/exportProjectTask")

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

@@ -13,6 +13,8 @@ public class ProjectWithStage {
     public Integer id;
     public String projectName;
     public String projectCode;
+    public String startDate;
+    public String endDate;
     //阶段的成本
     public List<StageCost> stageCostList;
 }

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

@@ -68,7 +68,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
     List<Map> getTaskPlanByProject(@Param("projectIds") List<Integer> projectIds, @Param("startDate") String startDate,
                                 @Param("endDate") String endDate, @Param("companyId") Integer companyId);
 
-    List<ProjectWithStage> selectWithStage(Integer companyId, Integer startIndex, Integer endIndex, Integer projectId,List<Integer> inchagerIds);
+    List<ProjectWithStage> selectWithStage(Integer companyId, Integer startIndex, Integer endIndex, Integer projectId,List<Integer> inchagerIds,String startDate,String endDate);
 
     List<Map<String, Object>> getTimeCostReport(@Param("companyId") Integer companyId, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                           @Param("projectId") Integer projectId,@Param("deptIds")List<Integer> deptIds);

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

@@ -99,9 +99,9 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType, HttpServletRequest request);
 
-    HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames);
+    HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames,String startDate,String endDate);
 
-    HttpRespMsg exportProjectStagesCost( HttpServletRequest request,String stageNames);
+    HttpRespMsg exportProjectStagesCost( HttpServletRequest request,String stageNames,String startDate,String endDate);
 
     HttpRespMsg getOvertimeList(OvertimeListVO overtimeListVO);
 

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

@@ -2598,7 +2598,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames) {
+    public HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames,String startDate,String endDate) {
         String token = request.getHeader("TOKEN");
         List<String> stageNameList=null;
         if(stageNames!=null){
@@ -2635,7 +2635,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             queryWrapper.in("id",inchagerIds);
         }
         Integer total = projectMapper.selectCount(queryWrapper);
-        List<ProjectWithStage> record = projectMapper.selectWithStage(companyId, startIndex, endIndex, projectId,inchagerIds);
+        List<ProjectWithStage> record = projectMapper.selectWithStage(companyId, startIndex, endIndex, projectId,inchagerIds,startDate,endDate);
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看阶段成本");
         if (functionList.size() == 0) {
             //去掉成本
@@ -2666,7 +2666,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg exportProjectStagesCost(HttpServletRequest request,String stageNames) {
+    public HttpRespMsg exportProjectStagesCost(HttpServletRequest request,String stageNames,String startDate,String endDate) {
         String token = request.getHeader("TOKEN");
         List<String> stageNameList=null;
         if(stageNames!=null){
@@ -2694,7 +2694,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 inchagerIds.add(-1);
             }
         }
-        List<ProjectWithStage> record = projectMapper.selectWithStage(companyId, null, null, null,inchagerIds);
+        List<ProjectWithStage> record = projectMapper.selectWithStage(companyId, null, null, null,inchagerIds,startDate,endDate);
         //获取全部的列
         List<Integer> collect = record.stream().map(ProjectWithStage::getId).collect(Collectors.toList());
         QueryWrapper<Stages> queryWrapper=new QueryWrapper<>();
@@ -4961,7 +4961,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else {
                         membRowData.add("");
                     }
-                    membRowData.add(String.valueOf(membMap.get("corpwxDeptId")==null?"":membMap.get("corpwxDeptId")));
+                    String s = String.valueOf(membMap.get("corpwxDeptId") == null ? "" : membMap.get("corpwxDeptId"));
+                    membRowData.add("$departmentName=" + s + "$");
                 }else {
                     membRowData.add((String)membMap.get("name"));
                     membRowData.add((String)membMap.get("departmentName"));

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

@@ -58,9 +58,11 @@
         <result column="id" property="id" />
         <result column="project_name" property="projectName" />
         <result column="project_code" property="projectCode" />
+        <result column="startDate" property="startDate" />
+        <result column="endDate" property="endDate" />
         <collection property="stageCostList"  javaType="java.util.ArrayList"
                     ofType="com.management.platform.entity.vo.StageCost"
-                    select="selectStageSum" column="projectId=id"></collection>
+                    select="selectStageSum" column="projectId=id,startDate,endDate"></collection>
     </resultMap>
     <resultMap id="CustomerResultMap" type="com.management.platform.entity.vo.CustomerProject" >
         <result column="customer_id" property="customerId" />
@@ -75,7 +77,8 @@
         <result column="project_names" property="projectNames" />
     </resultMap>
     <select id="selectWithStage" resultMap="BaseResultMap2" >
-        select id, project_code, project_name from project
+        select id, project_code, project_name,#{startDate} as startDate,#{endDate} as endDate
+        from project
         where company_id = #{companyId}
         <if test="projectId != null">
             and id = #{projectId}
@@ -97,6 +100,8 @@
 		IFNULL((SELECT SUM(stages.`stages_time`) from stages WHERE stages.stages_name = report.stage  GROUP BY stages_name), 0)  AS stages_time
         FROM report
 				where report.state = 1 and report.`project_id` = #{projectId}
+				and report.create_date &gt;= #{startDate}
+                and report.create_date &lt;= #{endDate}
         GROUP BY report.stage
     </select>
     <!--获取查询者所在公司每个项目的工时成本-->