新版预算修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetOtherController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcBudgetOther;
+import com.ruoyi.oa.service.ICmcBudgetOtherService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc预算外开支Controller
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+@RestController
+@RequestMapping("/oa/other")
+public class CmcBudgetOtherController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetOtherService cmcBudgetOtherService;
+
+    /**
+     * 查询cmc预算外开支列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetOther cmcBudgetOther)
+    {
+        startPage();
+        List<CmcBudgetOther> list = cmcBudgetOtherService.selectCmcBudgetOtherList(cmcBudgetOther);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc预算外开支列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:export')")
+    @Log(title = "cmc预算外开支", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetOther cmcBudgetOther)
+    {
+        List<CmcBudgetOther> list = cmcBudgetOtherService.selectCmcBudgetOtherList(cmcBudgetOther);
+        ExcelUtil<CmcBudgetOther> util = new ExcelUtil<CmcBudgetOther>(CmcBudgetOther.class);
+        util.exportExcel(response, list, "cmc预算外开支数据");
+    }
+
+    /**
+     * 获取cmc预算外开支详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:query')")
+    @GetMapping(value = "/{expenseId}")
+    public AjaxResult getInfo(@PathVariable("expenseId") Long expenseId)
+    {
+        return success(cmcBudgetOtherService.selectCmcBudgetOtherByExpenseId(expenseId));
+    }
+
+    /**
+     * 新增cmc预算外开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:add')")
+    @Log(title = "cmc预算外开支", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetOther cmcBudgetOther)
+    {
+        return toAjax(cmcBudgetOtherService.insertCmcBudgetOther(cmcBudgetOther));
+    }
+
+    /**
+     * 修改cmc预算外开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:edit')")
+    @Log(title = "cmc预算外开支", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetOther cmcBudgetOther)
+    {
+        return toAjax(cmcBudgetOtherService.updateCmcBudgetOther(cmcBudgetOther));
+    }
+
+    /**
+     * 删除cmc预算外开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:other:remove')")
+    @Log(title = "cmc预算外开支", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{expenseIds}")
+    public AjaxResult remove(@PathVariable Long[] expenseIds)
+    {
+        return toAjax(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(expenseIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSiteController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcBudgetSite;
+import com.ruoyi.oa.service.ICmcBudgetSiteService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc现场开支Controller
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+@RestController
+@RequestMapping("/oa/site")
+public class CmcBudgetSiteController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetSiteService cmcBudgetSiteService;
+
+    /**
+     * 查询cmc现场开支列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetSite cmcBudgetSite)
+    {
+        startPage();
+        List<CmcBudgetSite> list = cmcBudgetSiteService.selectCmcBudgetSiteList(cmcBudgetSite);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc现场开支列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:export')")
+    @Log(title = "cmc现场开支", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetSite cmcBudgetSite)
+    {
+        List<CmcBudgetSite> list = cmcBudgetSiteService.selectCmcBudgetSiteList(cmcBudgetSite);
+        ExcelUtil<CmcBudgetSite> util = new ExcelUtil<CmcBudgetSite>(CmcBudgetSite.class);
+        util.exportExcel(response, list, "cmc现场开支数据");
+    }
+
+    /**
+     * 获取cmc现场开支详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:query')")
+    @GetMapping(value = "/{expenseId}")
+    public AjaxResult getInfo(@PathVariable("expenseId") Long expenseId)
+    {
+        return success(cmcBudgetSiteService.selectCmcBudgetSiteByExpenseId(expenseId));
+    }
+
+    /**
+     * 新增cmc现场开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:add')")
+    @Log(title = "cmc现场开支", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetSite cmcBudgetSite)
+    {
+        return toAjax(cmcBudgetSiteService.insertCmcBudgetSite(cmcBudgetSite));
+    }
+
+    /**
+     * 修改cmc现场开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:edit')")
+    @Log(title = "cmc现场开支", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetSite cmcBudgetSite)
+    {
+        return toAjax(cmcBudgetSiteService.updateCmcBudgetSite(cmcBudgetSite));
+    }
+
+    /**
+     * 删除cmc现场开支
+     */
+    @PreAuthorize("@ss.hasPermi('oa:site:remove')")
+    @Log(title = "cmc现场开支", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{expenseIds}")
+    public AjaxResult remove(@PathVariable Long[] expenseIds)
+    {
+        return toAjax(cmcBudgetSiteService.deleteCmcBudgetSiteByExpenseIds(expenseIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudget.java

@@ -147,6 +147,34 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dszTime;
 
+    /** 保函费用 */
+    @Excel(name = "保函费用")
+    private BigDecimal letterExpense;
+
+    /** 中标服务费 */
+    @Excel(name = "中标服务费")
+    private BigDecimal winExpense;
+
+    /** 管理出差费用 */
+    @Excel(name = "管理出差费用")
+    private BigDecimal travelExpense;
+
+    /** 内业核算绩效总额 */
+    @Excel(name = "内业核算绩效总额")
+    private BigDecimal settleAdjust;
+
+    /** 保函费用备注 */
+    @Excel(name = "保函费用备注")
+    private String letterRemark;
+
+    /** 管理出差费用备注 */
+    @Excel(name = "管理出差费用备注")
+    private String travelRemark;
+
+    /** 中标服务费备注 */
+    @Excel(name = "中标服务费备注")
+    private String winRemark;
+
     /** 预算附件 */
     @Excel(name = "预算附件")
     private String document;
@@ -493,6 +521,69 @@ public class CmcBudget extends BaseEntity
     {
         return document;
     }
+    public void setLetterExpense(BigDecimal letterExpense)
+    {
+        this.letterExpense = letterExpense;
+    }
+
+    public BigDecimal getLetterExpense()
+    {
+        return letterExpense;
+    }
+    public void setWinExpense(BigDecimal winExpense)
+    {
+        this.winExpense = winExpense;
+    }
+
+    public BigDecimal getWinExpense()
+    {
+        return winExpense;
+    }
+    public void setTravelExpense(BigDecimal travelExpense)
+    {
+        this.travelExpense = travelExpense;
+    }
+
+    public BigDecimal getTravelExpense()
+    {
+        return travelExpense;
+    }
+    public void setSettleAdjust(BigDecimal settleAdjust)
+    {
+        this.settleAdjust = settleAdjust;
+    }
+
+    public BigDecimal getSettleAdjust()
+    {
+        return settleAdjust;
+    }
+    public void setLetterRemark(String letterRemark)
+    {
+        this.letterRemark = letterRemark;
+    }
+
+    public String getLetterRemark()
+    {
+        return letterRemark;
+    }
+    public void setTravelRemark(String travelRemark)
+    {
+        this.travelRemark = travelRemark;
+    }
+
+    public String getTravelRemark()
+    {
+        return travelRemark;
+    }
+    public void setWinRemark(String winRemark)
+    {
+        this.winRemark = winRemark;
+    }
+
+    public String getWinRemark()
+    {
+        return winRemark;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java

@@ -57,6 +57,18 @@ public class CmcBudgetCar extends BaseEntity
     @Excel(name = "使用成本")
     private BigDecimal expense;
 
+    /** 核算天数 */
+    @Excel(name = "核算天数")
+    private Long daysAdjust;
+
+    /** 预算金额 */
+    @Excel(name = "预算金额")
+    private BigDecimal amount;
+
+    /** 核算金额 */
+    @Excel(name = "核算金额")
+    private BigDecimal amountAdjust;
+
     public void setBudgetCarId(Long budgetCarId)
     {
         this.budgetCarId = budgetCarId;
@@ -156,6 +168,33 @@ public class CmcBudgetCar extends BaseEntity
     {
         return toll;
     }
+    public void setDaysAdjust(Long daysAdjust)
+    {
+        this.daysAdjust = daysAdjust;
+    }
+
+    public Long getDaysAdjust()
+    {
+        return daysAdjust;
+    }
+    public void setAmount(BigDecimal amount)
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount()
+    {
+        return amount;
+    }
+    public void setAmountAdjust(BigDecimal amountAdjust)
+    {
+        this.amountAdjust = amountAdjust;
+    }
+
+    public BigDecimal getAmountAdjust()
+    {
+        return amountAdjust;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetDevice.java

@@ -37,6 +37,18 @@ public class CmcBudgetDevice extends BaseEntity
     @Excel(name = "折旧成本")
     private BigDecimal depreciation;
 
+    /** 核算天数 */
+    @Excel(name = "核算天数")
+    private Long daysAdjust;
+
+    /** 预算金额 */
+    @Excel(name = "预算金额")
+    private BigDecimal amount;
+
+    /** 核算金额 */
+    @Excel(name = "核算金额")
+    private BigDecimal amountAdjust;
+
     public void setBudgetDeviceId(Long budgetDeviceId)
     {
         this.budgetDeviceId = budgetDeviceId;
@@ -91,6 +103,34 @@ public class CmcBudgetDevice extends BaseEntity
     {
         return depreciation;
     }
+    public void setDaysAdjust(Long daysAdjust)
+    {
+        this.daysAdjust = daysAdjust;
+    }
+
+    public Long getDaysAdjust()
+    {
+        return daysAdjust;
+    }
+    public void setAmount(BigDecimal amount)
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount()
+    {
+        return amount;
+    }
+    public void setAmountAdjust(BigDecimal amountAdjust)
+    {
+        this.amountAdjust = amountAdjust;
+    }
+
+    public BigDecimal getAmountAdjust()
+    {
+        return amountAdjust;
+    }
+
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetOther.java

@@ -0,0 +1,81 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc预算外开支对象 cmc_budget_other
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public class CmcBudgetOther extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 现场开支id */
+    private Long expenseId;
+
+    /** 预算id */
+    @Excel(name = "预算id")
+    private String budgetId;
+
+    /** 开支名称 */
+    @Excel(name = "开支名称")
+    private String name;
+
+    /** 核算开支 */
+    @Excel(name = "核算开支")
+    private BigDecimal amountAdjust;
+
+    public void setExpenseId(Long expenseId) 
+    {
+        this.expenseId = expenseId;
+    }
+
+    public Long getExpenseId() 
+    {
+        return expenseId;
+    }
+    public void setBudgetId(String budgetId) 
+    {
+        this.budgetId = budgetId;
+    }
+
+    public String getBudgetId() 
+    {
+        return budgetId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setAmountAdjust(BigDecimal amountAdjust) 
+    {
+        this.amountAdjust = amountAdjust;
+    }
+
+    public BigDecimal getAmountAdjust() 
+    {
+        return amountAdjust;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("expenseId", getExpenseId())
+            .append("budgetId", getBudgetId())
+            .append("name", getName())
+            .append("amountAdjust", getAmountAdjust())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetSite.java

@@ -0,0 +1,95 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc现场开支对象 cmc_budget_site
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public class CmcBudgetSite extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 现场开支id */
+    private Long expenseId;
+
+    /** 预算id */
+    @Excel(name = "预算id")
+    private String budgetId;
+
+    /** 开支名称 */
+    @Excel(name = "开支名称")
+    private String name;
+
+    /** 开支金额 */
+    @Excel(name = "开支金额")
+    private BigDecimal amount;
+
+    /** 核算开支 */
+    @Excel(name = "核算开支")
+    private BigDecimal amountAdjust;
+
+    public void setExpenseId(Long expenseId) 
+    {
+        this.expenseId = expenseId;
+    }
+
+    public Long getExpenseId() 
+    {
+        return expenseId;
+    }
+    public void setBudgetId(String budgetId) 
+    {
+        this.budgetId = budgetId;
+    }
+
+    public String getBudgetId() 
+    {
+        return budgetId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setAmount(BigDecimal amount) 
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount() 
+    {
+        return amount;
+    }
+    public void setAmountAdjust(BigDecimal amountAdjust) 
+    {
+        this.amountAdjust = amountAdjust;
+    }
+
+    public BigDecimal getAmountAdjust() 
+    {
+        return amountAdjust;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("expenseId", getExpenseId())
+            .append("budgetId", getBudgetId())
+            .append("name", getName())
+            .append("amount", getAmount())
+            .append("amountAdjust", getAmountAdjust())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java

@@ -42,6 +42,38 @@ public class CmcBudgetStaff extends BaseEntity
     @Excel(name = "人员成本")
     private BigDecimal staffCost;
 
+    /** 作业类别 */
+    @Excel(name = "作业类别")
+    private String type;
+
+    /** 核算天数 */
+    @Excel(name = "核算天数")
+    private Long daysAdjust;
+
+    /** 预算绩效 */
+    @Excel(name = "预算绩效")
+    private BigDecimal performance;
+
+    /** 核算绩效 */
+    @Excel(name = "核算绩效")
+    private BigDecimal performanceAdjust;
+
+    /** 预算系数 */
+    @Excel(name = "预算系数")
+    private String coefficient;
+
+    /** 核算系数 */
+    @Excel(name = "核算系数")
+    private String coefficientAdjust;
+
+    /** 预算金额 */
+    @Excel(name = "预算金额")
+    private BigDecimal amount;
+
+    /** 核算金额 */
+    @Excel(name = "核算金额")
+    private BigDecimal amountAdjust;
+
     public void setBudgetStaffId(Long budgetStaffId)
     {
         this.budgetStaffId = budgetStaffId;
@@ -105,6 +137,78 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return salary;
     }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public void setDaysAdjust(Long daysAdjust)
+    {
+        this.daysAdjust = daysAdjust;
+    }
+
+    public Long getDaysAdjust()
+    {
+        return daysAdjust;
+    }
+    public void setPerformance(BigDecimal performance)
+    {
+        this.performance = performance;
+    }
+
+    public BigDecimal getPerformance()
+    {
+        return performance;
+    }
+    public void setPerformanceAdjust(BigDecimal performanceAdjust)
+    {
+        this.performanceAdjust = performanceAdjust;
+    }
+
+    public BigDecimal getPerformanceAdjust()
+    {
+        return performanceAdjust;
+    }
+    public void setCoefficient(String coefficient)
+    {
+        this.coefficient = coefficient;
+    }
+
+    public String getCoefficient()
+    {
+        return coefficient;
+    }
+    public void setCoefficientAdjust(String coefficientAdjust)
+    {
+        this.coefficientAdjust = coefficientAdjust;
+    }
+
+    public String getCoefficientAdjust()
+    {
+        return coefficientAdjust;
+    }
+    public void setAmount(BigDecimal amount)
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount()
+    {
+        return amount;
+    }
+    public void setAmountAdjust(BigDecimal amountAdjust)
+    {
+        this.amountAdjust = amountAdjust;
+    }
+
+    public BigDecimal getAmountAdjust()
+    {
+        return amountAdjust;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcBudgetOtherMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBudgetOther;
+
+/**
+ * cmc预算外开支Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public interface CmcBudgetOtherMapper 
+{
+    /**
+     * 查询cmc预算外开支
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return cmc预算外开支
+     */
+    public CmcBudgetOther selectCmcBudgetOtherByExpenseId(Long expenseId);
+
+    /**
+     * 查询cmc预算外开支列表
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return cmc预算外开支集合
+     */
+    public List<CmcBudgetOther> selectCmcBudgetOtherList(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 新增cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    public int insertCmcBudgetOther(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 修改cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    public int updateCmcBudgetOther(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 删除cmc预算外开支
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return 结果
+     */
+    public int deleteCmcBudgetOtherByExpenseId(Long expenseId);
+
+    /**
+     * 批量删除cmc预算外开支
+     * 
+     * @param expenseIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcBudgetSiteMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBudgetSite;
+
+/**
+ * cmc现场开支Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public interface CmcBudgetSiteMapper 
+{
+    /**
+     * 查询cmc现场开支
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return cmc现场开支
+     */
+    public CmcBudgetSite selectCmcBudgetSiteByExpenseId(Long expenseId);
+
+    /**
+     * 查询cmc现场开支列表
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return cmc现场开支集合
+     */
+    public List<CmcBudgetSite> selectCmcBudgetSiteList(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 新增cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    public int insertCmcBudgetSite(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 修改cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    public int updateCmcBudgetSite(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 删除cmc现场开支
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return 结果
+     */
+    public int deleteCmcBudgetSiteByExpenseId(Long expenseId);
+
+    /**
+     * 批量删除cmc现场开支
+     * 
+     * @param expenseIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcBudgetOtherService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBudgetOther;
+
+/**
+ * cmc预算外开支Service接口
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public interface ICmcBudgetOtherService 
+{
+    /**
+     * 查询cmc预算外开支
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return cmc预算外开支
+     */
+    public CmcBudgetOther selectCmcBudgetOtherByExpenseId(Long expenseId);
+
+    /**
+     * 查询cmc预算外开支列表
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return cmc预算外开支集合
+     */
+    public List<CmcBudgetOther> selectCmcBudgetOtherList(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 新增cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    public int insertCmcBudgetOther(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 修改cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    public int updateCmcBudgetOther(CmcBudgetOther cmcBudgetOther);
+
+    /**
+     * 批量删除cmc预算外开支
+     * 
+     * @param expenseIds 需要删除的cmc预算外开支主键集合
+     * @return 结果
+     */
+    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds);
+
+    /**
+     * 删除cmc预算外开支信息
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return 结果
+     */
+    public int deleteCmcBudgetOtherByExpenseId(Long expenseId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcBudgetSiteService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBudgetSite;
+
+/**
+ * cmc现场开支Service接口
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+public interface ICmcBudgetSiteService 
+{
+    /**
+     * 查询cmc现场开支
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return cmc现场开支
+     */
+    public CmcBudgetSite selectCmcBudgetSiteByExpenseId(Long expenseId);
+
+    /**
+     * 查询cmc现场开支列表
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return cmc现场开支集合
+     */
+    public List<CmcBudgetSite> selectCmcBudgetSiteList(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 新增cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    public int insertCmcBudgetSite(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 修改cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    public int updateCmcBudgetSite(CmcBudgetSite cmcBudgetSite);
+
+    /**
+     * 批量删除cmc现场开支
+     * 
+     * @param expenseIds 需要删除的cmc现场开支主键集合
+     * @return 结果
+     */
+    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds);
+
+    /**
+     * 删除cmc现场开支信息
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return 结果
+     */
+    public int deleteCmcBudgetSiteByExpenseId(Long expenseId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBudgetOtherServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcBudgetOtherMapper;
+import com.ruoyi.oa.domain.CmcBudgetOther;
+import com.ruoyi.oa.service.ICmcBudgetOtherService;
+
+/**
+ * cmc预算外开支Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+@Service
+public class CmcBudgetOtherServiceImpl implements ICmcBudgetOtherService 
+{
+    @Autowired
+    private CmcBudgetOtherMapper cmcBudgetOtherMapper;
+
+    /**
+     * 查询cmc预算外开支
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return cmc预算外开支
+     */
+    @Override
+    public CmcBudgetOther selectCmcBudgetOtherByExpenseId(Long expenseId)
+    {
+        return cmcBudgetOtherMapper.selectCmcBudgetOtherByExpenseId(expenseId);
+    }
+
+    /**
+     * 查询cmc预算外开支列表
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return cmc预算外开支
+     */
+    @Override
+    public List<CmcBudgetOther> selectCmcBudgetOtherList(CmcBudgetOther cmcBudgetOther)
+    {
+        return cmcBudgetOtherMapper.selectCmcBudgetOtherList(cmcBudgetOther);
+    }
+
+    /**
+     * 新增cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBudgetOther(CmcBudgetOther cmcBudgetOther)
+    {
+        return cmcBudgetOtherMapper.insertCmcBudgetOther(cmcBudgetOther);
+    }
+
+    /**
+     * 修改cmc预算外开支
+     * 
+     * @param cmcBudgetOther cmc预算外开支
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBudgetOther(CmcBudgetOther cmcBudgetOther)
+    {
+        return cmcBudgetOtherMapper.updateCmcBudgetOther(cmcBudgetOther);
+    }
+
+    /**
+     * 批量删除cmc预算外开支
+     * 
+     * @param expenseIds 需要删除的cmc预算外开支主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds)
+    {
+        return cmcBudgetOtherMapper.deleteCmcBudgetOtherByExpenseIds(expenseIds);
+    }
+
+    /**
+     * 删除cmc预算外开支信息
+     * 
+     * @param expenseId cmc预算外开支主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBudgetOtherByExpenseId(Long expenseId)
+    {
+        return cmcBudgetOtherMapper.deleteCmcBudgetOtherByExpenseId(expenseId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBudgetSiteServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcBudgetSiteMapper;
+import com.ruoyi.oa.domain.CmcBudgetSite;
+import com.ruoyi.oa.service.ICmcBudgetSiteService;
+
+/**
+ * cmc现场开支Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-05-09
+ */
+@Service
+public class CmcBudgetSiteServiceImpl implements ICmcBudgetSiteService 
+{
+    @Autowired
+    private CmcBudgetSiteMapper cmcBudgetSiteMapper;
+
+    /**
+     * 查询cmc现场开支
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return cmc现场开支
+     */
+    @Override
+    public CmcBudgetSite selectCmcBudgetSiteByExpenseId(Long expenseId)
+    {
+        return cmcBudgetSiteMapper.selectCmcBudgetSiteByExpenseId(expenseId);
+    }
+
+    /**
+     * 查询cmc现场开支列表
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return cmc现场开支
+     */
+    @Override
+    public List<CmcBudgetSite> selectCmcBudgetSiteList(CmcBudgetSite cmcBudgetSite)
+    {
+        return cmcBudgetSiteMapper.selectCmcBudgetSiteList(cmcBudgetSite);
+    }
+
+    /**
+     * 新增cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBudgetSite(CmcBudgetSite cmcBudgetSite)
+    {
+        return cmcBudgetSiteMapper.insertCmcBudgetSite(cmcBudgetSite);
+    }
+
+    /**
+     * 修改cmc现场开支
+     * 
+     * @param cmcBudgetSite cmc现场开支
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBudgetSite(CmcBudgetSite cmcBudgetSite)
+    {
+        return cmcBudgetSiteMapper.updateCmcBudgetSite(cmcBudgetSite);
+    }
+
+    /**
+     * 批量删除cmc现场开支
+     * 
+     * @param expenseIds 需要删除的cmc现场开支主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds)
+    {
+        return cmcBudgetSiteMapper.deleteCmcBudgetSiteByExpenseIds(expenseIds);
+    }
+
+    /**
+     * 删除cmc现场开支信息
+     * 
+     * @param expenseId cmc现场开支主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBudgetSiteByExpenseId(Long expenseId)
+    {
+        return cmcBudgetSiteMapper.deleteCmcBudgetSiteByExpenseId(expenseId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetCarMapper.xml

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="expense"    column="expense"    />
         <result property="toll"    column="toll"    />
         <result property="remark"    column="remark"    />
+        <result property="daysAdjust"    column="days_adjust"    />
+        <result property="amount"    column="amount"    />
+        <result property="amountAdjust"    column="amount_adjust"    />
         <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
         <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
     </resultMap>
@@ -36,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, c.fuel, c.insurance, c.maintenance, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, c.fuel, c.insurance, c.maintenance, bc.days,
+               bc.depreciation, bc.distance, bc.mileage, bc.toll, bc.expense, bc.remark, bc.days_adjust, bc.amount, bc.amount_adjust from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
         left join sys_user as u on c.driver = u.user_id
     </sql>
@@ -73,6 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expense != null">expense,</if>
             <if test="toll != null">toll,</if>
             <if test="remark != null">remark,</if>
+            <if test="daysAdjust != null">days_adjust,</if>
+            <if test="amount != null">amount,</if>
+            <if test="amountAdjust != null">amount_adjust,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetCarId != null">#{budgetCarId},</if>
@@ -85,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expense != null">#{expense},</if>
             <if test="toll != null">#{toll},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="daysAdjust != null">#{daysAdjust},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="amountAdjust != null">#{amountAdjust},</if>
          </trim>
     </insert>
 
@@ -100,6 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="toll != null">toll = #{toll},</if>
             <if test="expense != null">expense = #{expense},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="daysAdjust != null">days_adjust = #{daysAdjust},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
         </trim>
         where budget_car_id = #{budgetCarId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetDeviceMapper.xml

@@ -11,6 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="days"    column="days"    />
         <result property="depreciation"    column="depreciation"    />
         <result property="remark"    column="remark"    />
+        <result property="daysAdjust"    column="days_adjust"    />
+        <result property="amount"    column="amount"    />
+        <result property="amountAdjust"    column="amount_adjust"    />
         <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
     </resultMap>
 
@@ -24,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetDeviceVo">
-        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, d.day_cost, bd.device_id, bd.days, bd.depreciation, bd.remark from cmc_budget_device as bd
+        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, d.day_cost, bd.device_id, bd.days, bd.depreciation,
+               bd.remark, bd.days_adjust, bd.amount, bd.amount_adjust from cmc_budget_device as bd
         left join cmc_device as d on d.device_id = bd.device_id
     </sql>
 
@@ -52,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">days,</if>
             <if test="depreciation != null">depreciation,</if>
             <if test="remark != null">remark,</if>
+            <if test="daysAdjust != null">days_adjust,</if>
+            <if test="amount != null">amount,</if>
+            <if test="amountAdjust != null">amount_adjust,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetDeviceId != null">#{budgetDeviceId},</if>
@@ -60,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">#{days},</if>
             <if test="depreciation != null">#{depreciation},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="daysAdjust != null">#{daysAdjust},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="amountAdjust != null">#{amountAdjust},</if>
          </trim>
     </insert>
 
@@ -71,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">days = #{days},</if>
             <if test="depreciation != null">depreciation = #{depreciation},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="daysAdjust != null">days_adjust = #{daysAdjust},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
         </trim>
         where budget_device_id = #{budgetDeviceId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml

@@ -37,6 +37,13 @@
         <result property="createTime"    column="create_time"    />
         <result property="remark"    column="remark"    />
         <result property="document"    column="document"    />
+        <result property="letterExpense"    column="letter_expense"    />
+        <result property="winExpense"    column="win_expense"    />
+        <result property="travelExpense"    column="travel_expense"    />
+        <result property="settleAdjust"    column="settle_adjust"    />
+        <result property="letterRemark"    column="letter_remark"    />
+        <result property="travelRemark"    column="travel_remark"    />
+        <result property="winRemark"    column="win_remark"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
@@ -74,7 +81,7 @@
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
                b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler,
                u.nick_name as compiler_nick_name, b.manager, u1.nick_name as manager_nick_name, b.auditor, u2.nick_name as zjl_nick_name, b.approver, u3.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
-               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document from cmc_budget as b
+               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document, b.letter_expense, b.win_expense, b.travel_expense, b.settle_adjust, b.letter_remark, b.travel_remark, b.win_remark from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.manager
             left join sys_user as u2 on u2.user_id = b.auditor
@@ -142,6 +149,13 @@
             <if test="dszComment != null">dsz_comment,</if>
             <if test="remark != null">remark,</if>
             <if test="document != null">document,</if>
+            <if test="letterExpense != null">letter_expense,</if>
+            <if test="winExpense != null">win_expense,</if>
+            <if test="travelExpense != null">travel_expense,</if>
+            <if test="settleAdjust != null">settle_adjust,</if>
+            <if test="letterRemark != null">letter_remark,</if>
+            <if test="travelRemark != null">travel_remark,</if>
+            <if test="winRemark != null">win_remark,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -176,6 +190,13 @@
             <if test="dszComment != null">#{dszComment},</if>
             <if test="remark != null">#{remark},</if>
             <if test="document != null">#{document},</if>
+            <if test="letterExpense != null">#{letterExpense},</if>
+            <if test="winExpense != null">#{winExpense},</if>
+            <if test="travelExpense != null">#{travelExpense},</if>
+            <if test="settleAdjust != null">#{settleAdjust},</if>
+            <if test="letterRemark != null">#{letterRemark},</if>
+            <if test="travelRemark != null">#{travelRemark},</if>
+            <if test="winRemark != null">#{winRemark},</if>
             sysdate()
         </trim>
     </insert>
@@ -214,6 +235,13 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="document != null">document = #{document},</if>
+            <if test="letterExpense != null">letter_expense = #{letterExpense},</if>
+            <if test="winExpense != null">win_expense = #{winExpense},</if>
+            <if test="travelExpense != null">travel_expense = #{travelExpense},</if>
+            <if test="settleAdjust != null">settle_adjust = #{settleAdjust},</if>
+            <if test="letterRemark != null">letter_remark = #{letterRemark},</if>
+            <if test="travelRemark != null">travel_remark = #{travelRemark},</if>
+            <if test="winRemark != null">win_remark = #{winRemark},</if>
         </trim>
         where budget_id = #{budgetId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetOtherMapper.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcBudgetOtherMapper">
+    
+    <resultMap type="CmcBudgetOther" id="CmcBudgetOtherResult">
+        <result property="expenseId"    column="expense_id"    />
+        <result property="budgetId"    column="budget_id"    />
+        <result property="name"    column="name"    />
+        <result property="amountAdjust"    column="amount_adjust"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcBudgetOtherVo">
+        select expense_id, budget_id, name, amount_adjust, remark from cmc_budget_other
+    </sql>
+
+    <select id="selectCmcBudgetOtherList" parameterType="CmcBudgetOther" resultMap="CmcBudgetOtherResult">
+        <include refid="selectCmcBudgetOtherVo"/>
+        <where>  
+            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="amountAdjust != null "> and amount_adjust = #{amountAdjust}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBudgetOtherByExpenseId" parameterType="Long" resultMap="CmcBudgetOtherResult">
+        <include refid="selectCmcBudgetOtherVo"/>
+        where expense_id = #{expenseId}
+    </select>
+        
+    <insert id="insertCmcBudgetOther" parameterType="CmcBudgetOther" useGeneratedKeys="true" keyProperty="expenseId">
+        insert into cmc_budget_other
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">budget_id,</if>
+            <if test="name != null">name,</if>
+            <if test="amountAdjust != null">amount_adjust,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">#{budgetId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="amountAdjust != null">#{amountAdjust},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBudgetOther" parameterType="CmcBudgetOther">
+        update cmc_budget_other
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="budgetId != null">budget_id = #{budgetId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where expense_id = #{expenseId}
+    </update>
+
+    <delete id="deleteCmcBudgetOtherByExpenseId" parameterType="Long">
+        delete from cmc_budget_other where expense_id = #{expenseId}
+    </delete>
+
+    <delete id="deleteCmcBudgetOtherByExpenseIds" parameterType="String">
+        delete from cmc_budget_other where expense_id in 
+        <foreach item="expenseId" collection="array" open="(" separator="," close=")">
+            #{expenseId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetSiteMapper.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcBudgetSiteMapper">
+    
+    <resultMap type="CmcBudgetSite" id="CmcBudgetSiteResult">
+        <result property="expenseId"    column="expense_id"    />
+        <result property="budgetId"    column="budget_id"    />
+        <result property="name"    column="name"    />
+        <result property="amount"    column="amount"    />
+        <result property="amountAdjust"    column="amount_adjust"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcBudgetSiteVo">
+        select expense_id, budget_id, name, amount, amount_adjust, remark from cmc_budget_site
+    </sql>
+
+    <select id="selectCmcBudgetSiteList" parameterType="CmcBudgetSite" resultMap="CmcBudgetSiteResult">
+        <include refid="selectCmcBudgetSiteVo"/>
+        <where>  
+            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="amountAdjust != null "> and amount_adjust = #{amountAdjust}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBudgetSiteByExpenseId" parameterType="Long" resultMap="CmcBudgetSiteResult">
+        <include refid="selectCmcBudgetSiteVo"/>
+        where expense_id = #{expenseId}
+    </select>
+        
+    <insert id="insertCmcBudgetSite" parameterType="CmcBudgetSite" useGeneratedKeys="true" keyProperty="expenseId">
+        insert into cmc_budget_site
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">budget_id,</if>
+            <if test="name != null">name,</if>
+            <if test="amount != null">amount,</if>
+            <if test="amountAdjust != null">amount_adjust,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">#{budgetId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="amountAdjust != null">#{amountAdjust},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBudgetSite" parameterType="CmcBudgetSite">
+        update cmc_budget_site
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="budgetId != null">budget_id = #{budgetId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where expense_id = #{expenseId}
+    </update>
+
+    <delete id="deleteCmcBudgetSiteByExpenseId" parameterType="Long">
+        delete from cmc_budget_site where expense_id = #{expenseId}
+    </delete>
+
+    <delete id="deleteCmcBudgetSiteByExpenseIds" parameterType="String">
+        delete from cmc_budget_site where expense_id in 
+        <foreach item="expenseId" collection="array" open="(" separator="," close=")">
+            #{expenseId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetStaffMapper.xml

@@ -11,6 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="days"    column="days"    />
         <result property="staffCost"    column="staff_cost"    />
         <result property="remark"    column="remark"    />
+        <result property="type"    column="type"    />
+        <result property="daysAdjust"    column="days_adjust"    />
+        <result property="performance"    column="performance"    />
+        <result property="performanceAdjust"    column="performance_adjust"    />
+        <result property="coefficient"    column="coefficient"    />
+        <result property="coefficientAdjust"    column="coefficient_adjust"    />
+        <result property="amount"    column="amount"    />
+        <result property="amountAdjust"    column="amount_adjust"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
     </resultMap>
@@ -31,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.dept_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark from cmc_budget_staff as bs
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.dept_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark,
+               bs.type, bs.days_adjust, bs.performance, bs.performance_adjust, bs.coefficient, bs.coefficient_adjust, bs.amount, bs.amount_adjust from cmc_budget_staff as bs
         left join sys_user as u on u.user_id = bs.user_id
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
     </sql>
@@ -60,6 +69,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">days,</if>
             <if test="staffCost != null">staff_cost,</if>
             <if test="remark != null">remark,</if>
+            <if test="type != null">type,</if>
+            <if test="daysAdjust != null">days_adjust,</if>
+            <if test="performance != null">performance,</if>
+            <if test="performanceAdjust != null">performance_adjust,</if>
+            <if test="coefficient != null">coefficient,</if>
+            <if test="coefficientAdjust != null">coefficient_adjust,</if>
+            <if test="amount != null">amount,</if>
+            <if test="amountAdjust != null">amount_adjust,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetStaffId != null">#{budgetStaffId},</if>
@@ -68,6 +85,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">#{days},</if>
             <if test="staffCost != null">#{staffCost},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="type != null">#{type},</if>
+            <if test="daysAdjust != null">#{daysAdjust},</if>
+            <if test="performance != null">#{performance},</if>
+            <if test="performanceAdjust != null">#{performanceAdjust},</if>
+            <if test="coefficient != null">#{coefficient},</if>
+            <if test="coefficientAdjust != null">#{coefficientAdjust},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="amountAdjust != null">#{amountAdjust},</if>
          </trim>
     </insert>
 
@@ -79,6 +104,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="days != null">days = #{days},</if>
             <if test="staffCost != null">staff_cost = #{staffCost},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="daysAdjust != null">days_adjust = #{daysAdjust},</if>
+            <if test="performance != null">performance = #{performance},</if>
+            <if test="performanceAdjust != null">performance_adjust = #{performanceAdjust},</if>
+            <if test="coefficient != null">coefficient = #{coefficient},</if>
+            <if test="coefficientAdjust != null">coefficient_adjust = #{coefficientAdjust},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
         </trim>
         where budget_staff_id = #{budgetStaffId}
     </update>

oa-back/sql/sq.sql

@@ -1,18 +1,45 @@
-alter table cmc_car add column insurance decimal(10,2) default null comment '保险';
-alter table cmc_car add column maintenance decimal(10,2) default null comment '维修';
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5177U', `insurance` = 11, `maintenance` = 35.00 WHERE `car_id` = 1;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1081W', `insurance` = 13, `maintenance` = 60.00 WHERE `car_id` = 2;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A2239Q', `insurance` = 8, `maintenance` = 46.00 WHERE `car_id` = 3;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1686T', `insurance` = 10, `maintenance` = 60.00 WHERE `car_id` = 4;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A0T282', `insurance` = 8, `maintenance` = 60.00 WHERE `car_id` = 5;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A9802U', `insurance` = 12, `maintenance` = 32.00 WHERE `car_id` = 6;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6106T', `insurance` = 11, `maintenance` = 10.00 WHERE `car_id` = 32;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AQ259W', `insurance` = 8, `maintenance` = 13.00 WHERE `car_id` = 8;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5U91Q', `insurance` = 8, `maintenance` = 46.00 WHERE `car_id` = 9;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AEX607', `insurance` = 7, `maintenance` = 8.00 WHERE `car_id` = 10;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A99L3B', `insurance` = 6, `maintenance` = 14.00 WHERE `car_id` = 11;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6692U', `insurance` = 9, `maintenance` = 10.00 WHERE `car_id` = 12;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川GAR907', `insurance` = 8, `maintenance` = 7.00 WHERE `car_id` = 13;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A3760U', `insurance` = 10, `maintenance` = 10.00 WHERE `car_id` = 14;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1950R', `insurance` = 10, `maintenance` = 10.00 WHERE `car_id` = 15;
+alter table cmc_budget add column letter_expense	decimal(10,2) default null	comment '保函费用';
+alter table cmc_budget add column letter_remark	varchar(255) default null	comment '保函费用备注';
+alter table cmc_budget add column win_expense	decimal(10,2) default null	comment '中标服务费';
+alter table cmc_budget add column win_remark	varchar(255) default null	comment '中标服务费备注';
+alter table cmc_budget add column travel_expense	decimal(10,2) default null	comment '管理出差费用';
+alter table cmc_budget add column travel_remark	varchar(255) default null	comment '管理出差费用备注';
+alter table cmc_budget add column settle_adjust	decimal(10,2) default null	comment '内业核算绩效总额';
 
+alter table cmc_budget_staff add column type	char(2) default null	comment '作业类别';
+alter table cmc_budget_staff add column days_adjust	int default null	comment '核算天数';
+alter table cmc_budget_staff add column performance	decimal(10,2) default null	comment '预算绩效';
+alter table cmc_budget_staff add column performance_adjust	decimal(10,2) default null	comment '核算绩效';
+alter table cmc_budget_staff add column coefficient	varchar(5) default null	comment '预算系数';
+alter table cmc_budget_staff add column coefficient_adjust	varchar(5) default null	comment '核算系数';
+alter table cmc_budget_staff add column amount	decimal(10,2) default null	comment '预算金额';
+alter table cmc_budget_staff add column amount_adjust	decimal(10,2) default null	comment '核算金额';
+
+alter table cmc_budget_car add column days_adjust	int default null	comment '核算天数';
+alter table cmc_budget_car add column amount	decimal(10,2) default null	comment '预算金额';
+alter table cmc_budget_car add column amount_adjust	decimal(10,2) default null	comment '核算金额';
+
+alter table cmc_budget_device add column days_adjust	int default null	comment '核算天数';
+alter table cmc_budget_device add column amount	decimal(10,2) default null	comment '预算金额';
+alter table cmc_budget_device add column amount_adjust	decimal(10,2) default null	comment '核算金额';
+
+DROP TABLE IF EXISTS `cmc_budget_site`;
+CREATE TABLE `cmc_budget_site`  (
+  `expense_id` int NOT NULL AUTO_INCREMENT COMMENT '现场开支id',
+  `budget_id` char(19) DEFAULT NULL COMMENT '预算id',
+  `name` varchar(255) DEFAULT NULL COMMENT '开支名称',
+  `amount` decimal(10, 2) DEFAULT NULL COMMENT '开支金额',
+  `amount_adjust` decimal(10, 2) DEFAULT NULL COMMENT '核算开支',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`expense_id`)
+) ENGINE = InnoDB comment 'cmc现场开支表';
+
+DROP TABLE IF EXISTS `cmc_budget_other`;
+CREATE TABLE `cmc_budget_other`  (
+  `expense_id` int NOT NULL AUTO_INCREMENT COMMENT '现场开支id',
+  `budget_id` char(19) DEFAULT NULL COMMENT '预算id',
+  `name` varchar(255) DEFAULT NULL COMMENT '开支名称',
+  `amount_adjust` decimal(10, 2) DEFAULT NULL COMMENT '核算开支',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`expense_id`)
+) ENGINE = InnoDB comment 'cmc预算外开支表';