立项与成本-成本预算-完工成本填报新增

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysWgcbtbFubiao.java

@@ -33,6 +33,11 @@ public class XzdCbysWgcbtbFubiao extends BaseEntity {
      */
     private Long mainDocId;
 
+    /**
+     * 类型(1、成本明细，2、)
+     */
+    private Integer type;
+
     /**
      * 预算项编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysWgcbtbBo.java

@@ -8,8 +8,10 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 立项及成本-成本预算-完工成本填报业务对象 xzd_cbys_wgcbtb
@@ -110,5 +112,6 @@ public class XzdCbysWgcbtbBo extends BaseEntity {
      */
     private String fileId;
 
+    private List<XzdCbysWgcbtbFubiao>  xzdCbysWgcbtbFubiao;
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysWgcbtbFubiaoBo.java

@@ -32,6 +32,11 @@ public class XzdCbysWgcbtbFubiaoBo extends BaseEntity {
      */
     private Long mainDocId;
 
+    /**
+     * 类型(1、成本明细，2、)
+     */
+    private Integer type;
+
     /**
      * 预算项编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysWgcbtbFubiaoVo.java

@@ -42,6 +42,11 @@ public class XzdCbysWgcbtbFubiaoVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "外=键，指向单据基础信息表等主表")
     private Long mainDocId;
 
+    /**
+     * 类型(1、成本明细，2、)
+     */
+    private Integer type;
+
     /**
      * 预算项编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysWgcbtbVo.java

@@ -7,12 +7,13 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -134,5 +135,7 @@ public class XzdCbysWgcbtbVo implements Serializable {
     @ExcelProperty(value = "文件ID")
     private String fileId;
 
+    private List<XzdCbysWgcbtbFubiao> xzdCbysWgcbtbFubiao;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysWgcbtbServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.xzd.costProjectApproval.costBudget.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysWgcbtbFubiaoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysWgcbtbBo;
 import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysWgcbtbVo;
@@ -32,6 +35,9 @@ public class XzdCbysWgcbtbServiceImpl extends ServiceImpl<XzdCbysWgcbtbMapper, X
 
     private final XzdCbysWgcbtbMapper baseMapper;
 
+    @Autowired
+    private IXzdCbysWgcbtbFubiaoService fubiaoService;
+
     /**
      * 查询立项及成本-成本预算-完工成本填报
      *
@@ -105,6 +111,11 @@ public class XzdCbysWgcbtbServiceImpl extends ServiceImpl<XzdCbysWgcbtbMapper, X
         if (flag) {
             bo.setId(add.getId());
         }
+        if (bo.getXzdCbysWgcbtbFubiao() == null || bo.getXzdCbysWgcbtbFubiao().isEmpty()) {
+            throw new ServiceException("成本明细不能为空");
+        }
+        bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocId(add.getId());});
+        fubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao());
         return flag;
     }