wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-09-22 11:42:04 +08:00
parent 36972f257f
commit c097dca611
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/app/controller/ReportResultController.java
View File

@ -60,9 +60,9 @@ public class ReportResultController extends AbstractController{
}
ReportChartResp data = new ReportChartResp();
//月初目标
List<GraphicsStatisticalDto> start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),monthTime,"");
List<GraphicsStatisticalDto> start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),monthTime,departmentId);
//月末结果
List<GraphicsStatisticalDto> end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),monthTime,"");
List<GraphicsStatisticalDto> end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),monthTime,departmentId);
//人员等级分布
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId);
int total = staffService.countStaffByAllDeparmentIds(allDeparmentIds);

7
src/main/java/com/lz/modules/app/service/StaffService.java
View File

@ -78,18 +78,11 @@ public interface StaffService extends IService<StaffEntity> {
List<StaffEntity> selectBySearchName(IPage page, FindByNameModel nameModel);
SysUserEntity getUser(String userName);
<<<<<<< HEAD
//查询部门下的所有子部门
List<String> selectAllDeparmentIdsByDepartmentParentId(String departmentId);
//统计部门下的人数
int countStaffByAllDeparmentIds(List<String> deparmentIds);
=======
//查询部门下的所有人员 包括子部门下人员
List<Long> selectAllStaffByDepartmentId(String departmentId);
List<StaffEntity> selectAll();
>>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
}

6
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -56,11 +56,5 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
List<GraphicsStatisticalDto> staffDistribution(@Param("monthTime") String monthTime);
<<<<<<< HEAD
=======
List<ChartDto> departmentDistribution(@Param("monthTime") String monthTime);
ResultRecord selectResultRecordByStaffIdStatus(@Param("staffId") Long staffId, @Param("status") int status);
>>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
}

9
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -80,19 +80,10 @@ public interface ResultRecordService extends IService<ResultRecord> {
*/
List<GraphicsStatisticalDto> staffDistribution(String monthTime);
<<<<<<< HEAD
=======
/**
* 部门等级占比
* @param monthTime
* @return
*/
List<ChartDto> departmentDistribution(String monthTime);
Map<String, List<DepartmentsEntity>> getStringListMap(List<DepartmentsEntity> tDepartments);
ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status);
R reject( ResultRecord resultRecord,ResultRecordReq req, Long userId);
>>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
}