|
|
@ -489,7 +489,9 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (CollectionUtils.isNotEmpty(request.getPackageReportList())) {
|
|
|
|
if (CollectionUtils.isNotEmpty(request.getPackageReportList())) {
|
|
|
|
for (YysPackageReportEntity entity : request.getPackageReportList()) {
|
|
|
|
for (YysPackageReportEntity entity : request.getPackageReportList()) {
|
|
|
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
BeanUtil.copyProperties(request, entity);
|
|
|
|
BeanUtil.copyProperties(request, entity);
|
|
|
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
entity.setWorkId(request.getId());
|
|
|
|
entity.setWorkId(request.getId());
|
|
|
|
entity.setStatus("1");
|
|
|
|
entity.setStatus("1");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -497,7 +499,9 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (CollectionUtils.isNotEmpty(request.getRequisitionReportList())) {
|
|
|
|
if (CollectionUtils.isNotEmpty(request.getRequisitionReportList())) {
|
|
|
|
for (YysRequisitionReportEntity entity : request.getRequisitionReportList()) {
|
|
|
|
for (YysRequisitionReportEntity entity : request.getRequisitionReportList()) {
|
|
|
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
BeanUtil.copyProperties(request, entity);
|
|
|
|
BeanUtil.copyProperties(request, entity);
|
|
|
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
entity.setWorkId(request.getId());
|
|
|
|
entity.setWorkId(request.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
|
|
|
|
requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
|
|
|
|