diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java index 7dc87cf0..8b50aeb9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java @@ -202,4 +202,14 @@ public class DsTaskBillController extends BladeController { return R.data(bsFillingDetailService.listFillingDetail(busId,BsFillingDetailEntity.DS_TASK_BILL)); } + /** + * 外协任务单表 详情 + */ + @GetMapping("/listOemFillingDetail") + @ApiOperationSupport(order = 12) + @Operation(summary = "外协任务单表", description = "传入dsTaskBill") + public R listOemFillingDetail(@RequestParam Long busId) { + return R.data(bsFillingDetailService.listFillingDetail(busId, BsFillingDetailEntity.OEM_PROCESS_TASK)); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java index 4e1dc02e..7767c8bb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.time.LocalDate; @@ -98,6 +99,7 @@ public class OemTaskBillServiceImpl extends BaseServiceImpl fillingDetailList = handleOemTaskBill.getFillingDetailList(); if (null != fillingDetailList && fillingDetailList.size() > 0) { for (BsFillingDetailEntity fillingDetail : fillingDetailList) {