特殊过程任务处理详情接口

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));
+	}
+
 }

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<OemTaskBillMapper, O
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R handleOemTaskBill(HandleOemTaskBillEntity handleOemTaskBill) {
         OemTaskBillEntity oemTaskBillEntity = baseMapper.selectById(handleOemTaskBill.getOtbId());
         oemTaskBillEntity.setFillMemo(handleOemTaskBill.getFillMemo());
@@ -105,8 +107,10 @@ public class OemTaskBillServiceImpl extends BaseServiceImpl<OemTaskBillMapper, O
         baseMapper.updateById(oemTaskBillEntity);
         //存入上次处理时间
         OemSpecialProEntity oemSpecialProEntity = oemSpecialProMapper.selectById(oemTaskBillEntity.getSpId());
-        oemSpecialProEntity.setLastDueTime(new Date());
-        oemSpecialProMapper.updateById(oemSpecialProEntity);
+        if (null != oemSpecialProEntity) {
+            oemSpecialProEntity.setLastDueTime(new Date());
+            oemSpecialProMapper.updateById(oemSpecialProEntity);
+        }
         List<BsFillingDetailEntity> fillingDetailList = handleOemTaskBill.getFillingDetailList();
         if (null != fillingDetailList && fillingDetailList.size() > 0) {
             for (BsFillingDetailEntity fillingDetail : fillingDetailList) {