1新增品牌项目支付、保证金审批、成果归档、项目结算四个流程

2修改部分接口

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcArchive;
+import com.ruoyi.oa.service.ICmcArchiveService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc成果归档Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/archive")
+public class CmcArchiveController extends BaseController
+{
+    @Autowired
+    private ICmcArchiveService cmcArchiveService;
+
+    /**
+     * 查询cmc成果归档列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcArchive cmcArchive)
+    {
+        startPage();
+        List<CmcArchive> list = cmcArchiveService.selectCmcArchiveList(cmcArchive);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc成果归档列表
+     */
+    @Log(title = "cmc成果归档", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcArchive cmcArchive)
+    {
+        List<CmcArchive> list = cmcArchiveService.selectCmcArchiveList(cmcArchive);
+        ExcelUtil<CmcArchive> util = new ExcelUtil<CmcArchive>(CmcArchive.class);
+        util.exportExcel(response, list, "cmc成果归档数据");
+    }
+
+    /**
+     * 获取cmc成果归档详细信息
+     */
+    @GetMapping(value = "/{archiveId}")
+    public AjaxResult getInfo(@PathVariable("archiveId") String archiveId)
+    {
+        return success(cmcArchiveService.selectCmcArchiveByArchiveId(archiveId));
+    }
+
+    /**
+     * 新增cmc成果归档
+     */
+    @Log(title = "cmc成果归档", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcArchive cmcArchive)
+    {
+        return toAjax(cmcArchiveService.insertCmcArchive(cmcArchive));
+    }
+
+    /**
+     * 修改cmc成果归档
+     */
+    @Log(title = "cmc成果归档", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcArchive cmcArchive)
+    {
+        return toAjax(cmcArchiveService.updateCmcArchive(cmcArchive));
+    }
+
+    /**
+     * 删除cmc成果归档
+     */
+    @Log(title = "cmc成果归档", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{archiveIds}")
+    public AjaxResult remove(@PathVariable String[] archiveIds)
+    {
+        return toAjax(cmcArchiveService.deleteCmcArchiveByArchiveIds(archiveIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcBrand;
+import com.ruoyi.oa.service.ICmcBrandService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc品牌项目支付审批Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/brand")
+public class CmcBrandController extends BaseController
+{
+    @Autowired
+    private ICmcBrandService cmcBrandService;
+
+    /**
+     * 查询cmc品牌项目支付审批列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBrand cmcBrand)
+    {
+        startPage();
+        List<CmcBrand> list = cmcBrandService.selectCmcBrandList(cmcBrand);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc品牌项目支付审批列表
+     */
+    @Log(title = "cmc品牌项目支付审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBrand cmcBrand)
+    {
+        List<CmcBrand> list = cmcBrandService.selectCmcBrandList(cmcBrand);
+        ExcelUtil<CmcBrand> util = new ExcelUtil<CmcBrand>(CmcBrand.class);
+        util.exportExcel(response, list, "cmc品牌项目支付审批数据");
+    }
+
+    /**
+     * 获取cmc品牌项目支付审批详细信息
+     */
+    @GetMapping(value = "/{brandId}")
+    public AjaxResult getInfo(@PathVariable("brandId") String brandId)
+    {
+        return success(cmcBrandService.selectCmcBrandByBrandId(brandId));
+    }
+
+    /**
+     * 新增cmc品牌项目支付审批
+     */
+    @Log(title = "cmc品牌项目支付审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBrand cmcBrand)
+    {
+        return toAjax(cmcBrandService.insertCmcBrand(cmcBrand));
+    }
+
+    /**
+     * 修改cmc品牌项目支付审批
+     */
+    @Log(title = "cmc品牌项目支付审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBrand cmcBrand)
+    {
+        return toAjax(cmcBrandService.updateCmcBrand(cmcBrand));
+    }
+
+    /**
+     * 删除cmc品牌项目支付审批
+     */
+    @Log(title = "cmc品牌项目支付审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{brandIds}")
+    public AjaxResult remove(@PathVariable String[] brandIds)
+    {
+        return toAjax(cmcBrandService.deleteCmcBrandByBrandIds(brandIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcBrandPayment;
+import com.ruoyi.oa.service.ICmcBrandPaymentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc品牌项目支付记录Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/brandPayment")
+public class CmcBrandPaymentController extends BaseController
+{
+    @Autowired
+    private ICmcBrandPaymentService cmcBrandPaymentService;
+
+    /**
+     * 查询cmc品牌项目支付记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBrandPayment cmcBrandPayment)
+    {
+        startPage();
+        List<CmcBrandPayment> list = cmcBrandPaymentService.selectCmcBrandPaymentList(cmcBrandPayment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc品牌项目支付记录列表
+     */
+    @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBrandPayment cmcBrandPayment)
+    {
+        List<CmcBrandPayment> list = cmcBrandPaymentService.selectCmcBrandPaymentList(cmcBrandPayment);
+        ExcelUtil<CmcBrandPayment> util = new ExcelUtil<CmcBrandPayment>(CmcBrandPayment.class);
+        util.exportExcel(response, list, "cmc品牌项目支付记录数据");
+    }
+
+    /**
+     * 获取cmc品牌项目支付记录详细信息
+     */
+    @GetMapping(value = "/{brandId}")
+    public AjaxResult getInfo(@PathVariable("brandId") String brandId)
+    {
+        return success(cmcBrandPaymentService.selectCmcBrandPaymentByBrandId(brandId));
+    }
+
+    /**
+     * 新增cmc品牌项目支付记录
+     */
+    @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBrandPayment cmcBrandPayment)
+    {
+        return toAjax(cmcBrandPaymentService.insertCmcBrandPayment(cmcBrandPayment));
+    }
+
+    /**
+     * 修改cmc品牌项目支付记录
+     */
+    @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBrandPayment cmcBrandPayment)
+    {
+        return toAjax(cmcBrandPaymentService.updateCmcBrandPayment(cmcBrandPayment));
+    }
+
+    /**
+     * 删除cmc品牌项目支付记录
+     */
+    @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{brandIds}")
+    public AjaxResult remove(@PathVariable String[] brandIds)
+    {
+        return toAjax(cmcBrandPaymentService.deleteCmcBrandPaymentByBrandIds(brandIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcBrandProject;
+import com.ruoyi.oa.service.ICmcBrandProjectService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc品牌项目Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/brandProject")
+public class CmcBrandProjectController extends BaseController
+{
+    @Autowired
+    private ICmcBrandProjectService cmcBrandProjectService;
+
+    /**
+     * 查询cmc品牌项目列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBrandProject cmcBrandProject)
+    {
+        startPage();
+        List<CmcBrandProject> list = cmcBrandProjectService.selectCmcBrandProjectList(cmcBrandProject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc品牌项目列表
+     */
+    @Log(title = "cmc品牌项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBrandProject cmcBrandProject)
+    {
+        List<CmcBrandProject> list = cmcBrandProjectService.selectCmcBrandProjectList(cmcBrandProject);
+        ExcelUtil<CmcBrandProject> util = new ExcelUtil<CmcBrandProject>(CmcBrandProject.class);
+        util.exportExcel(response, list, "cmc品牌项目数据");
+    }
+
+    /**
+     * 获取cmc品牌项目详细信息
+     */
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
+    {
+        return success(cmcBrandProjectService.selectCmcBrandProjectByProjectId(projectId));
+    }
+
+    /**
+     * 新增cmc品牌项目
+     */
+    @Log(title = "cmc品牌项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBrandProject cmcBrandProject)
+    {
+        return toAjax(cmcBrandProjectService.insertCmcBrandProject(cmcBrandProject));
+    }
+
+    /**
+     * 修改cmc品牌项目
+     */
+    @Log(title = "cmc品牌项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBrandProject cmcBrandProject)
+    {
+        return toAjax(cmcBrandProjectService.updateCmcBrandProject(cmcBrandProject));
+    }
+
+    /**
+     * 删除cmc品牌项目
+     */
+    @Log(title = "cmc品牌项目", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
+    {
+        return toAjax(cmcBrandProjectService.deleteCmcBrandProjectByProjectIds(projectIds));
+    }
+}

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

@@ -97,6 +97,6 @@ public class CmcBudgetCarController extends BaseController
 	@DeleteMapping("/{budgetCarIds}")
     public AjaxResult remove(@PathVariable String[] budgetCarIds)
     {
-        return toAjax(cmcBudgetCarService.deleteCmcBudgetCarByBudgetCarIds(budgetCarIds));
+        return toAjax(cmcBudgetCarService.deleteCmcBudgetCarByBudgetIds(budgetCarIds));
     }
 }

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

@@ -94,9 +94,9 @@ public class CmcBudgetDeviceController extends BaseController
      * 删除cmc设备预算
      */
     @Log(title = "cmc设备预算", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{budgetDeviceIds}")
-    public AjaxResult remove(@PathVariable String[] budgetDeviceIds)
+	@DeleteMapping("/{budgetIds}")
+    public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetDeviceService.deleteCmcBudgetDeviceByBudgetDeviceIds(budgetDeviceIds));
+        return toAjax(cmcBudgetDeviceService.deleteCmcBudgetDeviceByBudgetIds(budgetIds));
     }
 }

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

@@ -94,9 +94,9 @@ public class CmcBudgetSettleController extends BaseController
      * 删除cmc预结算
      */
     @Log(title = "cmc预结算", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{budgetSettleIds}")
-    public AjaxResult remove(@PathVariable String[] budgetSettleIds)
+	@DeleteMapping("/{budgetIds}")
+    public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetSettleService.deleteCmcBudgetSettleByBudgetSettleIds(budgetSettleIds));
+        return toAjax(cmcBudgetSettleService.deleteCmcBudgetSettleByBudgetIds(budgetIds));
     }
 }

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

@@ -94,9 +94,9 @@ public class CmcBudgetStaffController extends BaseController
      * 删除cmc人员预算
      */
     @Log(title = "cmc人员预算", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{budgetStaffIds}")
-    public AjaxResult remove(@PathVariable String[] budgetStaffIds)
+	@DeleteMapping("/{budgetIds}")
+    public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetStaffService.deleteCmcBudgetStaffByBudgetStaffIds(budgetStaffIds));
+        return toAjax(cmcBudgetStaffService.deleteCmcBudgetStaffByBudgetIds(budgetIds));
     }
 }

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcDeposit;
+import com.ruoyi.oa.service.ICmcDepositService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc保证金审批Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/deposit")
+public class CmcDepositController extends BaseController
+{
+    @Autowired
+    private ICmcDepositService cmcDepositService;
+
+    /**
+     * 查询cmc保证金审批列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeposit cmcDeposit)
+    {
+        startPage();
+        List<CmcDeposit> list = cmcDepositService.selectCmcDepositList(cmcDeposit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc保证金审批列表
+     */
+    @Log(title = "cmc保证金审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeposit cmcDeposit)
+    {
+        List<CmcDeposit> list = cmcDepositService.selectCmcDepositList(cmcDeposit);
+        ExcelUtil<CmcDeposit> util = new ExcelUtil<CmcDeposit>(CmcDeposit.class);
+        util.exportExcel(response, list, "cmc保证金审批数据");
+    }
+
+    /**
+     * 获取cmc保证金审批详细信息
+     */
+    @GetMapping(value = "/{depositId}")
+    public AjaxResult getInfo(@PathVariable("depositId") String depositId)
+    {
+        return success(cmcDepositService.selectCmcDepositByDepositId(depositId));
+    }
+
+    /**
+     * 新增cmc保证金审批
+     */
+    @Log(title = "cmc保证金审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeposit cmcDeposit)
+    {
+        return toAjax(cmcDepositService.insertCmcDeposit(cmcDeposit));
+    }
+
+    /**
+     * 修改cmc保证金审批
+     */
+    @Log(title = "cmc保证金审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeposit cmcDeposit)
+    {
+        return toAjax(cmcDepositService.updateCmcDeposit(cmcDeposit));
+    }
+
+    /**
+     * 删除cmc保证金审批
+     */
+    @Log(title = "cmc保证金审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{depositIds}")
+    public AjaxResult remove(@PathVariable String[] depositIds)
+    {
+        return toAjax(cmcDepositService.deleteCmcDepositByDepositIds(depositIds));
+    }
+}

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

@@ -74,7 +74,7 @@ public class CmcProjectController extends BaseController
         StringBuilder underTakingDeptName = new StringBuilder();
         if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
             for (String dept : underTakingDept.split(","))
-                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
             cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
         }
         return success(cmcProject);

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcSettle;
+import com.ruoyi.oa.service.ICmcSettleService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc结算审批Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/settle")
+public class CmcSettleController extends BaseController
+{
+    @Autowired
+    private ICmcSettleService cmcSettleService;
+
+    /**
+     * 查询cmc结算审批列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSettle cmcSettle)
+    {
+        startPage();
+        List<CmcSettle> list = cmcSettleService.selectCmcSettleList(cmcSettle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc结算审批列表
+     */
+    @Log(title = "cmc结算审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSettle cmcSettle)
+    {
+        List<CmcSettle> list = cmcSettleService.selectCmcSettleList(cmcSettle);
+        ExcelUtil<CmcSettle> util = new ExcelUtil<CmcSettle>(CmcSettle.class);
+        util.exportExcel(response, list, "cmc结算审批数据");
+    }
+
+    /**
+     * 获取cmc结算审批详细信息
+     */
+    @GetMapping(value = "/{settleId}")
+    public AjaxResult getInfo(@PathVariable("settleId") String settleId)
+    {
+        return success(cmcSettleService.selectCmcSettleBySettleId(settleId));
+    }
+
+    /**
+     * 新增cmc结算审批
+     */
+    @Log(title = "cmc结算审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSettle cmcSettle)
+    {
+        return toAjax(cmcSettleService.insertCmcSettle(cmcSettle));
+    }
+
+    /**
+     * 修改cmc结算审批
+     */
+    @Log(title = "cmc结算审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSettle cmcSettle)
+    {
+        return toAjax(cmcSettleService.updateCmcSettle(cmcSettle));
+    }
+
+    /**
+     * 删除cmc结算审批
+     */
+    @Log(title = "cmc结算审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{settleIds}")
+    public AjaxResult remove(@PathVariable String[] settleIds)
+    {
+        return toAjax(cmcSettleService.deleteCmcSettleBySettleIds(settleIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcSettleSummary;
+import com.ruoyi.oa.service.ICmcSettleSummaryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc结算汇总Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/settleSummary")
+public class CmcSettleSummaryController extends BaseController
+{
+    @Autowired
+    private ICmcSettleSummaryService cmcSettleSummaryService;
+
+    /**
+     * 查询cmc结算汇总列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSettleSummary cmcSettleSummary)
+    {
+        startPage();
+        List<CmcSettleSummary> list = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc结算汇总列表
+     */
+    @Log(title = "cmc结算汇总", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSettleSummary cmcSettleSummary)
+    {
+        List<CmcSettleSummary> list = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary);
+        ExcelUtil<CmcSettleSummary> util = new ExcelUtil<CmcSettleSummary>(CmcSettleSummary.class);
+        util.exportExcel(response, list, "cmc结算汇总数据");
+    }
+
+    /**
+     * 获取cmc结算汇总详细信息
+     */
+    @GetMapping(value = "/{settleId}")
+    public AjaxResult getInfo(@PathVariable("settleId") String settleId)
+    {
+        return success(cmcSettleSummaryService.selectCmcSettleSummaryBySettleId(settleId));
+    }
+
+    /**
+     * 新增cmc结算汇总
+     */
+    @Log(title = "cmc结算汇总", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSettleSummary cmcSettleSummary)
+    {
+        return toAjax(cmcSettleSummaryService.insertCmcSettleSummary(cmcSettleSummary));
+    }
+
+    /**
+     * 修改cmc结算汇总
+     */
+    @Log(title = "cmc结算汇总", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSettleSummary cmcSettleSummary)
+    {
+        return toAjax(cmcSettleSummaryService.updateCmcSettleSummary(cmcSettleSummary));
+    }
+
+    /**
+     * 删除cmc结算汇总
+     */
+    @Log(title = "cmc结算汇总", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{settleIds}")
+    public AjaxResult remove(@PathVariable String[] settleIds)
+    {
+        return toAjax(cmcSettleSummaryService.deleteCmcSettleSummaryBySettleIds(settleIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcSettleWork;
+import com.ruoyi.oa.service.ICmcSettleWorkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc经费计算Controller
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/oa/settleWork")
+public class CmcSettleWorkController extends BaseController
+{
+    @Autowired
+    private ICmcSettleWorkService cmcSettleWorkService;
+
+    /**
+     * 查询cmc经费计算列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSettleWork cmcSettleWork)
+    {
+        startPage();
+        List<CmcSettleWork> list = cmcSettleWorkService.selectCmcSettleWorkList(cmcSettleWork);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc经费计算列表
+     */
+    @Log(title = "cmc经费计算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSettleWork cmcSettleWork)
+    {
+        List<CmcSettleWork> list = cmcSettleWorkService.selectCmcSettleWorkList(cmcSettleWork);
+        ExcelUtil<CmcSettleWork> util = new ExcelUtil<CmcSettleWork>(CmcSettleWork.class);
+        util.exportExcel(response, list, "cmc经费计算数据");
+    }
+
+    /**
+     * 获取cmc经费计算详细信息
+     */
+    @GetMapping(value = "/{settleId}")
+    public AjaxResult getInfo(@PathVariable("settleId") String settleId)
+    {
+        return success(cmcSettleWorkService.selectCmcSettleWorkBySettleId(settleId));
+    }
+
+    /**
+     * 新增cmc经费计算
+     */
+    @Log(title = "cmc经费计算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSettleWork cmcSettleWork)
+    {
+        return toAjax(cmcSettleWorkService.insertCmcSettleWork(cmcSettleWork));
+    }
+
+    /**
+     * 修改cmc经费计算
+     */
+    @Log(title = "cmc经费计算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSettleWork cmcSettleWork)
+    {
+        return toAjax(cmcSettleWorkService.updateCmcSettleWork(cmcSettleWork));
+    }
+
+    /**
+     * 删除cmc经费计算
+     */
+    @Log(title = "cmc经费计算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{settleIds}")
+    public AjaxResult remove(@PathVariable String[] settleIds)
+    {
+        return toAjax(cmcSettleWorkService.deleteCmcSettleWorkBySettleIds(settleIds));
+    }
+}

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

@@ -0,0 +1,297 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_archive
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcArchive extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 成果归档id */
+    private String archiveId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 成果汇交日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "成果汇交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitTime;
+
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String submitSituation;
+
+    /** 坐标经度 */
+    @Excel(name = "坐标经度")
+    private String locationLng;
+
+    /** 坐标纬度 */
+    @Excel(name = "坐标纬度")
+    private String locationLat;
+
+    /** 生产部门检查员 */
+    @Excel(name = "生产部门检查员")
+    private Long produceInspector;
+
+    /** 质量检查员 */
+    @Excel(name = "质量检查员")
+    private Long qualityInspector;
+
+    /** 技术部负责人 */
+    @Excel(name = "技术部负责人")
+    private Long deptLeader;
+
+    /** 归档人 */
+    @Excel(name = "归档人")
+    private Long archiver;
+
+    /** 资料接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "资料接收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date receiveTime;
+
+    /** 质量检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "质量检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qualityTime;
+
+    /** 生产部门检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产部门检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date produceTime;
+
+    /** 技术部审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术部审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 归档时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date archiveTime;
+
+    /** 生产部门意见 */
+    @Excel(name = "生产部门意见")
+    private String produceComment;
+
+    /** 质量检查意见 */
+    @Excel(name = "质量检查意见")
+    private String qualityComment;
+
+    /** 技术部审核意见 */
+    @Excel(name = "技术部审核意见")
+    private String deptComment;
+
+    /** 归档审核意见 */
+    @Excel(name = "归档审核意见")
+    private String archiveComment;
+
+    public void setArchiveId(String archiveId) 
+    {
+        this.archiveId = archiveId;
+    }
+
+    public String getArchiveId() 
+    {
+        return archiveId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setSubmitTime(Date submitTime) 
+    {
+        this.submitTime = submitTime;
+    }
+
+    public Date getSubmitTime() 
+    {
+        return submitTime;
+    }
+    public void setSubmitSituation(String submitSituation) 
+    {
+        this.submitSituation = submitSituation;
+    }
+
+    public String getSubmitSituation() 
+    {
+        return submitSituation;
+    }
+    public void setLocationLng(String locationLng) 
+    {
+        this.locationLng = locationLng;
+    }
+
+    public String getLocationLng() 
+    {
+        return locationLng;
+    }
+    public void setLocationLat(String locationLat) 
+    {
+        this.locationLat = locationLat;
+    }
+
+    public String getLocationLat() 
+    {
+        return locationLat;
+    }
+    public void setProduceInspector(Long produceInspector) 
+    {
+        this.produceInspector = produceInspector;
+    }
+
+    public Long getProduceInspector() 
+    {
+        return produceInspector;
+    }
+    public void setQualityInspector(Long qualityInspector) 
+    {
+        this.qualityInspector = qualityInspector;
+    }
+
+    public Long getQualityInspector() 
+    {
+        return qualityInspector;
+    }
+    public void setDeptLeader(Long deptLeader) 
+    {
+        this.deptLeader = deptLeader;
+    }
+
+    public Long getDeptLeader() 
+    {
+        return deptLeader;
+    }
+    public void setArchiver(Long archiver) 
+    {
+        this.archiver = archiver;
+    }
+
+    public Long getArchiver() 
+    {
+        return archiver;
+    }
+    public void setReceiveTime(Date receiveTime) 
+    {
+        this.receiveTime = receiveTime;
+    }
+
+    public Date getReceiveTime() 
+    {
+        return receiveTime;
+    }
+    public void setQualityTime(Date qualityTime) 
+    {
+        this.qualityTime = qualityTime;
+    }
+
+    public Date getQualityTime() 
+    {
+        return qualityTime;
+    }
+    public void setProduceTime(Date produceTime) 
+    {
+        this.produceTime = produceTime;
+    }
+
+    public Date getProduceTime() 
+    {
+        return produceTime;
+    }
+    public void setDeptTime(Date deptTime) 
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime() 
+    {
+        return deptTime;
+    }
+    public void setArchiveTime(Date archiveTime) 
+    {
+        this.archiveTime = archiveTime;
+    }
+
+    public Date getArchiveTime() 
+    {
+        return archiveTime;
+    }
+    public void setProduceComment(String produceComment) 
+    {
+        this.produceComment = produceComment;
+    }
+
+    public String getProduceComment() 
+    {
+        return produceComment;
+    }
+    public void setQualityComment(String qualityComment) 
+    {
+        this.qualityComment = qualityComment;
+    }
+
+    public String getQualityComment() 
+    {
+        return qualityComment;
+    }
+    public void setDeptComment(String deptComment) 
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment() 
+    {
+        return deptComment;
+    }
+    public void setArchiveComment(String archiveComment) 
+    {
+        this.archiveComment = archiveComment;
+    }
+
+    public String getArchiveComment() 
+    {
+        return archiveComment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("archiveId", getArchiveId())
+            .append("projectId", getProjectId())
+            .append("submitTime", getSubmitTime())
+            .append("submitSituation", getSubmitSituation())
+            .append("locationLng", getLocationLng())
+            .append("locationLat", getLocationLat())
+            .append("produceInspector", getProduceInspector())
+            .append("qualityInspector", getQualityInspector())
+            .append("deptLeader", getDeptLeader())
+            .append("archiver", getArchiver())
+            .append("receiveTime", getReceiveTime())
+            .append("qualityTime", getQualityTime())
+            .append("produceTime", getProduceTime())
+            .append("deptTime", getDeptTime())
+            .append("archiveTime", getArchiveTime())
+            .append("produceComment", getProduceComment())
+            .append("qualityComment", getQualityComment())
+            .append("deptComment", getDeptComment())
+            .append("archiveComment", getArchiveComment())
+            .toString();
+    }
+}

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

@@ -0,0 +1,147 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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_brand
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcBrand extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 品牌项目支付审批id */
+    private String brandId;
+
+    /** 品牌项目id */
+    @Excel(name = "品牌项目id")
+    private String projectId;
+
+    /** 申请支付说明 */
+    @Excel(name = "申请支付说明")
+    private String applyReason;
+
+    /** 审核文件 */
+    @Excel(name = "审核文件")
+    private String approvalDocument;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    private SysUser applierUser;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 财务部经办人 */
+    @Excel(name = "财务部经办人")
+    private Long cwUserId;
+
+    private SysUser cwUser;
+
+    public void setBrandId(String brandId) 
+    {
+        this.brandId = brandId;
+    }
+
+    public String getBrandId() 
+    {
+        return brandId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setApplyReason(String applyReason) 
+    {
+        this.applyReason = applyReason;
+    }
+
+    public String getApplyReason() 
+    {
+        return applyReason;
+    }
+    public void setApprovalDocument(String approvalDocument) 
+    {
+        this.approvalDocument = approvalDocument;
+    }
+
+    public String getApprovalDocument() 
+    {
+        return approvalDocument;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
+    public void setApplyTime(Date applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setCwUserId(Long cwUserId) 
+    {
+        this.cwUserId = cwUserId;
+    }
+
+    public Long getCwUserId() 
+    {
+        return cwUserId;
+    }
+    public void setCwUser(SysUser cwUser)
+    {
+        this.cwUser = cwUser;
+    }
+
+    public SysUser getCwUser()
+    {
+        return cwUser;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("brandId", getBrandId())
+            .append("projectId", getProjectId())
+            .append("applyReason", getApplyReason())
+            .append("approvalDocument", getApprovalDocument())
+            .append("applier", getApplier())
+            .append("applyTime", getApplyTime())
+            .append("cwUserId", getCwUserId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_brand_payment
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcBrandPayment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 品牌项目支付记录id */
+    private String brandPaymentId;
+
+    /** 品牌项目支付审批id */
+    @Excel(name = "品牌项目支付审批id")
+    private String brandId;
+
+    /** 到账时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到账时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date paymentTime;
+
+    /** 到账情况 */
+    @Excel(name = "到账情况")
+    private String cwComment;
+
+    public void setBrandPaymentId(String brandPaymentId) 
+    {
+        this.brandPaymentId = brandPaymentId;
+    }
+
+    public String getBrandPaymentId() 
+    {
+        return brandPaymentId;
+    }
+    public void setBrandId(String brandId) 
+    {
+        this.brandId = brandId;
+    }
+
+    public String getBrandId() 
+    {
+        return brandId;
+    }
+    public void setPaymentTime(Date paymentTime) 
+    {
+        this.paymentTime = paymentTime;
+    }
+
+    public Date getPaymentTime() 
+    {
+        return paymentTime;
+    }
+    public void setCwComment(String cwComment) 
+    {
+        this.cwComment = cwComment;
+    }
+
+    public String getCwComment() 
+    {
+        return cwComment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("brandPaymentId", getBrandPaymentId())
+            .append("brandId", getBrandId())
+            .append("paymentTime", getPaymentTime())
+            .append("cwComment", getCwComment())
+            .toString();
+    }
+}

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

@@ -0,0 +1,179 @@
+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_brand_project
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcBrandProject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 甲方单位 */
+    @Excel(name = "甲方单位")
+    private String partyA;
+
+    /** 甲方单位联系人 */
+    @Excel(name = "甲方单位联系人")
+    private String aPerson;
+
+    /** 甲方单位联系电话 */
+    @Excel(name = "甲方单位联系电话")
+    private String aPhone;
+
+    /** 合作单位 */
+    @Excel(name = "合作单位")
+    private String partnerId;
+
+    /** 合作单位联系人 */
+    @Excel(name = "合作单位联系人")
+    private String contactPerson;
+
+    /** 合作单位联系电话 */
+    @Excel(name = "合作单位联系电话")
+    private String telephone;
+
+    /** 项目工期 */
+    @Excel(name = "项目工期")
+    private String duration;
+
+    /** 合同金额 */
+    @Excel(name = "合同金额")
+    private BigDecimal amount;
+
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProjectNumber(String projectNumber) 
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber() 
+    {
+        return projectNumber;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setPartyA(String partyA) 
+    {
+        this.partyA = partyA;
+    }
+
+    public String getPartyA() 
+    {
+        return partyA;
+    }
+    public void setaPerson(String aPerson) 
+    {
+        this.aPerson = aPerson;
+    }
+
+    public String getaPerson() 
+    {
+        return aPerson;
+    }
+    public void setaPhone(String aPhone) 
+    {
+        this.aPhone = aPhone;
+    }
+
+    public String getaPhone() 
+    {
+        return aPhone;
+    }
+    public void setPartnerId(String partnerId) 
+    {
+        this.partnerId = partnerId;
+    }
+
+    public String getPartnerId() 
+    {
+        return partnerId;
+    }
+    public void setContactPerson(String contactPerson) 
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson() 
+    {
+        return contactPerson;
+    }
+    public void setTelephone(String telephone) 
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone() 
+    {
+        return telephone;
+    }
+    public void setDuration(String duration) 
+    {
+        this.duration = duration;
+    }
+
+    public String getDuration() 
+    {
+        return duration;
+    }
+    public void setAmount(BigDecimal amount) 
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount() 
+    {
+        return amount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("projectId", getProjectId())
+            .append("projectNumber", getProjectNumber())
+            .append("projectName", getProjectName())
+            .append("partyA", getPartyA())
+            .append("aPerson", getaPerson())
+            .append("aPhone", getaPhone())
+            .append("partnerId", getPartnerId())
+            .append("contactPerson", getContactPerson())
+            .append("telephone", getTelephone())
+            .append("duration", getDuration())
+            .append("amount", getAmount())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,311 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_deposit
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcDeposit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 保证金审批id */
+    private String depositId;
+
+    /** 保证金类型 */
+    @Excel(name = "保证金类型")
+    private String depositType;
+
+    /** 投标项目id */
+    @Excel(name = "投标项目id")
+    private String tenderId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 预计退还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预计退还日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date returnTime;
+
+    /** 开户名称 */
+    @Excel(name = "开户名称")
+    private String accountName;
+
+    /** 开户银行 */
+    @Excel(name = "开户银行")
+    private String accountBank;
+
+    /** 银行卡号 */
+    @Excel(name = "银行卡号")
+    private String cardNumber;
+
+    /** 保证金形式 */
+    @Excel(name = "保证金形式")
+    private String depositWay;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 申请说明 */
+    @Excel(name = "申请说明")
+    private String applyReason;
+
+    /** 相关附件 */
+    @Excel(name = "相关附件")
+    private String applyDocument;
+
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private Long managerUserId;
+
+    /** 汇款日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "汇款日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date remitTime;
+
+    /** 财务处理时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "财务处理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cwTime;
+
+    /** 退还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "退还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date backTime;
+
+    /** 财务打款备注 */
+    @Excel(name = "财务打款备注")
+    private String cwComment;
+
+    /** 财务处理人 */
+    @Excel(name = "财务处理人")
+    private Long cwUserId;
+
+    public void setDepositId(String depositId) 
+    {
+        this.depositId = depositId;
+    }
+
+    public String getDepositId() 
+    {
+        return depositId;
+    }
+    public void setDepositType(String depositType) 
+    {
+        this.depositType = depositType;
+    }
+
+    public String getDepositType() 
+    {
+        return depositType;
+    }
+    public void setTenderId(String tenderId) 
+    {
+        this.tenderId = tenderId;
+    }
+
+    public String getTenderId() 
+    {
+        return tenderId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setReturnTime(Date returnTime) 
+    {
+        this.returnTime = returnTime;
+    }
+
+    public Date getReturnTime() 
+    {
+        return returnTime;
+    }
+    public void setAccountName(String accountName) 
+    {
+        this.accountName = accountName;
+    }
+
+    public String getAccountName() 
+    {
+        return accountName;
+    }
+    public void setAccountBank(String accountBank) 
+    {
+        this.accountBank = accountBank;
+    }
+
+    public String getAccountBank() 
+    {
+        return accountBank;
+    }
+    public void setCardNumber(String cardNumber) 
+    {
+        this.cardNumber = cardNumber;
+    }
+
+    public String getCardNumber() 
+    {
+        return cardNumber;
+    }
+    public void setDepositWay(String depositWay) 
+    {
+        this.depositWay = depositWay;
+    }
+
+    public String getDepositWay() 
+    {
+        return depositWay;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setApplyTime(Date applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setApplyReason(String applyReason) 
+    {
+        this.applyReason = applyReason;
+    }
+
+    public String getApplyReason() 
+    {
+        return applyReason;
+    }
+    public void setApplyDocument(String applyDocument) 
+    {
+        this.applyDocument = applyDocument;
+    }
+
+    public String getApplyDocument() 
+    {
+        return applyDocument;
+    }
+    public void setManagerTime(Date managerTime) 
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime() 
+    {
+        return managerTime;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    public void setRemitTime(Date remitTime) 
+    {
+        this.remitTime = remitTime;
+    }
+
+    public Date getRemitTime() 
+    {
+        return remitTime;
+    }
+    public void setCwTime(Date cwTime) 
+    {
+        this.cwTime = cwTime;
+    }
+
+    public Date getCwTime() 
+    {
+        return cwTime;
+    }
+    public void setBackTime(Date backTime) 
+    {
+        this.backTime = backTime;
+    }
+
+    public Date getBackTime() 
+    {
+        return backTime;
+    }
+    public void setCwComment(String cwComment) 
+    {
+        this.cwComment = cwComment;
+    }
+
+    public String getCwComment() 
+    {
+        return cwComment;
+    }
+    public void setCwUserId(Long cwUserId) 
+    {
+        this.cwUserId = cwUserId;
+    }
+
+    public Long getCwUserId() 
+    {
+        return cwUserId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("depositId", getDepositId())
+            .append("depositType", getDepositType())
+            .append("tenderId", getTenderId())
+            .append("contractId", getContractId())
+            .append("returnTime", getReturnTime())
+            .append("accountName", getAccountName())
+            .append("accountBank", getAccountBank())
+            .append("cardNumber", getCardNumber())
+            .append("depositWay", getDepositWay())
+            .append("applier", getApplier())
+            .append("applyTime", getApplyTime())
+            .append("applyReason", getApplyReason())
+            .append("applyDocument", getApplyDocument())
+            .append("managerTime", getManagerTime())
+            .append("managerUserId", getManagerUserId())
+            .append("remitTime", getRemitTime())
+            .append("cwTime", getCwTime())
+            .append("backTime", getBackTime())
+            .append("cwComment", getCwComment())
+            .append("cwUserId", getCwUserId())
+            .toString();
+    }
+}

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

@@ -113,14 +113,6 @@ public class CmcProject extends BaseEntity
     @Excel(name = "撤场时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date exitTime;
 
-    /** 预算id */
-    @Excel(name = "预算id")
-    private String budgetId;
-
-    /** 技术方案id */
-    @Excel(name = "技术方案id")
-    private String technicalId;
-
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -319,24 +311,6 @@ public class CmcProject extends BaseEntity
     {
         return exitTime;
     }
-    public void setBudgetId(String budgetId)
-    {
-        this.budgetId = budgetId;
-    }
-
-    public String getBudgetId()
-    {
-        return budgetId;
-    }
-    public void setTechnicalId(String technicalId)
-    {
-        this.technicalId = technicalId;
-    }
-
-    public String getTechnicalId()
-    {
-        return technicalId;
-    }
     public void setProjectLeaderUser(SysUser projectLeaderUser)
     {
         this.projectLeaderUser = projectLeaderUser;
@@ -379,8 +353,6 @@ public class CmcProject extends BaseEntity
                 .append("entryTime", getEntryTime())
                 .append("exitTime", getExitTime())
                 .append("remark", getRemark())
-                .append("budgetId", getBudgetId())
-                .append("technicalId", getTechnicalId())
                 .toString();
     }
 }

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

@@ -0,0 +1,411 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_settle
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcSettle extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 结算审批id */
+    private String settleId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 工作量上报说明 */
+    @Excel(name = "工作量上报说明")
+    private String workloadReport;
+
+    /** 上报人 */
+    @Excel(name = "上报人")
+    private Long reporter;
+
+    /** 上报日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportTime;
+
+    /** 结算说明 */
+    @Excel(name = "结算说明")
+    private String settleComment;
+
+    /** 综合事务部审核人 */
+    @Excel(name = "综合事务部审核人")
+    private Long zhUserId;
+
+    /** 综合事务部审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "综合事务部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zhTime;
+
+    /** 综合事务部审核意见 */
+    @Excel(name = "综合事务部审核意见")
+    private String zhComment;
+
+    /** 技术质量部审核人 */
+    @Excel(name = "技术质量部审核人")
+    private Long jsUserId;
+
+    /** 技术质量部审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术质量部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jsTime;
+
+    /** 技术质量部审核意见 */
+    @Excel(name = "技术质量部审核意见")
+    private String jsComment;
+
+    /** 项目管理部审核人 */
+    @Excel(name = "项目管理部审核人")
+    private Long xmUserId;
+
+    /** 项目管理部审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目管理部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xmTime;
+
+    /** 项目管理部审核意见 */
+    @Excel(name = "项目管理部审核意见")
+    private String xmComment;
+
+    /** 承担部门审核人 */
+    @Excel(name = "承担部门审核人")
+    private Long deptUserId;
+
+    /** 承担部门审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "承担部门审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 承担部门审核意见 */
+    @Excel(name = "承担部门审核意见")
+    private String deptComment;
+
+    /** 经营发展部审核人 */
+    @Excel(name = "经营发展部审核人")
+    private Long jyUserId;
+
+    /** 经营发展部审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "经营发展部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jyTime;
+
+    /** 经营发展部审核意见 */
+    @Excel(name = "经营发展部审核意见")
+    private String jyComment;
+
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private Long managerUserId;
+
+    /** 分管审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 分管审核意见 */
+    @Excel(name = "分管审核意见")
+    private String managerComment;
+
+    /** 总经理审核人 */
+    @Excel(name = "总经理审核人")
+    private Long gmUserId;
+
+    /** 总经理审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmTime;
+
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
+
+    public void setSettleId(String settleId) 
+    {
+        this.settleId = settleId;
+    }
+
+    public String getSettleId() 
+    {
+        return settleId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setWorkloadReport(String workloadReport) 
+    {
+        this.workloadReport = workloadReport;
+    }
+
+    public String getWorkloadReport() 
+    {
+        return workloadReport;
+    }
+    public void setReporter(Long reporter) 
+    {
+        this.reporter = reporter;
+    }
+
+    public Long getReporter() 
+    {
+        return reporter;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setSettleComment(String settleComment) 
+    {
+        this.settleComment = settleComment;
+    }
+
+    public String getSettleComment() 
+    {
+        return settleComment;
+    }
+    public void setZhUserId(Long zhUserId) 
+    {
+        this.zhUserId = zhUserId;
+    }
+
+    public Long getZhUserId() 
+    {
+        return zhUserId;
+    }
+    public void setZhTime(Date zhTime) 
+    {
+        this.zhTime = zhTime;
+    }
+
+    public Date getZhTime() 
+    {
+        return zhTime;
+    }
+    public void setZhComment(String zhComment) 
+    {
+        this.zhComment = zhComment;
+    }
+
+    public String getZhComment() 
+    {
+        return zhComment;
+    }
+    public void setJsUserId(Long jsUserId) 
+    {
+        this.jsUserId = jsUserId;
+    }
+
+    public Long getJsUserId() 
+    {
+        return jsUserId;
+    }
+    public void setJsTime(Date jsTime) 
+    {
+        this.jsTime = jsTime;
+    }
+
+    public Date getJsTime() 
+    {
+        return jsTime;
+    }
+    public void setJsComment(String jsComment) 
+    {
+        this.jsComment = jsComment;
+    }
+
+    public String getJsComment() 
+    {
+        return jsComment;
+    }
+    public void setXmUserId(Long xmUserId) 
+    {
+        this.xmUserId = xmUserId;
+    }
+
+    public Long getXmUserId() 
+    {
+        return xmUserId;
+    }
+    public void setXmTime(Date xmTime) 
+    {
+        this.xmTime = xmTime;
+    }
+
+    public Date getXmTime() 
+    {
+        return xmTime;
+    }
+    public void setXmComment(String xmComment) 
+    {
+        this.xmComment = xmComment;
+    }
+
+    public String getXmComment() 
+    {
+        return xmComment;
+    }
+    public void setDeptUserId(Long deptUserId) 
+    {
+        this.deptUserId = deptUserId;
+    }
+
+    public Long getDeptUserId() 
+    {
+        return deptUserId;
+    }
+    public void setDeptTime(Date deptTime) 
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime() 
+    {
+        return deptTime;
+    }
+    public void setDeptComment(String deptComment) 
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment() 
+    {
+        return deptComment;
+    }
+    public void setJyUserId(Long jyUserId) 
+    {
+        this.jyUserId = jyUserId;
+    }
+
+    public Long getJyUserId() 
+    {
+        return jyUserId;
+    }
+    public void setJyTime(Date jyTime) 
+    {
+        this.jyTime = jyTime;
+    }
+
+    public Date getJyTime() 
+    {
+        return jyTime;
+    }
+    public void setJyComment(String jyComment) 
+    {
+        this.jyComment = jyComment;
+    }
+
+    public String getJyComment() 
+    {
+        return jyComment;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    public void setManagerTime(Date managerTime) 
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime() 
+    {
+        return managerTime;
+    }
+    public void setManagerComment(String managerComment) 
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment() 
+    {
+        return managerComment;
+    }
+    public void setGmUserId(Long gmUserId) 
+    {
+        this.gmUserId = gmUserId;
+    }
+
+    public Long getGmUserId() 
+    {
+        return gmUserId;
+    }
+    public void setGmTime(Date gmTime) 
+    {
+        this.gmTime = gmTime;
+    }
+
+    public Date getGmTime() 
+    {
+        return gmTime;
+    }
+    public void setGmComment(String gmComment) 
+    {
+        this.gmComment = gmComment;
+    }
+
+    public String getGmComment() 
+    {
+        return gmComment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("settleId", getSettleId())
+            .append("projectId", getProjectId())
+            .append("workloadReport", getWorkloadReport())
+            .append("reporter", getReporter())
+            .append("reportTime", getReportTime())
+            .append("settleComment", getSettleComment())
+            .append("zhUserId", getZhUserId())
+            .append("zhTime", getZhTime())
+            .append("zhComment", getZhComment())
+            .append("jsUserId", getJsUserId())
+            .append("jsTime", getJsTime())
+            .append("jsComment", getJsComment())
+            .append("xmUserId", getXmUserId())
+            .append("xmTime", getXmTime())
+            .append("xmComment", getXmComment())
+            .append("deptUserId", getDeptUserId())
+            .append("deptTime", getDeptTime())
+            .append("deptComment", getDeptComment())
+            .append("jyUserId", getJyUserId())
+            .append("jyTime", getJyTime())
+            .append("jyComment", getJyComment())
+            .append("managerUserId", getManagerUserId())
+            .append("managerTime", getManagerTime())
+            .append("managerComment", getManagerComment())
+            .append("gmUserId", getGmUserId())
+            .append("gmTime", getGmTime())
+            .append("gmComment", getGmComment())
+            .toString();
+    }
+}

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

@@ -0,0 +1,109 @@
+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_settle_summary
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcSettleSummary extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 结算汇总id */
+    private String summaryId;
+
+    /** 结算id */
+    @Excel(name = "结算id")
+    private String settleId;
+
+    /** 结算内容 */
+    @Excel(name = "结算内容")
+    private String content;
+
+    /** 结算金额 */
+    @Excel(name = "结算金额")
+    private BigDecimal amount;
+
+    /** 结算金额（项目部） */
+    @Excel(name = "结算金额", readConverterExp = "项=目部")
+    private BigDecimal amountXm;
+
+    /** 结算金额（分管） */
+    @Excel(name = "结算金额", readConverterExp = "分=管")
+    private BigDecimal amountManager;
+
+    public void setSummaryId(String summaryId) 
+    {
+        this.summaryId = summaryId;
+    }
+
+    public String getSummaryId() 
+    {
+        return summaryId;
+    }
+    public void setSettleId(String settleId) 
+    {
+        this.settleId = settleId;
+    }
+
+    public String getSettleId() 
+    {
+        return settleId;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setAmount(BigDecimal amount) 
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount() 
+    {
+        return amount;
+    }
+    public void setAmountXm(BigDecimal amountXm) 
+    {
+        this.amountXm = amountXm;
+    }
+
+    public BigDecimal getAmountXm() 
+    {
+        return amountXm;
+    }
+    public void setAmountManager(BigDecimal amountManager) 
+    {
+        this.amountManager = amountManager;
+    }
+
+    public BigDecimal getAmountManager() 
+    {
+        return amountManager;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("summaryId", getSummaryId())
+            .append("settleId", getSettleId())
+            .append("content", getContent())
+            .append("amount", getAmount())
+            .append("amountXm", getAmountXm())
+            .append("amountManager", getAmountManager())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,165 @@
+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_settle_work
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public class CmcSettleWork extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工作内容id */
+    private String workId;
+
+    /** 结算id */
+    @Excel(name = "结算id")
+    private String settleId;
+
+    /** 工作内容 */
+    @Excel(name = "工作内容")
+    private String content;
+
+    /** 结算单价id */
+    @Excel(name = "结算单价id")
+    private Long priceId;
+
+    /** 工作量 */
+    @Excel(name = "工作量")
+    private Long workload;
+
+    /** 系数 */
+    @Excel(name = "系数")
+    private Long coefficient;
+
+    /** 地类 */
+    @Excel(name = "地类")
+    private String groundType;
+
+    /** 项目经费 */
+    @Excel(name = "项目经费")
+    private BigDecimal settle;
+
+    /** 项目经费（项目部） */
+    @Excel(name = "项目经费", readConverterExp = "项=目部")
+    private BigDecimal settleXm;
+
+    /** 项目经费（分管） */
+    @Excel(name = "项目经费", readConverterExp = "分=管")
+    private BigDecimal settleManager;
+
+    public void setWorkId(String workId) 
+    {
+        this.workId = workId;
+    }
+
+    public String getWorkId() 
+    {
+        return workId;
+    }
+    public void setSettleId(String settleId) 
+    {
+        this.settleId = settleId;
+    }
+
+    public String getSettleId() 
+    {
+        return settleId;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setPriceId(Long priceId) 
+    {
+        this.priceId = priceId;
+    }
+
+    public Long getPriceId() 
+    {
+        return priceId;
+    }
+    public void setWorkload(Long workload) 
+    {
+        this.workload = workload;
+    }
+
+    public Long getWorkload() 
+    {
+        return workload;
+    }
+    public void setCoefficient(Long coefficient) 
+    {
+        this.coefficient = coefficient;
+    }
+
+    public Long getCoefficient() 
+    {
+        return coefficient;
+    }
+    public void setGroundType(String groundType) 
+    {
+        this.groundType = groundType;
+    }
+
+    public String getGroundType() 
+    {
+        return groundType;
+    }
+    public void setSettle(BigDecimal settle) 
+    {
+        this.settle = settle;
+    }
+
+    public BigDecimal getSettle() 
+    {
+        return settle;
+    }
+    public void setSettleXm(BigDecimal settleXm) 
+    {
+        this.settleXm = settleXm;
+    }
+
+    public BigDecimal getSettleXm() 
+    {
+        return settleXm;
+    }
+    public void setSettleManager(BigDecimal settleManager) 
+    {
+        this.settleManager = settleManager;
+    }
+
+    public BigDecimal getSettleManager() 
+    {
+        return settleManager;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("workId", getWorkId())
+            .append("settleId", getSettleId())
+            .append("content", getContent())
+            .append("priceId", getPriceId())
+            .append("workload", getWorkload())
+            .append("coefficient", getCoefficient())
+            .append("groundType", getGroundType())
+            .append("settle", getSettle())
+            .append("settleXm", getSettleXm())
+            .append("settleManager", getSettleManager())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcArchive;
+
+/**
+ * cmc成果归档Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcArchiveMapper 
+{
+    /**
+     * 查询cmc成果归档
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return cmc成果归档
+     */
+    public CmcArchive selectCmcArchiveByArchiveId(String archiveId);
+
+    /**
+     * 查询cmc成果归档列表
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return cmc成果归档集合
+     */
+    public List<CmcArchive> selectCmcArchiveList(CmcArchive cmcArchive);
+
+    /**
+     * 新增cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    public int insertCmcArchive(CmcArchive cmcArchive);
+
+    /**
+     * 修改cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    public int updateCmcArchive(CmcArchive cmcArchive);
+
+    /**
+     * 删除cmc成果归档
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return 结果
+     */
+    public int deleteCmcArchiveByArchiveId(String archiveId);
+
+    /**
+     * 批量删除cmc成果归档
+     * 
+     * @param archiveIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcArchiveByArchiveIds(String[] archiveIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrand;
+
+/**
+ * cmc品牌项目支付审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcBrandMapper 
+{
+    /**
+     * 查询cmc品牌项目支付审批
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return cmc品牌项目支付审批
+     */
+    public CmcBrand selectCmcBrandByBrandId(String brandId);
+
+    /**
+     * 查询cmc品牌项目支付审批列表
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return cmc品牌项目支付审批集合
+     */
+    public List<CmcBrand> selectCmcBrandList(CmcBrand cmcBrand);
+
+    /**
+     * 新增cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    public int insertCmcBrand(CmcBrand cmcBrand);
+
+    /**
+     * 修改cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    public int updateCmcBrand(CmcBrand cmcBrand);
+
+    /**
+     * 删除cmc品牌项目支付审批
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return 结果
+     */
+    public int deleteCmcBrandByBrandId(String brandId);
+
+    /**
+     * 批量删除cmc品牌项目支付审批
+     * 
+     * @param brandIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandByBrandIds(String[] brandIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandPayment;
+
+/**
+ * cmc品牌项目支付记录Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcBrandPaymentMapper 
+{
+    /**
+     * 查询cmc品牌项目支付记录
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return cmc品牌项目支付记录
+     */
+    public List<CmcBrandPayment> selectCmcBrandPaymentByBrandId(String brandId);
+
+    /**
+     * 查询cmc品牌项目支付记录列表
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return cmc品牌项目支付记录集合
+     */
+    public List<CmcBrandPayment> selectCmcBrandPaymentList(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 新增cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    public int insertCmcBrandPayment(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 修改cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    public int updateCmcBrandPayment(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 删除cmc品牌项目支付记录
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return 结果
+     */
+    public int deleteCmcBrandPaymentByBrandId(String brandId);
+
+    /**
+     * 批量删除cmc品牌项目支付记录
+     * 
+     * @param brandIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandPaymentByBrandIds(String[] brandIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandProject;
+
+/**
+ * cmc品牌项目Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcBrandProjectMapper 
+{
+    /**
+     * 查询cmc品牌项目
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return cmc品牌项目
+     */
+    public CmcBrandProject selectCmcBrandProjectByProjectId(String projectId);
+
+    /**
+     * 查询cmc品牌项目列表
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return cmc品牌项目集合
+     */
+    public List<CmcBrandProject> selectCmcBrandProjectList(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 新增cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    public int insertCmcBrandProject(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 修改cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    public int updateCmcBrandProject(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 删除cmc品牌项目
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectByProjectId(String projectId);
+
+    /**
+     * 批量删除cmc品牌项目
+     * 
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectByProjectIds(String[] projectIds);
+}

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

@@ -46,16 +46,16 @@ public interface CmcBudgetCarMapper
     /**
      * 删除cmc车辆预算
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc车辆预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarId(String budgetCarId);
+    public int deleteCmcBudgetCarByBudgetId(String budgetId);
 
     /**
      * 批量删除cmc车辆预算
      * 
-     * @param budgetCarIds 需要删除的数据主键集合
+     * @param budgetIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarIds(String[] budgetCarIds);
+    public int deleteCmcBudgetCarByBudgetIds(String[] budgetIds);
 }

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

@@ -46,16 +46,16 @@ public interface CmcBudgetDeviceMapper
     /**
      * 删除cmc设备预算
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc设备预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId);
+    public int deleteCmcBudgetDeviceByBudgetId(String budgetId);
 
     /**
      * 批量删除cmc设备预算
      * 
-     * @param budgetDeviceIds 需要删除的数据主键集合
+     * @param budgetIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetDeviceByBudgetDeviceIds(String[] budgetDeviceIds);
+    public int deleteCmcBudgetDeviceByBudgetIds(String[] budgetIds);
 }

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

@@ -46,16 +46,16 @@ public interface CmcBudgetSettleMapper
     /**
      * 删除cmc预结算
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预结算主键
      * @return 结果
      */
-    public int deleteCmcBudgetSettleByBudgetSettleId(String budgetSettleId);
+    public int deleteCmcBudgetSettleByBudgetId(String budgetId);
 
     /**
      * 批量删除cmc预结算
      * 
-     * @param budgetSettleIds 需要删除的数据主键集合
+     * @param budgetIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetSettleByBudgetSettleIds(String[] budgetSettleIds);
+    public int deleteCmcBudgetSettleByBudgetIds(String[] budgetIds);
 }

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

@@ -46,16 +46,16 @@ public interface CmcBudgetStaffMapper
     /**
      * 删除cmc人员预算
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc人员预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetStaffByBudgetStaffId(String budgetStaffId);
+    public int deleteCmcBudgetStaffByBudgetId(String budgetId);
 
     /**
      * 批量删除cmc人员预算
      * 
-     * @param budgetStaffIds 需要删除的数据主键集合
+     * @param budgetIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetStaffByBudgetStaffIds(String[] budgetStaffIds);
+    public int deleteCmcBudgetStaffByBudgetIds(String[] budgetIds);
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeposit;
+
+/**
+ * cmc保证金审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcDepositMapper 
+{
+    /**
+     * 查询cmc保证金审批
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return cmc保证金审批
+     */
+    public CmcDeposit selectCmcDepositByDepositId(String depositId);
+
+    /**
+     * 查询cmc保证金审批列表
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return cmc保证金审批集合
+     */
+    public List<CmcDeposit> selectCmcDepositList(CmcDeposit cmcDeposit);
+
+    /**
+     * 新增cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    public int insertCmcDeposit(CmcDeposit cmcDeposit);
+
+    /**
+     * 修改cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    public int updateCmcDeposit(CmcDeposit cmcDeposit);
+
+    /**
+     * 删除cmc保证金审批
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return 结果
+     */
+    public int deleteCmcDepositByDepositId(String depositId);
+
+    /**
+     * 批量删除cmc保证金审批
+     * 
+     * @param depositIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDepositByDepositIds(String[] depositIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettle;
+
+/**
+ * cmc结算审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcSettleMapper 
+{
+    /**
+     * 查询cmc结算审批
+     * 
+     * @param settleId cmc结算审批主键
+     * @return cmc结算审批
+     */
+    public CmcSettle selectCmcSettleBySettleId(String settleId);
+
+    /**
+     * 查询cmc结算审批列表
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批集合
+     */
+    public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
+
+    /**
+     * 新增cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    public int insertCmcSettle(CmcSettle cmcSettle);
+
+    /**
+     * 修改cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    public int updateCmcSettle(CmcSettle cmcSettle);
+
+    /**
+     * 删除cmc结算审批
+     * 
+     * @param settleId cmc结算审批主键
+     * @return 结果
+     */
+    public int deleteCmcSettleBySettleId(String settleId);
+
+    /**
+     * 批量删除cmc结算审批
+     * 
+     * @param settleIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleBySettleIds(String[] settleIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettleSummary;
+
+/**
+ * cmc结算汇总Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcSettleSummaryMapper 
+{
+    /**
+     * 查询cmc结算汇总
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return cmc结算汇总
+     */
+    public CmcSettleSummary selectCmcSettleSummaryBySettleId(String settleId);
+
+    /**
+     * 查询cmc结算汇总列表
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return cmc结算汇总集合
+     */
+    public List<CmcSettleSummary> selectCmcSettleSummaryList(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 新增cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    public int insertCmcSettleSummary(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 修改cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    public int updateCmcSettleSummary(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 删除cmc结算汇总
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return 结果
+     */
+    public int deleteCmcSettleSummaryBySettleId(String settleId);
+
+    /**
+     * 批量删除cmc结算汇总
+     * 
+     * @param settleIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleSummaryBySettleIds(String[] settleIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettleWork;
+
+/**
+ * cmc经费计算Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface CmcSettleWorkMapper 
+{
+    /**
+     * 查询cmc经费计算
+     * 
+     * @param settleId cmc经费计算主键
+     * @return cmc经费计算
+     */
+    public CmcSettleWork selectCmcSettleWorkBySettleId(String settleId);
+
+    /**
+     * 查询cmc经费计算列表
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return cmc经费计算集合
+     */
+    public List<CmcSettleWork> selectCmcSettleWorkList(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 新增cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    public int insertCmcSettleWork(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 修改cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    public int updateCmcSettleWork(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 删除cmc经费计算
+     * 
+     * @param settleId cmc经费计算主键
+     * @return 结果
+     */
+    public int deleteCmcSettleWorkBySettleId(String settleId);
+
+    /**
+     * 批量删除cmc经费计算
+     * 
+     * @param settleIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleWorkBySettleIds(String[] settleIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcArchive;
+
+/**
+ * cmc成果归档Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcArchiveService 
+{
+    /**
+     * 查询cmc成果归档
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return cmc成果归档
+     */
+    public CmcArchive selectCmcArchiveByArchiveId(String archiveId);
+
+    /**
+     * 查询cmc成果归档列表
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return cmc成果归档集合
+     */
+    public List<CmcArchive> selectCmcArchiveList(CmcArchive cmcArchive);
+
+    /**
+     * 新增cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    public int insertCmcArchive(CmcArchive cmcArchive);
+
+    /**
+     * 修改cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    public int updateCmcArchive(CmcArchive cmcArchive);
+
+    /**
+     * 批量删除cmc成果归档
+     * 
+     * @param archiveIds 需要删除的cmc成果归档主键集合
+     * @return 结果
+     */
+    public int deleteCmcArchiveByArchiveIds(String[] archiveIds);
+
+    /**
+     * 删除cmc成果归档信息
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return 结果
+     */
+    public int deleteCmcArchiveByArchiveId(String archiveId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandPayment;
+
+/**
+ * cmc品牌项目支付记录Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcBrandPaymentService 
+{
+    /**
+     * 查询cmc品牌项目支付记录
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return cmc品牌项目支付记录
+     */
+    public List<CmcBrandPayment> selectCmcBrandPaymentByBrandId(String brandId);
+
+    /**
+     * 查询cmc品牌项目支付记录列表
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return cmc品牌项目支付记录集合
+     */
+    public List<CmcBrandPayment> selectCmcBrandPaymentList(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 新增cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    public int insertCmcBrandPayment(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 修改cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    public int updateCmcBrandPayment(CmcBrandPayment cmcBrandPayment);
+
+    /**
+     * 批量删除cmc品牌项目支付记录
+     * 
+     * @param brandIds 需要删除的cmc品牌项目支付记录主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandPaymentByBrandIds(String[] brandIds);
+
+    /**
+     * 删除cmc品牌项目支付记录信息
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return 结果
+     */
+    public int deleteCmcBrandPaymentByBrandId(String brandId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandProject;
+
+/**
+ * cmc品牌项目Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcBrandProjectService 
+{
+    /**
+     * 查询cmc品牌项目
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return cmc品牌项目
+     */
+    public CmcBrandProject selectCmcBrandProjectByProjectId(String projectId);
+
+    /**
+     * 查询cmc品牌项目列表
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return cmc品牌项目集合
+     */
+    public List<CmcBrandProject> selectCmcBrandProjectList(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 新增cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    public int insertCmcBrandProject(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 修改cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    public int updateCmcBrandProject(CmcBrandProject cmcBrandProject);
+
+    /**
+     * 批量删除cmc品牌项目
+     * 
+     * @param projectIds 需要删除的cmc品牌项目主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc品牌项目信息
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectByProjectId(String projectId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrand;
+
+/**
+ * cmc品牌项目支付审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcBrandService 
+{
+    /**
+     * 查询cmc品牌项目支付审批
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return cmc品牌项目支付审批
+     */
+    public CmcBrand selectCmcBrandByBrandId(String brandId);
+
+    /**
+     * 查询cmc品牌项目支付审批列表
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return cmc品牌项目支付审批集合
+     */
+    public List<CmcBrand> selectCmcBrandList(CmcBrand cmcBrand);
+
+    /**
+     * 新增cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    public int insertCmcBrand(CmcBrand cmcBrand);
+
+    /**
+     * 修改cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    public int updateCmcBrand(CmcBrand cmcBrand);
+
+    /**
+     * 批量删除cmc品牌项目支付审批
+     * 
+     * @param brandIds 需要删除的cmc品牌项目支付审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandByBrandIds(String[] brandIds);
+
+    /**
+     * 删除cmc品牌项目支付审批信息
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return 结果
+     */
+    public int deleteCmcBrandByBrandId(String brandId);
+}

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

@@ -49,7 +49,7 @@ public interface ICmcBudgetCarService
      * @param budgetIds 需要删除的cmc车辆预算主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarIds(String[] budgetIds);
+    public int deleteCmcBudgetCarByBudgetIds(String[] budgetIds);
 
     /**
      * 删除cmc车辆预算信息
@@ -57,5 +57,5 @@ public interface ICmcBudgetCarService
      * @param budgetId cmc车辆预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarId(String budgetId);
+    public int deleteCmcBudgetCarByBudgetId(String budgetId);
 }

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

@@ -46,16 +46,16 @@ public interface ICmcBudgetDeviceService
     /**
      * 批量删除cmc设备预算
      * 
-     * @param budgetDeviceIds 需要删除的cmc设备预算主键集合
+     * @param budgetIds 需要删除的cmc设备预算主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetDeviceByBudgetDeviceIds(String[] budgetDeviceIds);
+    public int deleteCmcBudgetDeviceByBudgetIds(String[] budgetIds);
 
     /**
      * 删除cmc设备预算信息
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc设备预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId);
+    public int deleteCmcBudgetDeviceByBudgetId(String budgetId);
 }

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

@@ -46,16 +46,16 @@ public interface ICmcBudgetSettleService
     /**
      * 批量删除cmc预结算
      * 
-     * @param budgetSettleIds 需要删除的cmc预结算主键集合
+     * @param budgetIds 需要删除的cmc预结算主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetSettleByBudgetSettleIds(String[] budgetSettleIds);
+    public int deleteCmcBudgetSettleByBudgetIds(String[] budgetIds);
 
     /**
      * 删除cmc预结算信息
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预结算主键
      * @return 结果
      */
-    public int deleteCmcBudgetSettleByBudgetSettleId(String budgetSettleId);
+    public int deleteCmcBudgetSettleByBudgetId(String budgetId);
 }

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

@@ -46,16 +46,16 @@ public interface ICmcBudgetStaffService
     /**
      * 批量删除cmc人员预算
      * 
-     * @param budgetStaffIds 需要删除的cmc人员预算主键集合
+     * @param budgetIds 需要删除的cmc人员预算主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetStaffByBudgetStaffIds(String[] budgetStaffIds);
+    public int deleteCmcBudgetStaffByBudgetIds(String[] budgetIds);
 
     /**
      * 删除cmc人员预算信息
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc人员预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetStaffByBudgetStaffId(String budgetStaffId);
+    public int deleteCmcBudgetStaffByBudgetId(String budgetId);
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeposit;
+
+/**
+ * cmc保证金审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcDepositService 
+{
+    /**
+     * 查询cmc保证金审批
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return cmc保证金审批
+     */
+    public CmcDeposit selectCmcDepositByDepositId(String depositId);
+
+    /**
+     * 查询cmc保证金审批列表
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return cmc保证金审批集合
+     */
+    public List<CmcDeposit> selectCmcDepositList(CmcDeposit cmcDeposit);
+
+    /**
+     * 新增cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    public int insertCmcDeposit(CmcDeposit cmcDeposit);
+
+    /**
+     * 修改cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    public int updateCmcDeposit(CmcDeposit cmcDeposit);
+
+    /**
+     * 批量删除cmc保证金审批
+     * 
+     * @param depositIds 需要删除的cmc保证金审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcDepositByDepositIds(String[] depositIds);
+
+    /**
+     * 删除cmc保证金审批信息
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return 结果
+     */
+    public int deleteCmcDepositByDepositId(String depositId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettle;
+
+/**
+ * cmc结算审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcSettleService 
+{
+    /**
+     * 查询cmc结算审批
+     * 
+     * @param settleId cmc结算审批主键
+     * @return cmc结算审批
+     */
+    public CmcSettle selectCmcSettleBySettleId(String settleId);
+
+    /**
+     * 查询cmc结算审批列表
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批集合
+     */
+    public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
+
+    /**
+     * 新增cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    public int insertCmcSettle(CmcSettle cmcSettle);
+
+    /**
+     * 修改cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    public int updateCmcSettle(CmcSettle cmcSettle);
+
+    /**
+     * 批量删除cmc结算审批
+     * 
+     * @param settleIds 需要删除的cmc结算审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleBySettleIds(String[] settleIds);
+
+    /**
+     * 删除cmc结算审批信息
+     * 
+     * @param settleId cmc结算审批主键
+     * @return 结果
+     */
+    public int deleteCmcSettleBySettleId(String settleId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettleSummary;
+
+/**
+ * cmc结算汇总Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcSettleSummaryService 
+{
+    /**
+     * 查询cmc结算汇总
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return cmc结算汇总
+     */
+    public CmcSettleSummary selectCmcSettleSummaryBySettleId(String settleId);
+
+    /**
+     * 查询cmc结算汇总列表
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return cmc结算汇总集合
+     */
+    public List<CmcSettleSummary> selectCmcSettleSummaryList(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 新增cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    public int insertCmcSettleSummary(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 修改cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    public int updateCmcSettleSummary(CmcSettleSummary cmcSettleSummary);
+
+    /**
+     * 批量删除cmc结算汇总
+     * 
+     * @param settleIds 需要删除的cmc结算汇总主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleSummaryBySettleIds(String[] settleIds);
+
+    /**
+     * 删除cmc结算汇总信息
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return 结果
+     */
+    public int deleteCmcSettleSummaryBySettleId(String settleId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSettleWork;
+
+/**
+ * cmc经费计算Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+public interface ICmcSettleWorkService 
+{
+    /**
+     * 查询cmc经费计算
+     * 
+     * @param settleId cmc经费计算主键
+     * @return cmc经费计算
+     */
+    public CmcSettleWork selectCmcSettleWorkBySettleId(String settleId);
+
+    /**
+     * 查询cmc经费计算列表
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return cmc经费计算集合
+     */
+    public List<CmcSettleWork> selectCmcSettleWorkList(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 新增cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    public int insertCmcSettleWork(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 修改cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    public int updateCmcSettleWork(CmcSettleWork cmcSettleWork);
+
+    /**
+     * 批量删除cmc经费计算
+     * 
+     * @param settleIds 需要删除的cmc经费计算主键集合
+     * @return 结果
+     */
+    public int deleteCmcSettleWorkBySettleIds(String[] settleIds);
+
+    /**
+     * 删除cmc经费计算信息
+     * 
+     * @param settleId cmc经费计算主键
+     * @return 结果
+     */
+    public int deleteCmcSettleWorkBySettleId(String settleId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcArchiveServiceImpl.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.CmcArchiveMapper;
+import com.ruoyi.oa.domain.CmcArchive;
+import com.ruoyi.oa.service.ICmcArchiveService;
+
+/**
+ * cmc成果归档Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcArchiveServiceImpl implements ICmcArchiveService 
+{
+    @Autowired
+    private CmcArchiveMapper cmcArchiveMapper;
+
+    /**
+     * 查询cmc成果归档
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return cmc成果归档
+     */
+    @Override
+    public CmcArchive selectCmcArchiveByArchiveId(String archiveId)
+    {
+        return cmcArchiveMapper.selectCmcArchiveByArchiveId(archiveId);
+    }
+
+    /**
+     * 查询cmc成果归档列表
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return cmc成果归档
+     */
+    @Override
+    public List<CmcArchive> selectCmcArchiveList(CmcArchive cmcArchive)
+    {
+        return cmcArchiveMapper.selectCmcArchiveList(cmcArchive);
+    }
+
+    /**
+     * 新增cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    @Override
+    public int insertCmcArchive(CmcArchive cmcArchive)
+    {
+        return cmcArchiveMapper.insertCmcArchive(cmcArchive);
+    }
+
+    /**
+     * 修改cmc成果归档
+     * 
+     * @param cmcArchive cmc成果归档
+     * @return 结果
+     */
+    @Override
+    public int updateCmcArchive(CmcArchive cmcArchive)
+    {
+        return cmcArchiveMapper.updateCmcArchive(cmcArchive);
+    }
+
+    /**
+     * 批量删除cmc成果归档
+     * 
+     * @param archiveIds 需要删除的cmc成果归档主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcArchiveByArchiveIds(String[] archiveIds)
+    {
+        return cmcArchiveMapper.deleteCmcArchiveByArchiveIds(archiveIds);
+    }
+
+    /**
+     * 删除cmc成果归档信息
+     * 
+     * @param archiveId cmc成果归档主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcArchiveByArchiveId(String archiveId)
+    {
+        return cmcArchiveMapper.deleteCmcArchiveByArchiveId(archiveId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBrandPaymentServiceImpl.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.CmcBrandPaymentMapper;
+import com.ruoyi.oa.domain.CmcBrandPayment;
+import com.ruoyi.oa.service.ICmcBrandPaymentService;
+
+/**
+ * cmc品牌项目支付记录Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcBrandPaymentServiceImpl implements ICmcBrandPaymentService 
+{
+    @Autowired
+    private CmcBrandPaymentMapper cmcBrandPaymentMapper;
+
+    /**
+     * 查询cmc品牌项目支付记录
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return cmc品牌项目支付记录
+     */
+    @Override
+    public List<CmcBrandPayment> selectCmcBrandPaymentByBrandId(String brandId)
+    {
+        return cmcBrandPaymentMapper.selectCmcBrandPaymentByBrandId(brandId);
+    }
+
+    /**
+     * 查询cmc品牌项目支付记录列表
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return cmc品牌项目支付记录
+     */
+    @Override
+    public List<CmcBrandPayment> selectCmcBrandPaymentList(CmcBrandPayment cmcBrandPayment)
+    {
+        return cmcBrandPaymentMapper.selectCmcBrandPaymentList(cmcBrandPayment);
+    }
+
+    /**
+     * 新增cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBrandPayment(CmcBrandPayment cmcBrandPayment)
+    {
+        return cmcBrandPaymentMapper.insertCmcBrandPayment(cmcBrandPayment);
+    }
+
+    /**
+     * 修改cmc品牌项目支付记录
+     * 
+     * @param cmcBrandPayment cmc品牌项目支付记录
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBrandPayment(CmcBrandPayment cmcBrandPayment)
+    {
+        return cmcBrandPaymentMapper.updateCmcBrandPayment(cmcBrandPayment);
+    }
+
+    /**
+     * 批量删除cmc品牌项目支付记录
+     * 
+     * @param brandIds 需要删除的cmc品牌项目支付记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandPaymentByBrandIds(String[] brandIds)
+    {
+        return cmcBrandPaymentMapper.deleteCmcBrandPaymentByBrandIds(brandIds);
+    }
+
+    /**
+     * 删除cmc品牌项目支付记录信息
+     * 
+     * @param brandId cmc品牌项目支付记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandPaymentByBrandId(String brandId)
+    {
+        return cmcBrandPaymentMapper.deleteCmcBrandPaymentByBrandId(brandId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBrandProjectServiceImpl.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.CmcBrandProjectMapper;
+import com.ruoyi.oa.domain.CmcBrandProject;
+import com.ruoyi.oa.service.ICmcBrandProjectService;
+
+/**
+ * cmc品牌项目Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcBrandProjectServiceImpl implements ICmcBrandProjectService 
+{
+    @Autowired
+    private CmcBrandProjectMapper cmcBrandProjectMapper;
+
+    /**
+     * 查询cmc品牌项目
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return cmc品牌项目
+     */
+    @Override
+    public CmcBrandProject selectCmcBrandProjectByProjectId(String projectId)
+    {
+        return cmcBrandProjectMapper.selectCmcBrandProjectByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc品牌项目列表
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return cmc品牌项目
+     */
+    @Override
+    public List<CmcBrandProject> selectCmcBrandProjectList(CmcBrandProject cmcBrandProject)
+    {
+        return cmcBrandProjectMapper.selectCmcBrandProjectList(cmcBrandProject);
+    }
+
+    /**
+     * 新增cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBrandProject(CmcBrandProject cmcBrandProject)
+    {
+        return cmcBrandProjectMapper.insertCmcBrandProject(cmcBrandProject);
+    }
+
+    /**
+     * 修改cmc品牌项目
+     * 
+     * @param cmcBrandProject cmc品牌项目
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBrandProject(CmcBrandProject cmcBrandProject)
+    {
+        return cmcBrandProjectMapper.updateCmcBrandProject(cmcBrandProject);
+    }
+
+    /**
+     * 批量删除cmc品牌项目
+     * 
+     * @param projectIds 需要删除的cmc品牌项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandProjectByProjectIds(String[] projectIds)
+    {
+        return cmcBrandProjectMapper.deleteCmcBrandProjectByProjectIds(projectIds);
+    }
+
+    /**
+     * 删除cmc品牌项目信息
+     * 
+     * @param projectId cmc品牌项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandProjectByProjectId(String projectId)
+    {
+        return cmcBrandProjectMapper.deleteCmcBrandProjectByProjectId(projectId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBrandServiceImpl.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.CmcBrandMapper;
+import com.ruoyi.oa.domain.CmcBrand;
+import com.ruoyi.oa.service.ICmcBrandService;
+
+/**
+ * cmc品牌项目支付审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcBrandServiceImpl implements ICmcBrandService 
+{
+    @Autowired
+    private CmcBrandMapper cmcBrandMapper;
+
+    /**
+     * 查询cmc品牌项目支付审批
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return cmc品牌项目支付审批
+     */
+    @Override
+    public CmcBrand selectCmcBrandByBrandId(String brandId)
+    {
+        return cmcBrandMapper.selectCmcBrandByBrandId(brandId);
+    }
+
+    /**
+     * 查询cmc品牌项目支付审批列表
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return cmc品牌项目支付审批
+     */
+    @Override
+    public List<CmcBrand> selectCmcBrandList(CmcBrand cmcBrand)
+    {
+        return cmcBrandMapper.selectCmcBrandList(cmcBrand);
+    }
+
+    /**
+     * 新增cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBrand(CmcBrand cmcBrand)
+    {
+        return cmcBrandMapper.insertCmcBrand(cmcBrand);
+    }
+
+    /**
+     * 修改cmc品牌项目支付审批
+     * 
+     * @param cmcBrand cmc品牌项目支付审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBrand(CmcBrand cmcBrand)
+    {
+        return cmcBrandMapper.updateCmcBrand(cmcBrand);
+    }
+
+    /**
+     * 批量删除cmc品牌项目支付审批
+     * 
+     * @param brandIds 需要删除的cmc品牌项目支付审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandByBrandIds(String[] brandIds)
+    {
+        return cmcBrandMapper.deleteCmcBrandByBrandIds(brandIds);
+    }
+
+    /**
+     * 删除cmc品牌项目支付审批信息
+     * 
+     * @param brandId cmc品牌项目支付审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandByBrandId(String brandId)
+    {
+        return cmcBrandMapper.deleteCmcBrandByBrandId(brandId);
+    }
+}

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

@@ -70,24 +70,24 @@ public class CmcBudgetCarServiceImpl implements ICmcBudgetCarService
     /**
      * 批量删除cmc车辆预算
      * 
-     * @param budgetCarIds 需要删除的cmc车辆预算主键
+     * @param budgetIds 需要删除的cmc车辆预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetCarByBudgetCarIds(String[] budgetCarIds)
+    public int deleteCmcBudgetCarByBudgetIds(String[] budgetIds)
     {
-        return cmcBudgetCarMapper.deleteCmcBudgetCarByBudgetCarIds(budgetCarIds);
+        return cmcBudgetCarMapper.deleteCmcBudgetCarByBudgetIds(budgetIds);
     }
 
     /**
      * 删除cmc车辆预算信息
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc车辆预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetCarByBudgetCarId(String budgetCarId)
+    public int deleteCmcBudgetCarByBudgetId(String budgetId)
     {
-        return cmcBudgetCarMapper.deleteCmcBudgetCarByBudgetCarId(budgetCarId);
+        return cmcBudgetCarMapper.deleteCmcBudgetCarByBudgetId(budgetId);
     }
 }

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

@@ -70,24 +70,24 @@ public class CmcBudgetDeviceServiceImpl implements ICmcBudgetDeviceService
     /**
      * 批量删除cmc设备预算
      * 
-     * @param budgetDeviceIds 需要删除的cmc设备预算主键
+     * @param budgetIds 需要删除的cmc设备预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetDeviceByBudgetDeviceIds(String[] budgetDeviceIds)
+    public int deleteCmcBudgetDeviceByBudgetIds(String[] budgetIds)
     {
-        return cmcBudgetDeviceMapper.deleteCmcBudgetDeviceByBudgetDeviceIds(budgetDeviceIds);
+        return cmcBudgetDeviceMapper.deleteCmcBudgetDeviceByBudgetIds(budgetIds);
     }
 
     /**
      * 删除cmc设备预算信息
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc设备预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId)
+    public int deleteCmcBudgetDeviceByBudgetId(String budgetId)
     {
-        return cmcBudgetDeviceMapper.deleteCmcBudgetDeviceByBudgetDeviceId(budgetDeviceId);
+        return cmcBudgetDeviceMapper.deleteCmcBudgetDeviceByBudgetId(budgetId);
     }
 }

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

@@ -70,24 +70,24 @@ public class CmcBudgetSettleServiceImpl implements ICmcBudgetSettleService
     /**
      * 批量删除cmc预结算
      * 
-     * @param budgetSettleIds 需要删除的cmc预结算主键
+     * @param budgetIds 需要删除的cmc预结算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetSettleByBudgetSettleIds(String[] budgetSettleIds)
+    public int deleteCmcBudgetSettleByBudgetIds(String[] budgetIds)
     {
-        return cmcBudgetSettleMapper.deleteCmcBudgetSettleByBudgetSettleIds(budgetSettleIds);
+        return cmcBudgetSettleMapper.deleteCmcBudgetSettleByBudgetIds(budgetIds);
     }
 
     /**
      * 删除cmc预结算信息
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预结算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetSettleByBudgetSettleId(String budgetSettleId)
+    public int deleteCmcBudgetSettleByBudgetId(String budgetId)
     {
-        return cmcBudgetSettleMapper.deleteCmcBudgetSettleByBudgetSettleId(budgetSettleId);
+        return cmcBudgetSettleMapper.deleteCmcBudgetSettleByBudgetId(budgetId);
     }
 }

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

@@ -70,24 +70,24 @@ public class CmcBudgetStaffServiceImpl implements ICmcBudgetStaffService
     /**
      * 批量删除cmc人员预算
      * 
-     * @param budgetStaffIds 需要删除的cmc人员预算主键
+     * @param budgetIds 需要删除的cmc人员预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetStaffByBudgetStaffIds(String[] budgetStaffIds)
+    public int deleteCmcBudgetStaffByBudgetIds(String[] budgetIds)
     {
-        return cmcBudgetStaffMapper.deleteCmcBudgetStaffByBudgetStaffIds(budgetStaffIds);
+        return cmcBudgetStaffMapper.deleteCmcBudgetStaffByBudgetIds(budgetIds);
     }
 
     /**
      * 删除cmc人员预算信息
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc人员预算主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetStaffByBudgetStaffId(String budgetStaffId)
+    public int deleteCmcBudgetStaffByBudgetId(String budgetId)
     {
-        return cmcBudgetStaffMapper.deleteCmcBudgetStaffByBudgetStaffId(budgetStaffId);
+        return cmcBudgetStaffMapper.deleteCmcBudgetStaffByBudgetId(budgetId);
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDepositServiceImpl.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.CmcDepositMapper;
+import com.ruoyi.oa.domain.CmcDeposit;
+import com.ruoyi.oa.service.ICmcDepositService;
+
+/**
+ * cmc保证金审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcDepositServiceImpl implements ICmcDepositService 
+{
+    @Autowired
+    private CmcDepositMapper cmcDepositMapper;
+
+    /**
+     * 查询cmc保证金审批
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return cmc保证金审批
+     */
+    @Override
+    public CmcDeposit selectCmcDepositByDepositId(String depositId)
+    {
+        return cmcDepositMapper.selectCmcDepositByDepositId(depositId);
+    }
+
+    /**
+     * 查询cmc保证金审批列表
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return cmc保证金审批
+     */
+    @Override
+    public List<CmcDeposit> selectCmcDepositList(CmcDeposit cmcDeposit)
+    {
+        return cmcDepositMapper.selectCmcDepositList(cmcDeposit);
+    }
+
+    /**
+     * 新增cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeposit(CmcDeposit cmcDeposit)
+    {
+        return cmcDepositMapper.insertCmcDeposit(cmcDeposit);
+    }
+
+    /**
+     * 修改cmc保证金审批
+     * 
+     * @param cmcDeposit cmc保证金审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeposit(CmcDeposit cmcDeposit)
+    {
+        return cmcDepositMapper.updateCmcDeposit(cmcDeposit);
+    }
+
+    /**
+     * 批量删除cmc保证金审批
+     * 
+     * @param depositIds 需要删除的cmc保证金审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDepositByDepositIds(String[] depositIds)
+    {
+        return cmcDepositMapper.deleteCmcDepositByDepositIds(depositIds);
+    }
+
+    /**
+     * 删除cmc保证金审批信息
+     * 
+     * @param depositId cmc保证金审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDepositByDepositId(String depositId)
+    {
+        return cmcDepositMapper.deleteCmcDepositByDepositId(depositId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcSettleServiceImpl.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.CmcSettleMapper;
+import com.ruoyi.oa.domain.CmcSettle;
+import com.ruoyi.oa.service.ICmcSettleService;
+
+/**
+ * cmc结算审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcSettleServiceImpl implements ICmcSettleService 
+{
+    @Autowired
+    private CmcSettleMapper cmcSettleMapper;
+
+    /**
+     * 查询cmc结算审批
+     * 
+     * @param settleId cmc结算审批主键
+     * @return cmc结算审批
+     */
+    @Override
+    public CmcSettle selectCmcSettleBySettleId(String settleId)
+    {
+        return cmcSettleMapper.selectCmcSettleBySettleId(settleId);
+    }
+
+    /**
+     * 查询cmc结算审批列表
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批
+     */
+    @Override
+    public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle)
+    {
+        return cmcSettleMapper.selectCmcSettleList(cmcSettle);
+    }
+
+    /**
+     * 新增cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSettle(CmcSettle cmcSettle)
+    {
+        return cmcSettleMapper.insertCmcSettle(cmcSettle);
+    }
+
+    /**
+     * 修改cmc结算审批
+     * 
+     * @param cmcSettle cmc结算审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSettle(CmcSettle cmcSettle)
+    {
+        return cmcSettleMapper.updateCmcSettle(cmcSettle);
+    }
+
+    /**
+     * 批量删除cmc结算审批
+     * 
+     * @param settleIds 需要删除的cmc结算审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleBySettleIds(String[] settleIds)
+    {
+        return cmcSettleMapper.deleteCmcSettleBySettleIds(settleIds);
+    }
+
+    /**
+     * 删除cmc结算审批信息
+     * 
+     * @param settleId cmc结算审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleBySettleId(String settleId)
+    {
+        return cmcSettleMapper.deleteCmcSettleBySettleId(settleId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcSettleSummaryServiceImpl.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.CmcSettleSummaryMapper;
+import com.ruoyi.oa.domain.CmcSettleSummary;
+import com.ruoyi.oa.service.ICmcSettleSummaryService;
+
+/**
+ * cmc结算汇总Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcSettleSummaryServiceImpl implements ICmcSettleSummaryService 
+{
+    @Autowired
+    private CmcSettleSummaryMapper cmcSettleSummaryMapper;
+
+    /**
+     * 查询cmc结算汇总
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return cmc结算汇总
+     */
+    @Override
+    public CmcSettleSummary selectCmcSettleSummaryBySettleId(String settleId)
+    {
+        return cmcSettleSummaryMapper.selectCmcSettleSummaryBySettleId(settleId);
+    }
+
+    /**
+     * 查询cmc结算汇总列表
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return cmc结算汇总
+     */
+    @Override
+    public List<CmcSettleSummary> selectCmcSettleSummaryList(CmcSettleSummary cmcSettleSummary)
+    {
+        return cmcSettleSummaryMapper.selectCmcSettleSummaryList(cmcSettleSummary);
+    }
+
+    /**
+     * 新增cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSettleSummary(CmcSettleSummary cmcSettleSummary)
+    {
+        return cmcSettleSummaryMapper.insertCmcSettleSummary(cmcSettleSummary);
+    }
+
+    /**
+     * 修改cmc结算汇总
+     * 
+     * @param cmcSettleSummary cmc结算汇总
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSettleSummary(CmcSettleSummary cmcSettleSummary)
+    {
+        return cmcSettleSummaryMapper.updateCmcSettleSummary(cmcSettleSummary);
+    }
+
+    /**
+     * 批量删除cmc结算汇总
+     * 
+     * @param settleIds 需要删除的cmc结算汇总主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleSummaryBySettleIds(String[] settleIds)
+    {
+        return cmcSettleSummaryMapper.deleteCmcSettleSummaryBySettleIds(settleIds);
+    }
+
+    /**
+     * 删除cmc结算汇总信息
+     * 
+     * @param settleId cmc结算汇总主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleSummaryBySettleId(String settleId)
+    {
+        return cmcSettleSummaryMapper.deleteCmcSettleSummaryBySettleId(settleId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcSettleWorkServiceImpl.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.CmcSettleWorkMapper;
+import com.ruoyi.oa.domain.CmcSettleWork;
+import com.ruoyi.oa.service.ICmcSettleWorkService;
+
+/**
+ * cmc经费计算Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-29
+ */
+@Service
+public class CmcSettleWorkServiceImpl implements ICmcSettleWorkService 
+{
+    @Autowired
+    private CmcSettleWorkMapper cmcSettleWorkMapper;
+
+    /**
+     * 查询cmc经费计算
+     * 
+     * @param settleId cmc经费计算主键
+     * @return cmc经费计算
+     */
+    @Override
+    public CmcSettleWork selectCmcSettleWorkBySettleId(String settleId)
+    {
+        return cmcSettleWorkMapper.selectCmcSettleWorkBySettleId(settleId);
+    }
+
+    /**
+     * 查询cmc经费计算列表
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return cmc经费计算
+     */
+    @Override
+    public List<CmcSettleWork> selectCmcSettleWorkList(CmcSettleWork cmcSettleWork)
+    {
+        return cmcSettleWorkMapper.selectCmcSettleWorkList(cmcSettleWork);
+    }
+
+    /**
+     * 新增cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSettleWork(CmcSettleWork cmcSettleWork)
+    {
+        return cmcSettleWorkMapper.insertCmcSettleWork(cmcSettleWork);
+    }
+
+    /**
+     * 修改cmc经费计算
+     * 
+     * @param cmcSettleWork cmc经费计算
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSettleWork(CmcSettleWork cmcSettleWork)
+    {
+        return cmcSettleWorkMapper.updateCmcSettleWork(cmcSettleWork);
+    }
+
+    /**
+     * 批量删除cmc经费计算
+     * 
+     * @param settleIds 需要删除的cmc经费计算主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleWorkBySettleIds(String[] settleIds)
+    {
+        return cmcSettleWorkMapper.deleteCmcSettleWorkBySettleIds(settleIds);
+    }
+
+    /**
+     * 删除cmc经费计算信息
+     * 
+     * @param settleId cmc经费计算主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSettleWorkBySettleId(String settleId)
+    {
+        return cmcSettleWorkMapper.deleteCmcSettleWorkBySettleId(settleId);
+    }
+}

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

@@ -0,0 +1,143 @@
+<?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.CmcArchiveMapper">
+    
+    <resultMap type="CmcArchive" id="CmcArchiveResult">
+        <result property="archiveId"    column="archive_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="submitTime"    column="submit_time"    />
+        <result property="submitSituation"    column="submit_situation"    />
+        <result property="locationLng"    column="location_lng"    />
+        <result property="locationLat"    column="location_lat"    />
+        <result property="produceInspector"    column="produce_inspector"    />
+        <result property="qualityInspector"    column="quality_inspector"    />
+        <result property="deptLeader"    column="dept_leader"    />
+        <result property="archiver"    column="archiver"    />
+        <result property="receiveTime"    column="receive_time"    />
+        <result property="qualityTime"    column="quality_time"    />
+        <result property="produceTime"    column="produce_time"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="archiveTime"    column="archive_time"    />
+        <result property="produceComment"    column="produce_comment"    />
+        <result property="qualityComment"    column="quality_comment"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <result property="archiveComment"    column="archive_comment"    />
+    </resultMap>
+
+    <sql id="selectCmcArchiveVo">
+        select archive_id, project_id, submit_time, submit_situation, location_lng, location_lat, produce_inspector, quality_inspector, dept_leader, archiver, receive_time, quality_time, produce_time, dept_time, archive_time, produce_comment, quality_comment, dept_comment, archive_comment from cmc_archive
+    </sql>
+
+    <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">
+        <include refid="selectCmcArchiveVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="submitTime != null "> and submit_time = #{submitTime}</if>
+            <if test="submitSituation != null  and submitSituation != ''"> and submit_situation = #{submitSituation}</if>
+            <if test="locationLng != null  and locationLng != ''"> and location_lng = #{locationLng}</if>
+            <if test="locationLat != null  and locationLat != ''"> and location_lat = #{locationLat}</if>
+            <if test="produceInspector != null "> and produce_inspector = #{produceInspector}</if>
+            <if test="qualityInspector != null "> and quality_inspector = #{qualityInspector}</if>
+            <if test="deptLeader != null "> and dept_leader = #{deptLeader}</if>
+            <if test="archiver != null "> and archiver = #{archiver}</if>
+            <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
+            <if test="qualityTime != null "> and quality_time = #{qualityTime}</if>
+            <if test="produceTime != null "> and produce_time = #{produceTime}</if>
+            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
+            <if test="archiveTime != null "> and archive_time = #{archiveTime}</if>
+            <if test="produceComment != null  and produceComment != ''"> and produce_comment = #{produceComment}</if>
+            <if test="qualityComment != null  and qualityComment != ''"> and quality_comment = #{qualityComment}</if>
+            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
+            <if test="archiveComment != null  and archiveComment != ''"> and archive_comment = #{archiveComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcArchiveByArchiveId" parameterType="String" resultMap="CmcArchiveResult">
+        <include refid="selectCmcArchiveVo"/>
+        where archive_id = #{archiveId}
+    </select>
+        
+    <insert id="insertCmcArchive" parameterType="CmcArchive">
+        insert into cmc_archive
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="archiveId != null">archive_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="submitTime != null">submit_time,</if>
+            <if test="submitSituation != null">submit_situation,</if>
+            <if test="locationLng != null">location_lng,</if>
+            <if test="locationLat != null">location_lat,</if>
+            <if test="produceInspector != null">produce_inspector,</if>
+            <if test="qualityInspector != null">quality_inspector,</if>
+            <if test="deptLeader != null">dept_leader,</if>
+            <if test="archiver != null">archiver,</if>
+            <if test="receiveTime != null">receive_time,</if>
+            <if test="qualityTime != null">quality_time,</if>
+            <if test="produceTime != null">produce_time,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="archiveTime != null">archive_time,</if>
+            <if test="produceComment != null">produce_comment,</if>
+            <if test="qualityComment != null">quality_comment,</if>
+            <if test="deptComment != null">dept_comment,</if>
+            <if test="archiveComment != null">archive_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="archiveId != null">#{archiveId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="submitTime != null">#{submitTime},</if>
+            <if test="submitSituation != null">#{submitSituation},</if>
+            <if test="locationLng != null">#{locationLng},</if>
+            <if test="locationLat != null">#{locationLat},</if>
+            <if test="produceInspector != null">#{produceInspector},</if>
+            <if test="qualityInspector != null">#{qualityInspector},</if>
+            <if test="deptLeader != null">#{deptLeader},</if>
+            <if test="archiver != null">#{archiver},</if>
+            <if test="receiveTime != null">#{receiveTime},</if>
+            <if test="qualityTime != null">#{qualityTime},</if>
+            <if test="produceTime != null">#{produceTime},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="archiveTime != null">#{archiveTime},</if>
+            <if test="produceComment != null">#{produceComment},</if>
+            <if test="qualityComment != null">#{qualityComment},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+            <if test="archiveComment != null">#{archiveComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcArchive" parameterType="CmcArchive">
+        update cmc_archive
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="submitTime != null">submit_time = #{submitTime},</if>
+            <if test="submitSituation != null">submit_situation = #{submitSituation},</if>
+            <if test="locationLng != null">location_lng = #{locationLng},</if>
+            <if test="locationLat != null">location_lat = #{locationLat},</if>
+            <if test="produceInspector != null">produce_inspector = #{produceInspector},</if>
+            <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
+            <if test="deptLeader != null">dept_leader = #{deptLeader},</if>
+            <if test="archiver != null">archiver = #{archiver},</if>
+            <if test="receiveTime != null">receive_time = #{receiveTime},</if>
+            <if test="qualityTime != null">quality_time = #{qualityTime},</if>
+            <if test="produceTime != null">produce_time = #{produceTime},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="archiveTime != null">archive_time = #{archiveTime},</if>
+            <if test="produceComment != null">produce_comment = #{produceComment},</if>
+            <if test="qualityComment != null">quality_comment = #{qualityComment},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+            <if test="archiveComment != null">archive_comment = #{archiveComment},</if>
+        </trim>
+        where archive_id = #{archiveId}
+    </update>
+
+    <delete id="deleteCmcArchiveByArchiveId" parameterType="String">
+        delete from cmc_archive where archive_id = #{archiveId}
+    </delete>
+
+    <delete id="deleteCmcArchiveByArchiveIds" parameterType="String">
+        delete from cmc_archive where archive_id in 
+        <foreach item="archiveId" collection="array" open="(" separator="," close=")">
+            #{archiveId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,97 @@
+<?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.CmcBrandMapper">
+    
+    <resultMap type="CmcBrand" id="CmcBrandResult">
+        <result property="brandId"    column="brand_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="approvalDocument"    column="approval_document"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="cwUserId"    column="cw_user_id"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="CwUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="cw_nick_name"    />
+    </resultMap>
+
+    <sql id="selectCmcBrandVo">
+        select b.brand_id, b.project_id, b.apply_reason, b.approval_document, b.applier, u.nick_name as applier_nick_name, b.apply_time, b.cw_user_id, u1.nick_name as cw_nick_name from cmc_brand as b
+        left join sys_user as u on u.user_id = b.applier
+        left join sys_user as u1 on u1.user_id = b.cw_user_id
+    </sql>
+
+    <select id="selectCmcBrandList" parameterType="CmcBrand" resultMap="CmcBrandResult">
+        <include refid="selectCmcBrandVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
+            <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
+            <if test="approvalDocument != null  and approvalDocument != ''"> and b.approval_document = #{approvalDocument}</if>
+            <if test="applier != null "> and b.applier = #{applier}</if>
+            <if test="applyTime != null "> and b.apply_time = #{applyTime}</if>
+            <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBrandByBrandId" parameterType="String" resultMap="CmcBrandResult">
+        <include refid="selectCmcBrandVo"/>
+        where b.brand_id = #{brandId}
+    </select>
+        
+    <insert id="insertCmcBrand" parameterType="CmcBrand">
+        insert into cmc_brand
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="brandId != null">brand_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="approvalDocument != null">approval_document,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="cwUserId != null">cw_user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="brandId != null">#{brandId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="approvalDocument != null">#{approvalDocument},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="cwUserId != null">#{cwUserId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBrand" parameterType="CmcBrand">
+        update cmc_brand
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="approvalDocument != null">approval_document = #{approvalDocument},</if>
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
+        </trim>
+        where brand_id = #{brandId}
+    </update>
+
+    <delete id="deleteCmcBrandByBrandId" parameterType="String">
+        delete from cmc_brand where brand_id = #{brandId}
+    </delete>
+
+    <delete id="deleteCmcBrandByBrandIds" parameterType="String">
+        delete from cmc_brand where brand_id in 
+        <foreach item="brandId" collection="array" open="(" separator="," close=")">
+            #{brandId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,68 @@
+<?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.CmcBrandPaymentMapper">
+    
+    <resultMap type="CmcBrandPayment" id="CmcBrandPaymentResult">
+        <result property="brandPaymentId"    column="brand_payment_id"    />
+        <result property="brandId"    column="brand_id"    />
+        <result property="paymentTime"    column="payment_time"    />
+        <result property="cwComment"    column="cw_comment"    />
+    </resultMap>
+
+    <sql id="selectCmcBrandPaymentVo">
+        select brand_payment_id, brand_id, payment_time, cw_comment from cmc_brand_payment
+    </sql>
+
+    <select id="selectCmcBrandPaymentList" parameterType="CmcBrandPayment" resultMap="CmcBrandPaymentResult">
+        <include refid="selectCmcBrandPaymentVo"/>
+        <where>  
+            <if test="brandId != null  and brandId != ''"> and brand_id = #{brandId}</if>
+            <if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
+            <if test="cwComment != null  and cwComment != ''"> and cw_comment = #{cwComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBrandPaymentByBrandId" parameterType="String" resultMap="CmcBrandPaymentResult">
+        <include refid="selectCmcBrandPaymentVo"/>
+        where brand_id = #{brandId}
+    </select>
+        
+    <insert id="insertCmcBrandPayment" parameterType="CmcBrandPayment">
+        insert into cmc_brand_payment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="brandPaymentId != null">brand_payment_id,</if>
+            <if test="brandId != null">brand_id,</if>
+            <if test="paymentTime != null">payment_time,</if>
+            <if test="cwComment != null">cw_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="brandPaymentId != null">#{brandPaymentId},</if>
+            <if test="brandId != null">#{brandId},</if>
+            <if test="paymentTime != null">#{paymentTime},</if>
+            <if test="cwComment != null">#{cwComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBrandPayment" parameterType="CmcBrandPayment">
+        update cmc_brand_payment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="brandId != null">brand_id = #{brandId},</if>
+            <if test="paymentTime != null">payment_time = #{paymentTime},</if>
+            <if test="cwComment != null">cw_comment = #{cwComment},</if>
+        </trim>
+        where brand_payment_id = #{brandPaymentId}
+    </update>
+
+    <delete id="deleteCmcBrandPaymentByBrandId" parameterType="String">
+        delete from cmc_brand_payment where brand_id = #{brandId}
+    </delete>
+
+    <delete id="deleteCmcBrandPaymentByBrandIds" parameterType="String">
+        delete from cmc_brand_payment where brand_id in
+        <foreach item="brandId" collection="array" open="(" separator="," close=")">
+            #{brandId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,107 @@
+<?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.CmcBrandProjectMapper">
+    
+    <resultMap type="CmcBrandProject" id="CmcBrandProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="partyA"    column="party_a"    />
+        <result property="aPerson"    column="a_person"    />
+        <result property="aPhone"    column="a_phone"    />
+        <result property="partnerId"    column="partner_id"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
+        <result property="duration"    column="duration"    />
+        <result property="amount"    column="amount"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcBrandProjectVo">
+        select project_id, project_number, project_name, party_a, a_person, a_phone, partner_id, contact_person, telephone, duration, amount, remark from cmc_brand_project
+    </sql>
+
+    <select id="selectCmcBrandProjectList" parameterType="CmcBrandProject" resultMap="CmcBrandProjectResult">
+        <include refid="selectCmcBrandProjectVo"/>
+        <where>  
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyA != null  and partyA != ''"> and party_a = #{partyA}</if>
+            <if test="aPerson != null  and aPerson != ''"> and a_person = #{aPerson}</if>
+            <if test="aPhone != null  and aPhone != ''"> and a_phone = #{aPhone}</if>
+            <if test="partnerId != null  and partnerId != ''"> and partner_id = #{partnerId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
+            <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBrandProjectByProjectId" parameterType="String" resultMap="CmcBrandProjectResult">
+        <include refid="selectCmcBrandProjectVo"/>
+        where project_id = #{projectId}
+    </select>
+        
+    <insert id="insertCmcBrandProject" parameterType="CmcBrandProject">
+        insert into cmc_brand_project
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="projectNumber != null">project_number,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="partyA != null">party_a,</if>
+            <if test="aPerson != null">a_person,</if>
+            <if test="aPhone != null">a_phone,</if>
+            <if test="partnerId != null">partner_id,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="telephone != null">telephone,</if>
+            <if test="duration != null">duration,</if>
+            <if test="amount != null">amount,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="partyA != null">#{partyA},</if>
+            <if test="aPerson != null">#{aPerson},</if>
+            <if test="aPhone != null">#{aPhone},</if>
+            <if test="partnerId != null">#{partnerId},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="telephone != null">#{telephone},</if>
+            <if test="duration != null">#{duration},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBrandProject" parameterType="CmcBrandProject">
+        update cmc_brand_project
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="aPerson != null">a_person = #{aPerson},</if>
+            <if test="aPhone != null">a_phone = #{aPhone},</if>
+            <if test="partnerId != null">partner_id = #{partnerId},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="duration != null">duration = #{duration},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where project_id = #{projectId}
+    </update>
+
+    <delete id="deleteCmcBrandProjectByProjectId" parameterType="String">
+        delete from cmc_brand_project where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcBrandProjectByProjectIds" parameterType="String">
+        delete from cmc_brand_project where project_id in 
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -95,14 +95,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where budget_car_id = #{budgetCarId}
     </update>
 
-    <delete id="deleteCmcBudgetCarByBudgetCarId" parameterType="String">
-        delete from cmc_budget_car where budget_car_id = #{budgetCarId}
+    <delete id="deleteCmcBudgetCarByBudgetId" parameterType="String">
+        delete from cmc_budget_car where budget_id = #{budgetId}
     </delete>
 
-    <delete id="deleteCmcBudgetCarByBudgetCarIds" parameterType="String">
-        delete from cmc_budget_car where budget_car_id in 
-        <foreach item="budgetCarId" collection="array" open="(" separator="," close=")">
-            #{budgetCarId}
+    <delete id="deleteCmcBudgetCarByBudgetIds" parameterType="String">
+        delete from cmc_budget_car where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
         </foreach>
     </delete>
 </mapper>

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

@@ -75,14 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where budget_device_id = #{budgetDeviceId}
     </update>
 
-    <delete id="deleteCmcBudgetDeviceByBudgetDeviceId" parameterType="String">
-        delete from cmc_budget_device where budget_device_id = #{budgetDeviceId}
+    <delete id="deleteCmcBudgetDeviceByBudgetId" parameterType="String">
+        delete from cmc_budget_device where budget_id = #{budgetId}
     </delete>
 
-    <delete id="deleteCmcBudgetDeviceByBudgetDeviceIds" parameterType="String">
-        delete from cmc_budget_device where budget_device_id in 
-        <foreach item="budgetDeviceId" collection="array" open="(" separator="," close=")">
-            #{budgetDeviceId}
+    <delete id="deleteCmcBudgetDeviceByBudgetIds" parameterType="String">
+        delete from cmc_budget_device where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
         </foreach>
     </delete>
 </mapper>

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

@@ -87,14 +87,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where budget_settle_id = #{budgetSettleId}
     </update>
 
-    <delete id="deleteCmcBudgetSettleByBudgetSettleId" parameterType="String">
-        delete from cmc_budget_settle where budget_settle_id = #{budgetSettleId}
+    <delete id="deleteCmcBudgetSettleByBudgetId" parameterType="String">
+        delete from cmc_budget_settle where budget_id = #{budgetId}
     </delete>
 
-    <delete id="deleteCmcBudgetSettleByBudgetSettleIds" parameterType="String">
-        delete from cmc_budget_settle where budget_settle_id in 
-        <foreach item="budgetSettleId" collection="array" open="(" separator="," close=")">
-            #{budgetSettleId}
+    <delete id="deleteCmcBudgetSettleByBudgetIds" parameterType="String">
+        delete from cmc_budget_settle where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
         </foreach>
     </delete>
 </mapper>

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

@@ -92,14 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where budget_staff_id = #{budgetStaffId}
     </update>
 
-    <delete id="deleteCmcBudgetStaffByBudgetStaffId" parameterType="String">
-        delete from cmc_budget_staff where budget_staff_id = #{budgetStaffId}
+    <delete id="deleteCmcBudgetStaffByBudgetId" parameterType="String">
+        delete from cmc_budget_staff where budget_id = #{budgetId}
     </delete>
 
-    <delete id="deleteCmcBudgetStaffByBudgetStaffIds" parameterType="String">
-        delete from cmc_budget_staff where budget_staff_id in 
-        <foreach item="budgetStaffId" collection="array" open="(" separator="," close=")">
-            #{budgetStaffId}
+    <delete id="deleteCmcBudgetStaffByBudgetIds" parameterType="String">
+        delete from cmc_budget_staff where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
         </foreach>
     </delete>
 </mapper>

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

@@ -0,0 +1,148 @@
+<?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.CmcDepositMapper">
+    
+    <resultMap type="CmcDeposit" id="CmcDepositResult">
+        <result property="depositId"    column="deposit_id"    />
+        <result property="depositType"    column="deposit_type"    />
+        <result property="tenderId"    column="tender_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="returnTime"    column="return_time"    />
+        <result property="accountName"    column="account_name"    />
+        <result property="accountBank"    column="account_bank"    />
+        <result property="cardNumber"    column="card_number"    />
+        <result property="depositWay"    column="deposit_way"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="applyDocument"    column="apply_document"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="remitTime"    column="remit_time"    />
+        <result property="cwTime"    column="cw_time"    />
+        <result property="backTime"    column="back_time"    />
+        <result property="cwComment"    column="cw_comment"    />
+        <result property="cwUserId"    column="cw_user_id"    />
+    </resultMap>
+
+    <sql id="selectCmcDepositVo">
+        select deposit_id, deposit_type, tender_id, contract_id, return_time, account_name, account_bank, card_number, deposit_way, applier, apply_time, apply_reason, apply_document, manager_time, manager_user_id, remit_time, cw_time, back_time, cw_comment, cw_user_id from cmc_deposit
+    </sql>
+
+    <select id="selectCmcDepositList" parameterType="CmcDeposit" resultMap="CmcDepositResult">
+        <include refid="selectCmcDepositVo"/>
+        <where>  
+            <if test="depositType != null  and depositType != ''"> and deposit_type = #{depositType}</if>
+            <if test="tenderId != null  and tenderId != ''"> and tender_id = #{tenderId}</if>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="returnTime != null "> and return_time = #{returnTime}</if>
+            <if test="accountName != null  and accountName != ''"> and account_name like concat('%', #{accountName}, '%')</if>
+            <if test="accountBank != null  and accountBank != ''"> and account_bank = #{accountBank}</if>
+            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
+            <if test="depositWay != null  and depositWay != ''"> and deposit_way = #{depositWay}</if>
+            <if test="applier != null "> and applier = #{applier}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
+            <if test="applyDocument != null  and applyDocument != ''"> and apply_document = #{applyDocument}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="remitTime != null "> and remit_time = #{remitTime}</if>
+            <if test="cwTime != null "> and cw_time = #{cwTime}</if>
+            <if test="backTime != null "> and back_time = #{backTime}</if>
+            <if test="cwComment != null  and cwComment != ''"> and cw_comment = #{cwComment}</if>
+            <if test="cwUserId != null "> and cw_user_id = #{cwUserId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcDepositByDepositId" parameterType="String" resultMap="CmcDepositResult">
+        <include refid="selectCmcDepositVo"/>
+        where deposit_id = #{depositId}
+    </select>
+        
+    <insert id="insertCmcDeposit" parameterType="CmcDeposit">
+        insert into cmc_deposit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="depositId != null">deposit_id,</if>
+            <if test="depositType != null">deposit_type,</if>
+            <if test="tenderId != null">tender_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="returnTime != null">return_time,</if>
+            <if test="accountName != null">account_name,</if>
+            <if test="accountBank != null">account_bank,</if>
+            <if test="cardNumber != null">card_number,</if>
+            <if test="depositWay != null">deposit_way,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="applyDocument != null">apply_document,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="remitTime != null">remit_time,</if>
+            <if test="cwTime != null">cw_time,</if>
+            <if test="backTime != null">back_time,</if>
+            <if test="cwComment != null">cw_comment,</if>
+            <if test="cwUserId != null">cw_user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="depositId != null">#{depositId},</if>
+            <if test="depositType != null">#{depositType},</if>
+            <if test="tenderId != null">#{tenderId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="returnTime != null">#{returnTime},</if>
+            <if test="accountName != null">#{accountName},</if>
+            <if test="accountBank != null">#{accountBank},</if>
+            <if test="cardNumber != null">#{cardNumber},</if>
+            <if test="depositWay != null">#{depositWay},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="applyDocument != null">#{applyDocument},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="remitTime != null">#{remitTime},</if>
+            <if test="cwTime != null">#{cwTime},</if>
+            <if test="backTime != null">#{backTime},</if>
+            <if test="cwComment != null">#{cwComment},</if>
+            <if test="cwUserId != null">#{cwUserId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeposit" parameterType="CmcDeposit">
+        update cmc_deposit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="depositType != null">deposit_type = #{depositType},</if>
+            <if test="tenderId != null">tender_id = #{tenderId},</if>
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="returnTime != null">return_time = #{returnTime},</if>
+            <if test="accountName != null">account_name = #{accountName},</if>
+            <if test="accountBank != null">account_bank = #{accountBank},</if>
+            <if test="cardNumber != null">card_number = #{cardNumber},</if>
+            <if test="depositWay != null">deposit_way = #{depositWay},</if>
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="applyDocument != null">apply_document = #{applyDocument},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="remitTime != null">remit_time = #{remitTime},</if>
+            <if test="cwTime != null">cw_time = #{cwTime},</if>
+            <if test="backTime != null">back_time = #{backTime},</if>
+            <if test="cwComment != null">cw_comment = #{cwComment},</if>
+            <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
+        </trim>
+        where deposit_id = #{depositId}
+    </update>
+
+    <delete id="deleteCmcDepositByDepositId" parameterType="String">
+        delete from cmc_deposit where deposit_id = #{depositId}
+    </delete>
+
+    <delete id="deleteCmcDepositByDepositIds" parameterType="String">
+        delete from cmc_deposit where deposit_id in 
+        <foreach item="depositId" collection="array" open="(" separator="," close=")">
+            #{depositId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcProjectCommentList" parameterType="CmcProjectComment" resultMap="CmcProjectCommentResult">
         <include refid="selectCmcProjectCommentVo"/>
         <where>  
+            <if test="projectId != null  and projectId != ''"> and pc.project_id = #{projectId}</if>
             <if test="jyComment != null  and jyComment != ''"> and pc.jy_comment = #{jyComment}</if>
             <if test="jyApprover != null "> and pc.jy_approver = #{jyApprover}</if>
             <if test="jyApprovalTime != null "> and pc.jy_approval_time = #{jyApprovalTime}</if>

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

@@ -25,8 +25,6 @@
         <result property="entryTime"    column="entry_time"    />
         <result property="exitTime"    column="exit_time"    />
         <result property="remark"    column="remark"    />
-        <result property="budgetId"    column="budget_id"    />
-        <result property="technicalId"    column="technical_id"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
     </resultMap>
@@ -42,7 +40,7 @@
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
+        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
     </sql>
@@ -67,8 +65,6 @@
             <if test="planTime != null "> and p.plan_time = #{planTime}</if>
             <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
-            <if test="budgetId != null  and budgetId != ''"> and p.budget_id = #{budgetId}</if>
-            <if test="technicalId != null  and technicalId != ''"> and p.technical_id = #{technicalId}</if>
         </where>
     </select>
 
@@ -100,8 +96,6 @@
             <if test="entryTime != null">entry_time,</if>
             <if test="exitTime != null">exit_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="budgetId != null">budget_id,</if>
-            <if test="technicalId != null">technical_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -124,8 +118,6 @@
             <if test="entryTime != null">#{entryTime},</if>
             <if test="exitTime != null">#{exitTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="budgetId != null">#{budgetId},</if>
-            <if test="technicalId != null">#{technicalId},</if>
         </trim>
     </insert>
 
@@ -151,8 +143,6 @@
             <if test="entryTime != null">entry_time = #{entryTime},</if>
             <if test="exitTime != null">exit_time = #{exitTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="budgetId != null">budget_id = #{budgetId},</if>
-            <if test="technicalId != null">technical_id = #{technicalId},</if>
         </trim>
         where project_id = #{projectId}
     </update>

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

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcProjectWorkList" parameterType="CmcProjectWork" resultMap="CmcProjectWorkResult">
         <include refid="selectCmcProjectWorkVo"/>
         <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
             <if test="scale != null  and scale != ''"> and scale like concat('%', #{scale}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>

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

@@ -0,0 +1,183 @@
+<?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.CmcSettleMapper">
+    
+    <resultMap type="CmcSettle" id="CmcSettleResult">
+        <result property="settleId"    column="settle_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="workloadReport"    column="workload_report"    />
+        <result property="reporter"    column="reporter"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="settleComment"    column="settle_comment"    />
+        <result property="zhUserId"    column="zh_user_id"    />
+        <result property="zhTime"    column="zh_time"    />
+        <result property="zhComment"    column="zh_comment"    />
+        <result property="jsUserId"    column="js_user_id"    />
+        <result property="jsTime"    column="js_time"    />
+        <result property="jsComment"    column="js_comment"    />
+        <result property="xmUserId"    column="xm_user_id"    />
+        <result property="xmTime"    column="xm_time"    />
+        <result property="xmComment"    column="xm_comment"    />
+        <result property="deptUserId"    column="dept_user_id"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <result property="jyUserId"    column="jy_user_id"    />
+        <result property="jyTime"    column="jy_time"    />
+        <result property="jyComment"    column="jy_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="gmUserId"    column="gm_user_id"    />
+        <result property="gmTime"    column="gm_time"    />
+        <result property="gmComment"    column="gm_comment"    />
+    </resultMap>
+
+    <sql id="selectCmcSettleVo">
+        select settle_id, project_id, workload_report, reporter, report_time, settle_comment, zh_user_id, zh_time, zh_comment, js_user_id, js_time, js_comment, xm_user_id, xm_time, xm_comment, dept_user_id, dept_time, dept_comment, jy_user_id, jy_time, jy_comment, manager_user_id, manager_time, manager_comment, gm_user_id, gm_time, gm_comment from cmc_settle
+    </sql>
+
+    <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
+        <include refid="selectCmcSettleVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="workloadReport != null  and workloadReport != ''"> and workload_report = #{workloadReport}</if>
+            <if test="reporter != null "> and reporter = #{reporter}</if>
+            <if test="reportTime != null "> and report_time = #{reportTime}</if>
+            <if test="settleComment != null  and settleComment != ''"> and settle_comment = #{settleComment}</if>
+            <if test="zhUserId != null "> and zh_user_id = #{zhUserId}</if>
+            <if test="zhTime != null "> and zh_time = #{zhTime}</if>
+            <if test="zhComment != null  and zhComment != ''"> and zh_comment = #{zhComment}</if>
+            <if test="jsUserId != null "> and js_user_id = #{jsUserId}</if>
+            <if test="jsTime != null "> and js_time = #{jsTime}</if>
+            <if test="jsComment != null  and jsComment != ''"> and js_comment = #{jsComment}</if>
+            <if test="xmUserId != null "> and xm_user_id = #{xmUserId}</if>
+            <if test="xmTime != null "> and xm_time = #{xmTime}</if>
+            <if test="xmComment != null  and xmComment != ''"> and xm_comment = #{xmComment}</if>
+            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
+            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
+            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
+            <if test="jyUserId != null "> and jy_user_id = #{jyUserId}</if>
+            <if test="jyTime != null "> and jy_time = #{jyTime}</if>
+            <if test="jyComment != null  and jyComment != ''"> and jy_comment = #{jyComment}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
+            <if test="gmUserId != null "> and gm_user_id = #{gmUserId}</if>
+            <if test="gmTime != null "> and gm_time = #{gmTime}</if>
+            <if test="gmComment != null  and gmComment != ''"> and gm_comment = #{gmComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
+        <include refid="selectCmcSettleVo"/>
+        where settle_id = #{settleId}
+    </select>
+        
+    <insert id="insertCmcSettle" parameterType="CmcSettle">
+        insert into cmc_settle
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="settleId != null">settle_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="workloadReport != null">workload_report,</if>
+            <if test="reporter != null">reporter,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="settleComment != null">settle_comment,</if>
+            <if test="zhUserId != null">zh_user_id,</if>
+            <if test="zhTime != null">zh_time,</if>
+            <if test="zhComment != null">zh_comment,</if>
+            <if test="jsUserId != null">js_user_id,</if>
+            <if test="jsTime != null">js_time,</if>
+            <if test="jsComment != null">js_comment,</if>
+            <if test="xmUserId != null">xm_user_id,</if>
+            <if test="xmTime != null">xm_time,</if>
+            <if test="xmComment != null">xm_comment,</if>
+            <if test="deptUserId != null">dept_user_id,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="deptComment != null">dept_comment,</if>
+            <if test="jyUserId != null">jy_user_id,</if>
+            <if test="jyTime != null">jy_time,</if>
+            <if test="jyComment != null">jy_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="gmUserId != null">gm_user_id,</if>
+            <if test="gmTime != null">gm_time,</if>
+            <if test="gmComment != null">gm_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="settleId != null">#{settleId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="workloadReport != null">#{workloadReport},</if>
+            <if test="reporter != null">#{reporter},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="settleComment != null">#{settleComment},</if>
+            <if test="zhUserId != null">#{zhUserId},</if>
+            <if test="zhTime != null">#{zhTime},</if>
+            <if test="zhComment != null">#{zhComment},</if>
+            <if test="jsUserId != null">#{jsUserId},</if>
+            <if test="jsTime != null">#{jsTime},</if>
+            <if test="jsComment != null">#{jsComment},</if>
+            <if test="xmUserId != null">#{xmUserId},</if>
+            <if test="xmTime != null">#{xmTime},</if>
+            <if test="xmComment != null">#{xmComment},</if>
+            <if test="deptUserId != null">#{deptUserId},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+            <if test="jyUserId != null">#{jyUserId},</if>
+            <if test="jyTime != null">#{jyTime},</if>
+            <if test="jyComment != null">#{jyComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="gmUserId != null">#{gmUserId},</if>
+            <if test="gmTime != null">#{gmTime},</if>
+            <if test="gmComment != null">#{gmComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcSettle" parameterType="CmcSettle">
+        update cmc_settle
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="workloadReport != null">workload_report = #{workloadReport},</if>
+            <if test="reporter != null">reporter = #{reporter},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="settleComment != null">settle_comment = #{settleComment},</if>
+            <if test="zhUserId != null">zh_user_id = #{zhUserId},</if>
+            <if test="zhTime != null">zh_time = #{zhTime},</if>
+            <if test="zhComment != null">zh_comment = #{zhComment},</if>
+            <if test="jsUserId != null">js_user_id = #{jsUserId},</if>
+            <if test="jsTime != null">js_time = #{jsTime},</if>
+            <if test="jsComment != null">js_comment = #{jsComment},</if>
+            <if test="xmUserId != null">xm_user_id = #{xmUserId},</if>
+            <if test="xmTime != null">xm_time = #{xmTime},</if>
+            <if test="xmComment != null">xm_comment = #{xmComment},</if>
+            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+            <if test="jyUserId != null">jy_user_id = #{jyUserId},</if>
+            <if test="jyTime != null">jy_time = #{jyTime},</if>
+            <if test="jyComment != null">jy_comment = #{jyComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
+            <if test="gmTime != null">gm_time = #{gmTime},</if>
+            <if test="gmComment != null">gm_comment = #{gmComment},</if>
+        </trim>
+        where settle_id = #{settleId}
+    </update>
+
+    <delete id="deleteCmcSettleBySettleId" parameterType="String">
+        delete from cmc_settle where settle_id = #{settleId}
+    </delete>
+
+    <delete id="deleteCmcSettleBySettleIds" parameterType="String">
+        delete from cmc_settle where settle_id in 
+        <foreach item="settleId" collection="array" open="(" separator="," close=")">
+            #{settleId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,82 @@
+<?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.CmcSettleSummaryMapper">
+    
+    <resultMap type="CmcSettleSummary" id="CmcSettleSummaryResult">
+        <result property="summaryId"    column="summary_id"    />
+        <result property="settleId"    column="settle_id"    />
+        <result property="content"    column="content"    />
+        <result property="amount"    column="amount"    />
+        <result property="amountXm"    column="amount_xm"    />
+        <result property="amountManager"    column="amount_manager"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcSettleSummaryVo">
+        select summary_id, settle_id, content, amount, amount_xm, amount_manager, remark from cmc_settle_summary
+    </sql>
+
+    <select id="selectCmcSettleSummaryList" parameterType="CmcSettleSummary" resultMap="CmcSettleSummaryResult">
+        <include refid="selectCmcSettleSummaryVo"/>
+        <where>  
+            <if test="settleId != null  and settleId != ''"> and settle_id = #{settleId}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="amountXm != null "> and amount_xm = #{amountXm}</if>
+            <if test="amountManager != null "> and amount_manager = #{amountManager}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcSettleSummaryBySettleId" parameterType="String" resultMap="CmcSettleSummaryResult">
+        <include refid="selectCmcSettleSummaryVo"/>
+        where settle_id = #{settleId}
+    </select>
+        
+    <insert id="insertCmcSettleSummary" parameterType="CmcSettleSummary">
+        insert into cmc_settle_summary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="summaryId != null">summary_id,</if>
+            <if test="settleId != null">settle_id,</if>
+            <if test="content != null">content,</if>
+            <if test="amount != null">amount,</if>
+            <if test="amountXm != null">amount_xm,</if>
+            <if test="amountManager != null">amount_manager,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="summaryId != null">#{summaryId},</if>
+            <if test="settleId != null">#{settleId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="amountXm != null">#{amountXm},</if>
+            <if test="amountManager != null">#{amountManager},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcSettleSummary" parameterType="CmcSettleSummary">
+        update cmc_settle_summary
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="settleId != null">settle_id = #{settleId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="amountXm != null">amount_xm = #{amountXm},</if>
+            <if test="amountManager != null">amount_manager = #{amountManager},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where summary_id = #{summaryId}
+    </update>
+
+    <delete id="deleteCmcSettleSummaryBySettleId" parameterType="String">
+        delete from cmc_settle_summary where settle_id = #{settleId}
+    </delete>
+
+    <delete id="deleteCmcSettleSummaryBySettleIds" parameterType="String">
+        delete from cmc_settle_summary where settle_id in
+        <foreach item="settleId" collection="array" open="(" separator="," close=")">
+            #{settleId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,102 @@
+<?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.CmcSettleWorkMapper">
+    
+    <resultMap type="CmcSettleWork" id="CmcSettleWorkResult">
+        <result property="workId"    column="work_id"    />
+        <result property="settleId"    column="settle_id"    />
+        <result property="content"    column="content"    />
+        <result property="priceId"    column="price_id"    />
+        <result property="workload"    column="workload"    />
+        <result property="coefficient"    column="coefficient"    />
+        <result property="groundType"    column="ground_type"    />
+        <result property="settle"    column="settle"    />
+        <result property="settleXm"    column="settle_xm"    />
+        <result property="settleManager"    column="settle_manager"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcSettleWorkVo">
+        select work_id, settle_id, content, price_id, workload, coefficient, ground_type, settle, settle_xm, settle_manager, remark from cmc_settle_work
+    </sql>
+
+    <select id="selectCmcSettleWorkList" parameterType="CmcSettleWork" resultMap="CmcSettleWorkResult">
+        <include refid="selectCmcSettleWorkVo"/>
+        <where>  
+            <if test="settleId != null  and settleId != ''"> and settle_id = #{settleId}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="priceId != null "> and price_id = #{priceId}</if>
+            <if test="workload != null "> and workload = #{workload}</if>
+            <if test="coefficient != null "> and coefficient = #{coefficient}</if>
+            <if test="groundType != null  and groundType != ''"> and ground_type = #{groundType}</if>
+            <if test="settle != null "> and settle = #{settle}</if>
+            <if test="settleXm != null "> and settle_xm = #{settleXm}</if>
+            <if test="settleManager != null "> and settle_manager = #{settleManager}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcSettleWorkBySettleId" parameterType="String" resultMap="CmcSettleWorkResult">
+        <include refid="selectCmcSettleWorkVo"/>
+        where settle_id = #{settleId}
+    </select>
+        
+    <insert id="insertCmcSettleWork" parameterType="CmcSettleWork">
+        insert into cmc_settle_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
+            <if test="settleId != null">settle_id,</if>
+            <if test="content != null">content,</if>
+            <if test="priceId != null">price_id,</if>
+            <if test="workload != null">workload,</if>
+            <if test="coefficient != null">coefficient,</if>
+            <if test="groundType != null">ground_type,</if>
+            <if test="settle != null">settle,</if>
+            <if test="settleXm != null">settle_xm,</if>
+            <if test="settleManager != null">settle_manager,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
+            <if test="settleId != null">#{settleId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="priceId != null">#{priceId},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="coefficient != null">#{coefficient},</if>
+            <if test="groundType != null">#{groundType},</if>
+            <if test="settle != null">#{settle},</if>
+            <if test="settleXm != null">#{settleXm},</if>
+            <if test="settleManager != null">#{settleManager},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcSettleWork" parameterType="CmcSettleWork">
+        update cmc_settle_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="settleId != null">settle_id = #{settleId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="priceId != null">price_id = #{priceId},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="coefficient != null">coefficient = #{coefficient},</if>
+            <if test="groundType != null">ground_type = #{groundType},</if>
+            <if test="settle != null">settle = #{settle},</if>
+            <if test="settleXm != null">settle_xm = #{settleXm},</if>
+            <if test="settleManager != null">settle_manager = #{settleManager},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where work_id = #{workId}
+    </update>
+
+    <delete id="deleteCmcSettleWorkBySettleId" parameterType="String">
+        delete from cmc_settle_work where settle_id = #{settleId}
+    </delete>
+
+    <delete id="deleteCmcSettleWorkBySettleIds" parameterType="String">
+        delete from cmc_settle_work where settle_id in
+        <foreach item="settleId" collection="array" open="(" separator="," close=")">
+            #{settleId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui/src/api/oa/archive/archive.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc成果归档列表
+export function listArchive(query) {
+  return request({
+    url: '/oa/archive/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc成果归档详细
+export function getArchive(archiveId) {
+  return request({
+    url: '/oa/archive/' + archiveId,
+    method: 'get'
+  })
+}
+
+// 新增cmc成果归档
+export function addArchive(data) {
+  return request({
+    url: '/oa/archive',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc成果归档
+export function updateArchive(data) {
+  return request({
+    url: '/oa/archive',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc成果归档
+export function delArchive(archiveId) {
+  return request({
+    url: '/oa/archive/' + archiveId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/brand/brand.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc品牌项目支付审批列表
+export function listBrand(query) {
+  return request({
+    url: '/oa/brand/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc品牌项目支付审批详细
+export function getBrand(brandId) {
+  return request({
+    url: '/oa/brand/' + brandId,
+    method: 'get'
+  })
+}
+
+// 新增cmc品牌项目支付审批
+export function addBrand(data) {
+  return request({
+    url: '/oa/brand',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc品牌项目支付审批
+export function updateBrand(data) {
+  return request({
+    url: '/oa/brand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc品牌项目支付审批
+export function delBrand(brandId) {
+  return request({
+    url: '/oa/brand/' + brandId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/brand/brandPayment.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-29 13:55:26
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 15:19:07
+ */
+import request from '@/utils/request'
+
+// 查询cmc品牌项目支付记录列表
+export function listBrandPayment(query) {
+  return request({
+    url: '/oa/brandPayment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc品牌项目支付记录详细
+export function getBrandPayment(brandId) {
+  return request({
+    url: '/oa/brandPayment/' + brandId,
+    method: 'get'
+  })
+}
+
+// 新增cmc品牌项目支付记录
+export function addBrandPayment(data) {
+  return request({
+    url: '/oa/brandPayment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc品牌项目支付记录
+export function updateBrandPayment(data) {
+  return request({
+    url: '/oa/brandPayment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc品牌项目支付记录
+export function delBrandPayment(brandId) {
+  return request({
+    url: '/oa/brandPayment/' + brandId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/brand/brandProject.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc品牌项目列表
+export function listBrandProject(query) {
+  return request({
+    url: '/oa/brandProject/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc品牌项目详细
+export function getBrandProject(projectId) {
+  return request({
+    url: '/oa/brandProject/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc品牌项目
+export function addBrandProject(data) {
+  return request({
+    url: '/oa/brandProject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc品牌项目
+export function updateBrandProject(data) {
+  return request({
+    url: '/oa/brandProject',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc品牌项目
+export function delBrandProject(projectId) {
+  return request({
+    url: '/oa/brandProject/' + projectId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/budget/budgetCar.js

@@ -10,9 +10,9 @@ export function listBudgetCar(query) {
 }
 
 // 查询cmc车辆预算详细
-export function getBudgetCar(budgetCarId) {
+export function getBudgetCar(budgetId) {
   return request({
-    url: '/oa/budgetCar/' + budgetCarId,
+    url: '/oa/budgetCar/' + budgetId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBudgetCar(data) {
 }
 
 // 删除cmc车辆预算
-export function delBudgetCar(budgetCarId) {
+export function delBudgetCar(budgetId) {
   return request({
-    url: '/oa/budgetCar/' + budgetCarId,
+    url: '/oa/budgetCar/' + budgetId,
     method: 'delete'
   })
 }

oa-ui/src/api/oa/budget/budgetDevice.js

@@ -10,9 +10,9 @@ export function listBudgetDevice(query) {
 }
 
 // 查询cmc设备预算详细
-export function getBudgetDevice(budgetDeviceId) {
+export function getBudgetDevice(budgetId) {
   return request({
-    url: '/oa/budgetDevice/' + budgetDeviceId,
+    url: '/oa/budgetDevice/' + budgetId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBudgetDevice(data) {
 }
 
 // 删除cmc设备预算
-export function delBudgetDevice(budgetDeviceId) {
+export function delBudgetDevice(budgetId) {
   return request({
-    url: '/oa/budgetDevice/' + budgetDeviceId,
+    url: '/oa/budgetDevice/' + budgetId,
     method: 'delete'
   })
 }

oa-ui/src/api/oa/budget/budgetSettle.js

@@ -10,9 +10,9 @@ export function listBudgetSettle(query) {
 }
 
 // 查询cmc预结算详细
-export function getBudgetSettle(budgetSettleId) {
+export function getBudgetSettle(budgetId) {
   return request({
-    url: '/oa/budgetSettle/' + budgetSettleId,
+    url: '/oa/budgetSettle/' + budgetId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBudgetSettle(data) {
 }
 
 // 删除cmc预结算
-export function delBudgetSettle(budgetSettleId) {
+export function delBudgetSettle(budgetId) {
   return request({
-    url: '/oa/budgetSettle/' + budgetSettleId,
+    url: '/oa/budgetSettle/' + budgetId,
     method: 'delete'
   })
 }

oa-ui/src/api/oa/budget/budgetStaff.js

@@ -10,9 +10,9 @@ export function listBudgetStaff(query) {
 }
 
 // 查询cmc人员预算详细
-export function getBudgetStaff(budgetStaffId) {
+export function getBudgetStaff(budgetId) {
   return request({
-    url: '/oa/budgetStaff/' + budgetStaffId,
+    url: '/oa/budgetStaff/' + budgetId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBudgetStaff(data) {
 }
 
 // 删除cmc人员预算
-export function delBudgetStaff(budgetStaffId) {
+export function delBudgetStaff(budgetId) {
   return request({
-    url: '/oa/budgetStaff/' + budgetStaffId,
+    url: '/oa/budgetStaff/' + budgetId,
     method: 'delete'
   })
 }

oa-ui/src/api/oa/deposit/deposit.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc保证金审批列表
+export function listDeposit(query) {
+  return request({
+    url: '/oa/deposit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc保证金审批详细
+export function getDeposit(depositId) {
+  return request({
+    url: '/oa/deposit/' + depositId,
+    method: 'get'
+  })
+}
+
+// 新增cmc保证金审批
+export function addDeposit(data) {
+  return request({
+    url: '/oa/deposit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc保证金审批
+export function updateDeposit(data) {
+  return request({
+    url: '/oa/deposit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc保证金审批
+export function delDeposit(depositId) {
+  return request({
+    url: '/oa/deposit/' + depositId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/settle/settle.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc结算审批列表
+export function listSettle(query) {
+  return request({
+    url: '/oa/settle/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc结算审批详细
+export function getSettle(settleId) {
+  return request({
+    url: '/oa/settle/' + settleId,
+    method: 'get'
+  })
+}
+
+// 新增cmc结算审批
+export function addSettle(data) {
+  return request({
+    url: '/oa/settle',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc结算审批
+export function updateSettle(data) {
+  return request({
+    url: '/oa/settle',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc结算审批
+export function delSettle(settleId) {
+  return request({
+    url: '/oa/settle/' + settleId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/settle/settleSummary.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-29 13:55:26
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 15:19:50
+ */
+import request from '@/utils/request'
+
+// 查询cmc结算汇总列表
+export function listSettleSummary(query) {
+  return request({
+    url: '/oa/settleSummary/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc结算汇总详细
+export function getSettleSummary(settleId) {
+  return request({
+    url: '/oa/settleSummary/' + settleId,
+    method: 'get'
+  })
+}
+
+// 新增cmc结算汇总
+export function addSettleSummary(data) {
+  return request({
+    url: '/oa/settleSummary',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc结算汇总
+export function updateSettleSummary(data) {
+  return request({
+    url: '/oa/settleSummary',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc结算汇总
+export function delSettleSummary(settleId) {
+  return request({
+    url: '/oa/settleSummary/' + settleId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/settle/settleWork.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc经费计算列表
+export function listSettleWork(query) {
+  return request({
+    url: '/oa/settleWork/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc经费计算详细
+export function getSettleWork(settleId) {
+  return request({
+    url: '/oa/settleWork/' + settleId,
+    method: 'get'
+  })
+}
+
+// 新增cmc经费计算
+export function addSettleWork(data) {
+  return request({
+    url: '/oa/settleWork',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc经费计算
+export function updateSettleWork(data) {
+  return request({
+    url: '/oa/settleWork',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc经费计算
+export function delSettleWork(settleId) {
+  return request({
+    url: '/oa/settleWork/' + settleId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <h2 class="text-center">成果归档表</h2>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="项目id" prop="projectId">
+            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+              :disabled="taskName != '成果上传'" clearable>
+              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
+              </el-option>
+            </el-select>
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-form-item label="成果汇交日期" prop="submitTime">
+            <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择成果汇交日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="备注说明" prop="submitSituation">
+            <el-input v-model="form.submitSituation" placeholder="请输入备注说明" />
+          </el-form-item>
+          <el-form-item label="坐标经度" prop="locationLng">
+            <el-input v-model="form.locationLng" placeholder="请输入坐标经度" />
+          </el-form-item>
+          <el-form-item label="坐标纬度" prop="locationLat">
+            <el-input v-model="form.locationLat" placeholder="请输入坐标纬度" />
+          </el-form-item>
+          <el-form-item label="生产部门检查员" prop="produceInspector">
+            <el-input v-model="form.produceInspector" placeholder="请输入生产部门检查员" />
+          </el-form-item>
+          <el-form-item label="质量检查员" prop="qualityInspector">
+            <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
+          </el-form-item>
+          <el-form-item label="技术部负责人" prop="deptLeader">
+            <el-input v-model="form.deptLeader" placeholder="请输入技术部负责人" />
+          </el-form-item>
+          <el-form-item label="归档人" prop="archiver">
+            <el-input v-model="form.archiver" placeholder="请输入归档人" />
+          </el-form-item>
+          <el-form-item label="资料接收时间" prop="receiveTime">
+            <el-date-picker clearable v-model="form.receiveTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择资料接收时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="质量检查时间" prop="qualityTime">
+            <el-date-picker clearable v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择质量检查时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="生产部门检查时间" prop="produceTime">
+            <el-date-picker clearable v-model="form.produceTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择生产部门检查时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="技术部审核时间" prop="deptTime">
+            <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择技术部审核时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="归档时间" prop="archiveTime">
+            <el-date-picker clearable v-model="form.archiveTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择归档时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="生产部门意见" prop="produceComment">
+            <el-input v-model="form.produceComment" placeholder="请输入生产部门意见" />
+          </el-form-item>
+          <el-form-item label="质量检查意见" prop="qualityComment">
+            <el-input v-model="form.qualityComment" placeholder="请输入质量检查意见" />
+          </el-form-item>
+          <el-form-item label="技术部审核意见" prop="deptComment">
+            <el-input v-model="form.deptComment" placeholder="请输入技术部审核意见" />
+          </el-form-item>
+          <el-form-item label="归档审核意见" prop="archiveComment">
+            <el-input v-model="form.archiveComment" placeholder="请输入归档审核意见" />
+          </el-form-item>
+        </el-form>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { listProject, getProject } from "@/api/oa/project/project";
+import { listArchive, getArchive, delArchive, addArchive, updateArchive } from "@/api/oa/archive/archive";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "Archive",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc成果归档表格数据
+      archiveList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        submitTime: null,
+        submitSituation: null,
+        locationLng: null,
+        locationLat: null,
+        produceInspector: null,
+        qualityInspector: null,
+        deptLeader: null,
+        archiver: null,
+        receiveTime: null,
+        qualityTime: null,
+        produceTime: null,
+        deptTime: null,
+        archiveTime: null,
+        produceComment: null,
+        qualityComment: null,
+        deptComment: null,
+        archiveComment: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      chooseProject: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+      projectList: [],
+    };
+  },
+  created() {
+    this.getProjectList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  methods: {
+    // 初始化表单
+    initForm() {
+      getArchive(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          if (res.data.projectId) {
+            getProject(data.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true
+            })
+          }
+          this.loading = false
+        }
+      })
+    },
+    /** 查询cmc成果归档列表 */
+    getList() {
+      this.loading = true;
+      listArchive(this.queryParams).then(response => {
+        this.archiveList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true;
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        archiveId: null,
+        projectId: null,
+        submitTime: null,
+        submitSituation: null,
+        locationLng: null,
+        locationLat: null,
+        produceInspector: null,
+        qualityInspector: null,
+        deptLeader: null,
+        archiver: null,
+        receiveTime: null,
+        qualityTime: null,
+        produceTime: null,
+        deptTime: null,
+        archiveTime: null,
+        produceComment: null,
+        qualityComment: null,
+        deptComment: null,
+        archiveComment: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.archiveId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc成果归档";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const archiveId = row.archiveId || this.ids
+      getArchive(archiveId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc成果归档";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateArchive(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArchive(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const archiveIds = row.archiveId || this.ids;
+      this.$modal.confirm('是否确认删除cmc成果归档编号为"' + archiveIds + '"的数据项？').then(function () {
+        return delArchive(archiveIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/archive/export', {
+        ...this.queryParams
+      }, `archive_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/flowable/form/borrow/borrowData.vue

@@ -86,7 +86,7 @@
 
 <script>
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
-import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+import { listBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listDefinition } from "@/api/flowable/definition";
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
@@ -122,9 +122,9 @@ export default {
       })
     },
     getBorrowDetailData(borrowId) {
-      getBorrowDetail(borrowId).then(res => {
-        if (res.data.length != 0) {
-          this.detailList = res.data
+      listBorrowDetail({borrowId:borrowId}).then(res => {
+        if (res.rows.length != 0) {
+          this.detailList = res.rows
         }
       });
     },

oa-ui/src/views/flowable/form/borrowForm.vue

@@ -252,7 +252,7 @@
 import { parseTime } from "@/utils/ruoyi";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
-import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+import { listBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -374,9 +374,9 @@ export default {
   },
   methods: {
     initForm() {
-      getBorrowDetail(this.taskForm.formId).then(res => {
-        if (res.data.length != 0) {
-          this.detailList = res.data
+      listBorrowDetail({borrowId: this.taskForm.formId}).then(res => {
+        if (res.rows.length != 0) {
+          this.detailList = res.rows
         }
       });
       getBorrow(this.taskForm.formId).then(res => {

oa-ui/src/views/flowable/form/brandForm.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <h2 class="text-center">品牌项目支付审批表</h2>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="品牌项目id" prop="projectId">
+            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+              :disabled="taskName != '支付申请'" clearable>
+              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
+              </el-option>
+            </el-select>
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-form-item label="申请支付说明" prop="applyReason">
+            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" />
+          </el-form-item>
+          <el-form-item label="审核文件" prop="approvalDocument">
+            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px">
+                <span class="auditor"> {{ form.applierUser ? form.applierUser.nickName : applierUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.applyTime ? form.applyTime : applyTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="财务部经办人" prop="cwUserId">
+            <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
+          </el-form-item>
+        </el-form>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { listBrandProject, getBrandProject } from "@/api/oa/brand/brandProject";
+import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/oa/brand/brand";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "Brand",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc品牌项目支付审批表格数据
+      brandList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        applyReason: null,
+        approvalDocument: null,
+        applier: null,
+        applyTime: null,
+        cwUserId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      chooseProject: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+      projectList: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  created() {
+    if (this.taskName == '支付申请') {
+      this.applierUser = this.$store.getters.name;
+      this.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    this.getProjectList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  methods: {
+    // 初始化表单
+    initForm() {
+      getBrand(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          if (res.data.projectId) {
+            getProject(data.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true
+            })
+          }
+          this.loading = false
+        }
+      })
+    },
+    /** 查询cmc品牌项目支付审批列表 */
+    getList() {
+      this.loading = true;
+      listBrand(this.queryParams).then(response => {
+        this.brandList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listBrandProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getBrandProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true;
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        brandId: null,
+        projectId: null,
+        applyReason: null,
+        approvalDocument: null,
+        applier: null,
+        applyTime: null,
+        cwUserId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.brandId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc品牌项目支付审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const brandId = row.brandId || this.ids
+      getBrand(brandId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc品牌项目支付审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateBrand(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBrand(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const brandIds = row.brandId || this.ids;
+      this.$modal.confirm('是否确认删除cmc品牌项目支付审批编号为"' + brandIds + '"的数据项？').then(function () {
+        return delBrand(brandIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/brand/export', {
+        ...this.queryParams
+      }, `brand_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-18 14:01:23
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:28:28
 -->
 <template>
   <div class="main">
@@ -127,11 +127,11 @@
 
 <script>
 import { listBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
-import { getProjectWork } from "@/api/oa/project/projectWork";
+import { listBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listProjectWork } from "@/api/oa/project/projectWork";
 import { mapGetters } from 'vuex';
 export default {
   computed: {
@@ -172,26 +172,26 @@ export default {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
         this.budgetForm = res.rows[0];
-        getBudgetDevice(this.budgetForm.budgetId).then(res => {
-          this.chooseDevice = res.data;
-          this.deviceLen = res.data.length + 1;
+        listBudgetDevice({budgetId: this.budgetForm.budgetId}).then(res => {
+          this.chooseDevice = res.rows;
+          this.deviceLen = res.rows.length + 1;
         })
-        getBudgetStaff(this.budgetForm.budgetId).then(res => {
-          this.chooseUser = res.data;
-          this.userLen = res.data.length + 1;
+        listBudgetStaff({budgetId: this.budgetForm.budgetId}).then(res => {
+          this.chooseUser = res.rows;
+          this.userLen = res.rows.length + 1;
           let days = 0;
           for(let d of this.chooseUser){
             days = days + d.days
           }
           this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
         })
-        getBudgetCar(this.budgetForm.budgetId).then(res => {
-          this.chooseCar = res.data;
-          this.carLen = res.data.length + 1;
+        listBudgetCar({budgetId: this.budgetForm.budgetId}).then(res => {
+          this.chooseCar = res.rows;
+          this.carLen = res.rows.length + 1;
         })
-        getBudgetSettle(this.budgetForm.budgetId).then(res => {
-          this.workList = res.data;
-          this.workLen = res.data.length + 6;
+        listBudgetSettle({budgetId: this.budgetForm.budgetId}).then(res => {
+          this.workList = res.rows;
+          this.workLen = res.rows.length + 6;
           for(let work of this.workList){
             if(work.groundType == '0'){
               work.price = work.cmcPrice.commonPrice
@@ -205,8 +205,8 @@ export default {
       });
     },
     getProjectWorkList() {
-      getProjectWork(this.$route.query.formId).then(res => {
-        this.workContentList = res.data;
+      listProjectWork({projectId: this.$route.query.formId}).then(res => {
+        this.workContentList = res.rows;
       })
     },
   },

oa-ui/src/views/flowable/form/contractForm.vue

@@ -348,9 +348,9 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
-import { getContractWork, addContractWork } from "@/api/oa/contract/contractWork";
-import { getContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
-import { getContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
+import { listContractWork, addContractWork } from "@/api/oa/contract/contractWork";
+import { listContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
+import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
@@ -548,17 +548,17 @@ export default {
               this.isSelect = true
             })
           }
-          getContractWork(this.taskForm.formId).then(res => {
-            if (res.data)
-              this.workList = res.data;
+          listContractWork({contractId: this.taskForm.formId}).then(res => {
+            if (res.rows)
+              this.workList = res.rows;
           });
-          getContractPayment(this.taskForm.formId).then(res => {
-            if (res.data)
-              this.paymentList = res.data;
+          listContractPayment({contractId: this.taskForm.formId}).then(res => {
+            if (res.rows)
+              this.paymentList = res.rows;
           });
-          getContractComment(this.taskForm.formId).then(res => {
-            if (res.data)
-              this.commentList = res.data;
+          listContractComment({contractId: this.taskForm.formId}).then(res => {
+            if (res.rows)
+              this.commentList = res.rows;
             for (let comment of this.commentList) {
               if (comment.commentTime == undefined) {
                 if (comment.userId != this.$store.getters.userId) {
@@ -663,8 +663,7 @@ export default {
       return true;
     },
     getProjectSource(chooseTender) {
-      let partyAList = ['中国电建集团成都勘测设计研究院勘测设计分公司', '成勘院 水环境与城建工程分公司'];
-      return partyAList.indexOf(chooseTender.partyA) != -1 ? '院内' : '院外';
+      return chooseTender.partyA.indexOf('中国电建集团成都勘测设计研究院有限公司') != -1 ? '院内' : '院外';
     },
     addWorkList() {
       this.workList.push({
@@ -827,7 +826,6 @@ export default {
                 });
               }
               else if (this.taskName == '线上会审') {
-                console.log(this.commentList);
                 for (let comment of this.commentList) {
                   updateContractComment(comment);
                 }

oa-ui/src/views/flowable/form/depositForm.vue

@@ -0,0 +1,344 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <h2 class="text-center">保证金审批表</h2>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="投标项目id" prop="tenderId">
+            <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
+              :disabled="taskName != '保证金申请'" clearable>
+              <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName" :value="item.tenderId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="合同id" prop="contractId">
+            <el-input v-model="form.contractId" placeholder="请输入合同id" />
+          </el-form-item>
+          <el-form-item label="预计退还日期" prop="returnTime">
+            <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择预计退还日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="开户名称" prop="accountName">
+            <el-input v-model="form.accountName" placeholder="请输入开户名称" />
+          </el-form-item>
+          <el-form-item label="开户银行" prop="accountBank">
+            <el-input v-model="form.accountBank" placeholder="请输入开户银行" />
+          </el-form-item>
+          <el-form-item label="银行卡号" prop="cardNumber">
+            <el-input v-model="form.cardNumber" placeholder="请输入银行卡号" />
+          </el-form-item>
+          <el-form-item label="保证金形式" prop="depositWay">
+            <el-input v-model="form.depositWay" placeholder="请输入保证金形式" />
+          </el-form-item>
+          <el-form-item label="申请人" prop="applier">
+            <el-input v-model="form.applier" placeholder="请输入申请人" />
+          </el-form-item>
+          <el-form-item label="申请日期" prop="applyTime">
+            <el-date-picker clearable v-model="form.applyTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择申请日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="申请说明" prop="applyReason">
+            <el-input v-model="form.applyReason" placeholder="请输入申请说明" />
+          </el-form-item>
+          <el-form-item label="相关附件" prop="applyDocument">
+            <el-input v-model="form.applyDocument" placeholder="请输入相关附件" />
+          </el-form-item>
+          <el-form-item label="分管审批时间" prop="managerTime">
+            <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择分管审批时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="分管审批人" prop="managerUserId">
+            <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+          </el-form-item>
+          <el-form-item label="汇款日期" prop="remitTime">
+            <el-date-picker clearable v-model="form.remitTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择汇款日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="财务处理时间" prop="cwTime">
+            <el-date-picker clearable v-model="form.cwTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择财务处理时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="退还时间" prop="backTime">
+            <el-date-picker clearable v-model="form.backTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择退还时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="财务打款备注" prop="cwComment">
+            <el-input v-model="form.cwComment" placeholder="请输入财务打款备注" />
+          </el-form-item>
+          <el-form-item label="财务处理人" prop="cwUserId">
+            <el-input v-model="form.cwUserId" placeholder="请输入财务处理人" />
+          </el-form-item>
+        </el-form>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { listTender, getTender } from "@/api/oa/tender/tender";
+import { listDeposit, getDeposit, delDeposit, addDeposit, updateDeposit } from "@/api/oa/deposit/deposit";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "Deposit",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc保证金审批表格数据
+      depositList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        depositType: null,
+        tenderId: null,
+        contractId: null,
+        returnTime: null,
+        accountName: null,
+        accountBank: null,
+        cardNumber: null,
+        depositWay: null,
+        applier: null,
+        applyTime: null,
+        applyReason: null,
+        applyDocument: null,
+        managerTime: null,
+        managerUserId: null,
+        remitTime: null,
+        cwTime: null,
+        backTime: null,
+        cwComment: null,
+        cwUserId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      chooseTender: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+      tenderList: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  created() {
+    this.getTenderList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  methods: {
+    // 初始化表单
+    initForm() {
+      getDeposit(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          if (res.data.tenderId) {
+            getTender(data.tenderId).then(response => {
+              this.chooseTender = response.data;
+              this.isSelect = true
+            })
+          }
+          this.loading = false
+        }
+      })
+    },
+    /** 查询cmc保证金审批列表 */
+    getList() {
+      this.loading = true;
+      listDeposit(this.queryParams).then(response => {
+        this.depositList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 查询项目列表
+    getTenderList() {
+      this.loading = true
+      listTender({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.tenderList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectTender(val) {
+      if (val != "" && val != undefined && val != null) {
+        getTender(val).then(res => {
+          this.chooseTender = res.data;
+          this.isSelect = true;
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        depositId: null,
+        depositType: null,
+        tenderId: null,
+        contractId: null,
+        returnTime: null,
+        accountName: null,
+        accountBank: null,
+        cardNumber: null,
+        depositWay: null,
+        applier: null,
+        applyTime: null,
+        applyReason: null,
+        applyDocument: null,
+        managerTime: null,
+        managerUserId: null,
+        remitTime: null,
+        cwTime: null,
+        backTime: null,
+        cwComment: null,
+        cwUserId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.depositId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc保证金审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const depositId = row.depositId || this.ids
+      getDeposit(depositId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc保证金审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateDeposit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeposit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const depositIds = row.depositId || this.ids;
+      this.$modal.confirm('是否确认删除cmc保证金审批编号为"' + depositIds + '"的数据项？').then(function () {
+        return delDeposit(depositIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deposit/export', {
+        ...this.queryParams
+      }, `deposit_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-26 16:55:34
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:08:59
 -->
 
 <template>
@@ -129,8 +129,8 @@ import { listProject, getProject, addProject, delProject } from "@/api/oa/projec
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
-import { listProjectContract, addProjectContract, get } from "@/api/oa/contract/projectContract";
+import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 export default {
   props: {
@@ -225,8 +225,8 @@ export default {
       })
     },
     getProjectWorkList() {
-      getProjectWork(this.taskForm.formId).then(res => {
-        this.workList = res.data;
+      listProjectWork({projectId: this.taskForm.formId}).then(res => {
+        this.workList = res.rows;
       })
     },
     getContractDataList() {

oa-ui/src/views/flowable/form/projectProcess/budgetTab.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-04-26 17:52:02
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:32:50
+-->
 <template>
   <div class="app-container" v-loading="loading">
     <el-empty description="预算未编制，等待项目负责人编制" v-if="!haveBudget"></el-empty>
@@ -12,11 +18,11 @@
 
 <script>
 import { listBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
-import { getProjectWork } from "@/api/oa/project/projectWork";
+import { listBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listProjectWork } from "@/api/oa/project/projectWork";
 import BudgetInfo from "../budget/budgetInfo.vue";
 export default {
   components: {
@@ -58,11 +64,11 @@ export default {
         if (res.total != 0) {
           this.haveBudget = true;
           this.budgetId = res.rows[0].budgetId;
-          getProjectWork(projectId).then(res => {
-            if (res.data) {
-              this.workList = res.data;
+          listProjectWork({projectId: projectId}).then(res => {
+            if (res.rows) {
+              this.workList = res.rows;
             }
-            getBudgetSettle(this.budgetId).then(res => {
+            listBudgetSettle({budgetId: this.budgetId}).then(res => {
             });
           });
         }

oa-ui/src/views/flowable/form/projectProcess/businessReview.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-11 17:03:10
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:10:25
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectComment, addProjectComment } from "@/api/oa/project/projectComment"
+import { listProjectComment, addProjectComment } from "@/api/oa/project/projectComment"
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 import { getUsersManageLeaderByDept } from '@/api/system/post'
 export default {
@@ -76,9 +76,9 @@ export default {
   },
   methods: {
     initForm() {
-      getProjectComment(this.taskForm.formId).then(res => {
-        if (res.data) {
-          this.form = res.data
+      listProjectComment({projectId: this.taskForm.formId}).then(res => {
+        if (res.rows) {
+          this.form = res.rows
           if (this.form.jyUser) {
             this.form.jyApproverName = this.form.jyUser.nickName
           }

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-25 17:41:02
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:33:39
 -->
 <template>
   <div>
@@ -125,14 +125,14 @@ import {
 } from "@/api/oa/project/projectComment";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import {
-  getProjectProgress,
+  listProjectProgress,
   addProjectProgress,
   delProjectProgress,
 } from "@/api/oa/project/projectProgress";
-import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listBudget } from "@/api/oa/budget/budget";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
@@ -207,10 +207,10 @@ export default {
           this.form.exitTime = res.data.exitTime;
         }
       });
-      getProjectProgress(this.taskForm.formId).then(res => {
-        this.oldProgressList = res.data
-        if (res.data.length != 0) {
-          this.progressList = res.data;
+      listProjectProgress({projectId: this.taskForm.formId}).then(res => {
+        this.oldProgressList = res.rows
+        if (res.rows.length != 0) {
+          this.progressList = res.rows;
         }
       });
     },
@@ -222,21 +222,21 @@ export default {
         } else {
           this.noBudget = false;
           this.budgetId = res.rows[0].budgetId;
-          getBudgetCar(this.budgetId).then(res => {
+          listBudgetCar({budgetId: this.budgetId}).then(res => {
             let carArr = [];
             let carDriverList = [];
-            for (let i of res.data) {
+            for (let i of res.rows) {
               carArr.push(i.car.licensePlate);
               getCar(i.carId).then(res => {
-                carDriverList.push(res.data.driverUser.nickName);
+                carDriverList.push(res.rows.driverUser.nickName);
                 // this.form.driver = carDriverList.join("、");
               });
             }
             this.form.licensePlate = carArr.join("、");
           });
-          getBudgetStaff(this.budgetId).then(res => {
+          listBudgetStaff({budgetId: this.budgetId}).then(res => {
             let userArr = [];
-            for (let u of res.data) {
+            for (let u of res.rows) {
               userArr.push(u.user.nickName);
             }
             this.form.staff = userArr.join("、");

oa-ui/src/views/flowable/form/projectProcess/manageReview.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-18 11:02:05
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:14:29
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { listProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 export default {
   computed: {
@@ -79,16 +79,16 @@ export default {
   },
   methods: {
     initForm() {
-      getProjectComment(this.taskForm.formId).then(res => {
-        if (res.data) {
-          this.form = res.data
+      listProjectComment({projectId: this.taskForm.formId}).then(res => {
+        if (res.rows) {
+          this.form = res.rows
           if (this.taskName == '分管审核') {
             this.form.manageApprover = this.$store.state.user.userId;
             this.form.manageApproverName = this.$store.state.user.name;
             this.form.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
           } else {
-            if (res.data.managerUser)
-              this.form.manageApproverName = res.data.managerUser.nickName
+            if (res.rows.managerUser)
+              this.form.manageApproverName = res.rows.managerUser.nickName
           }
         } else {
           if (this.taskName == '分管审核') {

oa-ui/src/views/flowable/form/projectProcess/scConfirm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-25 09:13:47
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:15:16
 -->
 <template>
   <div class="app-container">
@@ -30,7 +30,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { listProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { getProject } from '@/api/oa/project/project'
 export default {
@@ -81,12 +81,12 @@ export default {
   },
   methods: {
     initForm() {
-      getProjectComment(this.taskForm.formId).then(res => {
-        if (res.data) {
-          this.form = res.data
+    listProjectComment({projectId: this.taskForm.formId}).then(res => {
+        if (res.rows) {
+          this.form = res.rows
           this.form.scApprover = '';
-          if (res.data.scApproverName) {
-            this.form.scApproverName = res.data.scApproverName
+          if (res.rows.scApproverName) {
+            this.form.scApproverName = res.rows.scApproverName
           }
         } else {
           this.form.scApprover = '';