直接费相关

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbDirectExpenseController.java

@@ -61,5 +61,13 @@ public class CbDirectExpenseController extends BaseController {
         return toAjax(baseService.addExpense(addBo));
     }
 
+    /***
+     * 删除直接费费用项
+     */
+    @GetMapping("/deleteExpense/{id}")
+    public R<Void> deleteExpense(@NotNull(message = "ID不能为空") @PathVariable Long id) {
+        return toAjax(baseService.deleteExpense(id));
+    }
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbDirectExpenseDataDetailVo.java

@@ -19,5 +19,4 @@ public class CbDirectExpenseDataDetailVo extends CbDirectExpense {
      * 子集
      */
     private List<CbDirectExpenseDataDetailVo> childrenList = new ArrayList<>();
-    ;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbDirectExpenseService.java

@@ -46,4 +46,12 @@ public interface CbDirectExpenseService extends IService<CbDirectExpense> {
      * @return 新增结果
      */
     Integer addExpense(AddCbDirectExpenseBo addBo);
+
+    /**
+     * 删除直接费费用项
+     *
+     * @param id 费用ID
+     * @return 删除结果
+     */
+    Integer deleteExpense(Long id);
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbDirectExpenseServiceImpl.java

@@ -263,7 +263,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
     @Transactional(rollbackFor = Exception.class)
     public Integer addExpense(AddCbDirectExpenseBo addBo) {
         //校验清是否存在
-        CbDirectExpense qing = this.checkQingExist(addBo.getQingId());
+        CbDirectExpense qing = this.checkExpenseExist(addBo.getQingId());
         CbDirectExpense directExpense = BeanUtil.toBean(addBo, CbDirectExpense.class);
 
         //排序设为清下面最后一条
@@ -298,6 +298,21 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
         return baseMapper.insert(directExpense);
     }
 
+    /**
+     * 删除直接费费用项
+     *
+     * @param id 费用ID
+     * @return 删除结果
+     */
+    @Override
+    public Integer deleteExpense(Long id) {
+        //校验费用项是否存在
+        CbDirectExpense directExpense = this.checkExpenseExist(id);
+        Assert.isFalse(directExpense.getIsImport(), "不允许删除导入数据");
+
+        return baseMapper.deleteById(id);
+    }
+
 
     /**
      * 校验项目是否存在
@@ -314,12 +329,12 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
     /**
      * 校验清是否存在
      *
-     * @param qingId 清ID
+     * @param id 费用ID
      * @return 数据实体
      */
-    private CbDirectExpense checkQingExist(Long qingId) {
-        CbDirectExpense qing = baseMapper.selectById(qingId);
-        Assert.notNull(qing, "清ID无效");
-        return qing;
+    private CbDirectExpense checkExpenseExist(Long id) {
+        CbDirectExpense directExpense = baseMapper.selectById(id);
+        Assert.notNull(directExpense, "ID无效");
+        return directExpense;
     }
 }