|
|
@ -60,6 +60,9 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private YysRequisitionReportService yysRequisitionReportService;
|
|
|
|
private YysRequisitionReportService yysRequisitionReportService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private YysClassesService yysClassesService;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
|
|
|
|
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
|
|
|
|
return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
|
|
|
|
return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
|
|
|
@ -434,6 +437,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
List<YysProdReportEntity> reportEntityList = yysProdReportService.list();
|
|
|
|
List<YysProdReportEntity> reportEntityList = yysProdReportService.list();
|
|
|
|
Map<String, List<YysProdReportEntity>> prodMap = reportEntityList.stream().collect(Collectors.groupingBy(YysProdReportEntity::getWorkId));
|
|
|
|
Map<String, List<YysProdReportEntity>> prodMap = reportEntityList.stream().collect(Collectors.groupingBy(YysProdReportEntity::getWorkId));
|
|
|
|
//进行平均分配
|
|
|
|
//进行平均分配
|
|
|
|
|
|
|
|
//查询班次
|
|
|
|
|
|
|
|
Map<String, String> classCollect = yysClassesService.list().stream().collect(Collectors.toMap(YysClassesEntity::getId, YysClassesEntity::getClassesName));
|
|
|
|
List<ConfirmResponse> result = Lists.newArrayList();
|
|
|
|
List<ConfirmResponse> result = Lists.newArrayList();
|
|
|
|
for (Map.Entry<String, List<YysDayWorkEntity>> entry : rootMap.entrySet()) {
|
|
|
|
for (Map.Entry<String, List<YysDayWorkEntity>> entry : rootMap.entrySet()) {
|
|
|
|
if (resultMap.containsKey(entry.getKey())) {
|
|
|
|
if (resultMap.containsKey(entry.getKey())) {
|
|
|
@ -441,6 +446,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
List<YysDayWorkEntity> collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayWorkEntity::getSort)).collect(Collectors.toList());
|
|
|
|
List<YysDayWorkEntity> collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayWorkEntity::getSort)).collect(Collectors.toList());
|
|
|
|
for (YysDayWorkEntity dayWork : collected) {
|
|
|
|
for (YysDayWorkEntity dayWork : collected) {
|
|
|
|
ConfirmResponse confirmResponse = BeanUtil.copyProperties(dayWork, ConfirmResponse.class);
|
|
|
|
ConfirmResponse confirmResponse = BeanUtil.copyProperties(dayWork, ConfirmResponse.class);
|
|
|
|
|
|
|
|
confirmResponse.setClassName(classCollect.get(dayWork.getPost()));
|
|
|
|
confirmResponse.setGroupName(yysGroupEntity.getGroupName());
|
|
|
|
confirmResponse.setGroupName(yysGroupEntity.getGroupName());
|
|
|
|
if (prodMap.containsKey(dayWork.getId())) {
|
|
|
|
if (prodMap.containsKey(dayWork.getId())) {
|
|
|
|
confirmResponse.setProdReportList(prodMap.get(dayWork.getId()));
|
|
|
|
confirmResponse.setProdReportList(prodMap.get(dayWork.getId()));
|
|
|
|