项目人员表

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

@@ -0,0 +1,114 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcProjectWorker;
+import com.ruoyi.oa.service.ICmcProjectWorkerService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目人员Controller
+ * 
+ * @author cmc
+ * @date 2024-03-26
+ */
+@RestController
+@RequestMapping("/oa/projectWorker")
+public class CmcProjectWorkerController extends BaseController
+{
+    @Autowired
+    private ICmcProjectWorkerService cmcProjectWorkerService;
+
+    /**
+     * 查询cmc项目人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectWorker cmcProjectWorker)
+    {
+        startPage();
+        List<CmcProjectWorker> list = cmcProjectWorkerService.selectCmcProjectWorkerList(cmcProjectWorker);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:export')")
+    @Log(title = "cmc项目人员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectWorker cmcProjectWorker)
+    {
+        List<CmcProjectWorker> list = cmcProjectWorkerService.selectCmcProjectWorkerList(cmcProjectWorker);
+        ExcelUtil<CmcProjectWorker> util = new ExcelUtil<CmcProjectWorker>(CmcProjectWorker.class);
+        util.exportExcel(response, list, "cmc项目人员数据");
+    }
+
+    /**
+     * 获取cmc项目人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(cmcProjectWorkerService.selectCmcProjectWorkerById(id));
+    }
+
+    /**
+     * 获取项目负责人负责的项目详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:query')")
+    @GetMapping("/projectLeader")
+    public AjaxResult getListByProjectLeader(String projectLeader)
+    {
+        return success(cmcProjectWorkerService.selectCmcProjectWorkerListByProjectLeader(projectLeader));
+    }
+
+    /**
+     * 新增cmc项目人员
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:add')")
+    @Log(title = "cmc项目人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectWorker cmcProjectWorker)
+    {
+        return toAjax(cmcProjectWorkerService.insertCmcProjectWorker(cmcProjectWorker));
+    }
+
+    /**
+     * 修改cmc项目人员
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:edit')")
+    @Log(title = "cmc项目人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectWorker cmcProjectWorker)
+    {
+        return toAjax(cmcProjectWorkerService.updateCmcProjectWorker(cmcProjectWorker));
+    }
+
+    /**
+     * 删除cmc项目人员
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectWorker:remove')")
+    @Log(title = "cmc项目人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(cmcProjectWorkerService.deleteCmcProjectWorkerByIds(ids));
+    }
+}

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

@@ -8,9 +8,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc预算管理对象 cmc_budget
- * 
+ *
  * @author cmc
- * @date 2024-03-22
+ * @date 2024-03-26
  */
 public class CmcBudget extends BaseEntity
 {
@@ -23,6 +23,8 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "项目id")
     private String projectId;
 
+    private CmcProject project;
+
     /** 人员成本 */
     @Excel(name = "人员成本")
     private BigDecimal staffCost;
@@ -35,9 +37,13 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "设备成本")
     private BigDecimal deviceCost;
 
+    /** 固定成本 */
+    @Excel(name = "固定成本")
+    private BigDecimal fixCost;
+
     /** 预结算额 */
     @Excel(name = "预结算额")
-    private BigDecimal budgetSettle;
+    private BigDecimal settleExpense;
 
     /** 外协费用 */
     @Excel(name = "外协费用")
@@ -55,9 +61,13 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "其他费用")
     private BigDecimal otherExpense;
 
+    /** 直接成本 */
+    @Excel(name = "直接成本")
+    private BigDecimal directExpense;
+
     /** 预算总额 */
     @Excel(name = "预算总额")
-    private BigDecimal totalExpense;
+    private BigDecimal totalBudget;
 
     /** 编制人 */
     @Excel(name = "编制人")
@@ -67,120 +77,147 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "审核人")
     private Long auditor;
 
-    public void setBudgetId(String budgetId) 
+    public void setBudgetId(String budgetId)
     {
         this.budgetId = budgetId;
     }
 
-    public String getBudgetId() 
+    public String getBudgetId()
     {
         return budgetId;
     }
-    public void setProjectId(String projectId) 
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public String getProjectId()
     {
         return projectId;
     }
-    public void setStaffCost(BigDecimal staffCost) 
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+    public void setStaffCost(BigDecimal staffCost)
     {
         this.staffCost = staffCost;
     }
 
-    public BigDecimal getStaffCost() 
+    public BigDecimal getStaffCost()
     {
         return staffCost;
     }
-    public void setCarCost(BigDecimal carCost) 
+    public void setCarCost(BigDecimal carCost)
     {
         this.carCost = carCost;
     }
 
-    public BigDecimal getCarCost() 
+    public BigDecimal getCarCost()
     {
         return carCost;
     }
-    public void setDeviceCost(BigDecimal deviceCost) 
+    public void setDeviceCost(BigDecimal deviceCost)
     {
         this.deviceCost = deviceCost;
     }
 
-    public BigDecimal getDeviceCost() 
+    public BigDecimal getDeviceCost()
     {
         return deviceCost;
     }
-    public void setBudgetSettle(BigDecimal budgetSettle) 
+    public void setFixCost(BigDecimal fixCost)
+    {
+        this.fixCost = fixCost;
+    }
+
+    public BigDecimal getFixCost()
     {
-        this.budgetSettle = budgetSettle;
+        return fixCost;
+    }
+    public void setSettleExpense(BigDecimal settleExpense)
+    {
+        this.settleExpense = settleExpense;
     }
 
-    public BigDecimal getBudgetSettle() 
+    public BigDecimal getSettleExpense()
     {
-        return budgetSettle;
+        return settleExpense;
     }
-    public void setOutExpense(BigDecimal outExpense) 
+    public void setOutExpense(BigDecimal outExpense)
     {
         this.outExpense = outExpense;
     }
 
-    public BigDecimal getOutExpense() 
+    public BigDecimal getOutExpense()
     {
         return outExpense;
     }
-    public void setBusinessExpense(BigDecimal businessExpense) 
+    public void setBusinessExpense(BigDecimal businessExpense)
     {
         this.businessExpense = businessExpense;
     }
 
-    public BigDecimal getBusinessExpense() 
+    public BigDecimal getBusinessExpense()
     {
         return businessExpense;
     }
-    public void setRentExpense(BigDecimal rentExpense) 
+    public void setRentExpense(BigDecimal rentExpense)
     {
         this.rentExpense = rentExpense;
     }
 
-    public BigDecimal getRentExpense() 
+    public BigDecimal getRentExpense()
     {
         return rentExpense;
     }
-    public void setOtherExpense(BigDecimal otherExpense) 
+    public void setOtherExpense(BigDecimal otherExpense)
     {
         this.otherExpense = otherExpense;
     }
 
-    public BigDecimal getOtherExpense() 
+    public BigDecimal getOtherExpense()
     {
         return otherExpense;
     }
-    public void setTotalExpense(BigDecimal totalExpense) 
+    public void setDirectExpense(BigDecimal directExpense)
+    {
+        this.directExpense = directExpense;
+    }
+
+    public BigDecimal getDirectExpense()
+    {
+        return directExpense;
+    }
+    public void setTotalBudget(BigDecimal totalBudget)
     {
-        this.totalExpense = totalExpense;
+        this.totalBudget = totalBudget;
     }
 
-    public BigDecimal getTotalExpense() 
+    public BigDecimal getTotalBudget()
     {
-        return totalExpense;
+        return totalBudget;
     }
-    public void setCompiler(Long compiler) 
+    public void setCompiler(Long compiler)
     {
         this.compiler = compiler;
     }
 
-    public Long getCompiler() 
+    public Long getCompiler()
     {
         return compiler;
     }
-    public void setAuditor(Long auditor) 
+    public void setAuditor(Long auditor)
     {
         this.auditor = auditor;
     }
 
-    public Long getAuditor() 
+    public Long getAuditor()
     {
         return auditor;
     }
@@ -188,20 +225,22 @@ public class CmcBudget extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("budgetId", getBudgetId())
-            .append("projectId", getProjectId())
-            .append("staffCost", getStaffCost())
-            .append("carCost", getCarCost())
-            .append("deviceCost", getDeviceCost())
-            .append("budgetSettle", getBudgetSettle())
-            .append("outExpense", getOutExpense())
-            .append("businessExpense", getBusinessExpense())
-            .append("rentExpense", getRentExpense())
-            .append("otherExpense", getOtherExpense())
-            .append("totalExpense", getTotalExpense())
-            .append("compiler", getCompiler())
-            .append("auditor", getAuditor())
-            .append("createTime", getCreateTime())
-            .toString();
+                .append("budgetId", getBudgetId())
+                .append("projectId", getProjectId())
+                .append("staffCost", getStaffCost())
+                .append("carCost", getCarCost())
+                .append("deviceCost", getDeviceCost())
+                .append("fixCost", getFixCost())
+                .append("settleExpense", getSettleExpense())
+                .append("outExpense", getOutExpense())
+                .append("businessExpense", getBusinessExpense())
+                .append("rentExpense", getRentExpense())
+                .append("otherExpense", getOtherExpense())
+                .append("directExpense", getDirectExpense())
+                .append("totalBudget", getTotalBudget())
+                .append("compiler", getCompiler())
+                .append("auditor", getAuditor())
+                .append("createTime", getCreateTime())
+                .toString();
     }
 }

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

@@ -0,0 +1,118 @@
+package com.ruoyi.oa.domain;
+
+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_project_worker
+ * 
+ * @author cmc
+ * @date 2024-03-26
+ */
+public class CmcProjectWorker extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String id;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    private CmcProject project;
+
+    /** 项目负责人 */
+    @Excel(name = "项目负责人")
+    private String projectLeader;
+
+    private SysUser user;
+
+    /** 内业负责人 */
+    @Excel(name = "内业负责人")
+    private String inWorker;
+
+    /** 外业负责人 */
+    @Excel(name = "外业负责人")
+    private String outWorker;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+
+    public void setProjectLeader(String projectLeader) 
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public String getProjectLeader() 
+    {
+        return projectLeader;
+    }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    public void setInWorker(String inWorker) 
+    {
+        this.inWorker = inWorker;
+    }
+
+    public String getInWorker() 
+    {
+        return inWorker;
+    }
+    public void setOutWorker(String outWorker) 
+    {
+        this.outWorker = outWorker;
+    }
+
+    public String getOutWorker() 
+    {
+        return outWorker;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("projectLeader", getProjectLeader())
+            .append("inWorker", getInWorker())
+            .append("outWorker", getOutWorker())
+            .toString();
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.domain.CmcProjectWorker;
+
+/**
+ * cmc项目人员Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-26
+ */
+public interface CmcProjectWorkerMapper 
+{
+    /**
+     * 查询cmc项目人员
+     * 
+     * @param id cmc项目人员主键
+     * @return cmc项目人员
+     */
+    public CmcProjectWorker selectCmcProjectWorkerById(String id);
+
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目主键
+     * @return cmc项目集合
+     */
+    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader);
+
+    /**
+     * 查询cmc项目人员列表
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return cmc项目人员集合
+     */
+    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 新增cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 修改cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 删除cmc项目人员
+     * 
+     * @param id cmc项目人员主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkerById(String id);
+
+    /**
+     * 批量删除cmc项目人员
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkerByIds(String[] ids);
+}

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

@@ -0,0 +1,71 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.domain.CmcProjectWorker;
+
+/**
+ * cmc项目人员Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-26
+ */
+public interface ICmcProjectWorkerService 
+{
+    /**
+     * 查询cmc项目人员
+     * 
+     * @param id cmc项目人员主键
+     * @return cmc项目人员
+     */
+    public CmcProjectWorker selectCmcProjectWorkerById(String id);
+
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目主键
+     * @return cmc项目集合
+     */
+    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader);
+
+    /**
+     * 查询cmc项目人员列表
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return cmc项目人员集合
+     */
+    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 新增cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 修改cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
+
+    /**
+     * 批量删除cmc项目人员
+     * 
+     * @param ids 需要删除的cmc项目人员主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkerByIds(String[] ids);
+
+    /**
+     * 删除cmc项目人员信息
+     * 
+     * @param id cmc项目人员主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkerById(String id);
+}

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

@@ -0,0 +1,106 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.oa.domain.CmcProject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProjectWorkerMapper;
+import com.ruoyi.oa.domain.CmcProjectWorker;
+import com.ruoyi.oa.service.ICmcProjectWorkerService;
+
+/**
+ * cmc项目人员Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-26
+ */
+@Service
+public class CmcProjectWorkerServiceImpl implements ICmcProjectWorkerService 
+{
+    @Autowired
+    private CmcProjectWorkerMapper cmcProjectWorkerMapper;
+
+    /**
+     * 查询cmc项目人员
+     * 
+     * @param id cmc项目人员主键
+     * @return cmc项目人员
+     */
+    @Override
+    public CmcProjectWorker selectCmcProjectWorkerById(String id)
+    {
+        return cmcProjectWorkerMapper.selectCmcProjectWorkerById(id);
+    }
+
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目主键
+     * @return cmc项目集合
+     */
+    @Override
+    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader) {
+        return cmcProjectWorkerMapper.selectCmcProjectWorkerListByProjectLeader(projectLeader);
+    }
+
+    /**
+     * 查询cmc项目人员列表
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return cmc项目人员
+     */
+    @Override
+    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker)
+    {
+        return cmcProjectWorkerMapper.selectCmcProjectWorkerList(cmcProjectWorker);
+    }
+
+    /**
+     * 新增cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker)
+    {
+        return cmcProjectWorkerMapper.insertCmcProjectWorker(cmcProjectWorker);
+    }
+
+    /**
+     * 修改cmc项目人员
+     * 
+     * @param cmcProjectWorker cmc项目人员
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker)
+    {
+        return cmcProjectWorkerMapper.updateCmcProjectWorker(cmcProjectWorker);
+    }
+
+    /**
+     * 批量删除cmc项目人员
+     * 
+     * @param ids 需要删除的cmc项目人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkerByIds(String[] ids)
+    {
+        return cmcProjectWorkerMapper.deleteCmcProjectWorkerByIds(ids);
+    }
+
+    /**
+     * 删除cmc项目人员信息
+     * 
+     * @param id cmc项目人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkerById(String id)
+    {
+        return cmcProjectWorkerMapper.deleteCmcProjectWorkerById(id);
+    }
+}

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

@@ -1,53 +1,65 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.CmcBudgetMapper">
-    
+
     <resultMap type="CmcBudget" id="CmcBudgetResult">
         <result property="budgetId"    column="budget_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="staffCost"    column="staff_cost"    />
         <result property="carCost"    column="car_cost"    />
         <result property="deviceCost"    column="device_cost"    />
-        <result property="budgetSettle"    column="budget_settle"    />
+        <result property="fixCost"    column="fix_cost"    />
+        <result property="settleExpense"    column="settle_expense"    />
         <result property="outExpense"    column="out_expense"    />
         <result property="businessExpense"    column="business_expense"    />
         <result property="rentExpense"    column="rent_expense"    />
         <result property="otherExpense"    column="other_expense"    />
-        <result property="totalExpense"    column="total_expense"    />
+        <result property="directExpense"    column="direct_expense"    />
+        <result property="totalBudget"    column="total_budget"    />
         <result property="compiler"    column="compiler"    />
         <result property="auditor"    column="auditor"    />
         <result property="createTime"    column="create_time"    />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectCmcBudgetVo">
-        select budget_id, project_id, staff_cost, car_cost, device_cost, budget_settle, out_expense, business_expense, rent_expense, other_expense, total_expense, compiler, auditor, create_time from cmc_budget
+        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.rent_expense, b.other_expense, b.direct_expense, b.total_budget, b.compiler, b.auditor, b.create_time from cmc_budget as b
+            left join cmc_project as p on b.project_id = p.project_id
     </sql>
 
     <select id="selectCmcBudgetList" parameterType="CmcBudget" resultMap="CmcBudgetResult">
         <include refid="selectCmcBudgetVo"/>
-        <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="staffCost != null "> and staff_cost = #{staffCost}</if>
-            <if test="carCost != null "> and car_cost = #{carCost}</if>
-            <if test="deviceCost != null "> and device_cost = #{deviceCost}</if>
-            <if test="budgetSettle != null "> and budget_settle = #{budgetSettle}</if>
-            <if test="outExpense != null "> and out_expense = #{outExpense}</if>
-            <if test="businessExpense != null "> and business_expense = #{businessExpense}</if>
-            <if test="rentExpense != null "> and rent_expense = #{rentExpense}</if>
-            <if test="otherExpense != null "> and other_expense = #{otherExpense}</if>
-            <if test="totalExpense != null "> and total_expense = #{totalExpense}</if>
-            <if test="compiler != null "> and compiler = #{compiler}</if>
-            <if test="auditor != null "> and auditor = #{auditor}</if>
+        <where>
+            <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
+            <if test="staffCost != null "> and b.staff_cost = #{staffCost}</if>
+            <if test="carCost != null "> and b.car_cost = #{carCost}</if>
+            <if test="deviceCost != null "> and b.device_cost = #{deviceCost}</if>
+            <if test="fixCost != null "> and b.fix_cost = #{fixCost}</if>
+            <if test="settleExpense != null "> and b.settle_expense = #{settleExpense}</if>
+            <if test="outExpense != null "> and b.out_expense = #{outExpense}</if>
+            <if test="businessExpense != null "> and b.business_expense = #{businessExpense}</if>
+            <if test="rentExpense != null "> and b.rent_expense = #{rentExpense}</if>
+            <if test="otherExpense != null "> and b.other_expense = #{otherExpense}</if>
+            <if test="directExpense != null "> and b.direct_expense = #{directExpense}</if>
+            <if test="totalBudget != null "> and b.total_budget = #{totalBudget}</if>
+            <if test="compiler != null "> and b.compiler = #{compiler}</if>
+            <if test="auditor != null "> and b.auditor = #{auditor}</if>
         </where>
     </select>
-    
+
     <select id="selectCmcBudgetByBudgetId" parameterType="String" resultMap="CmcBudgetResult">
         <include refid="selectCmcBudgetVo"/>
         where budget_id = #{budgetId}
     </select>
-        
+
     <insert id="insertCmcBudget" parameterType="CmcBudget">
         insert into cmc_budget
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -56,32 +68,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="staffCost != null">staff_cost,</if>
             <if test="carCost != null">car_cost,</if>
             <if test="deviceCost != null">device_cost,</if>
-            <if test="budgetSettle != null">budget_settle,</if>
+            <if test="fixCost != null">fix_cost,</if>
+            <if test="settleExpense != null">settle_expense,</if>
             <if test="outExpense != null">out_expense,</if>
             <if test="businessExpense != null">business_expense,</if>
             <if test="rentExpense != null">rent_expense,</if>
             <if test="otherExpense != null">other_expense,</if>
-            <if test="totalExpense != null">total_expense,</if>
+            <if test="directExpense != null">direct_expense,</if>
+            <if test="totalBudget != null">total_budget,</if>
             <if test="compiler != null">compiler,</if>
             <if test="auditor != null">auditor,</if>
             <if test="createTime != null">create_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetId != null">#{budgetId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="staffCost != null">#{staffCost},</if>
             <if test="carCost != null">#{carCost},</if>
             <if test="deviceCost != null">#{deviceCost},</if>
-            <if test="budgetSettle != null">#{budgetSettle},</if>
+            <if test="fixCost != null">#{fixCost},</if>
+            <if test="settleExpense != null">#{settleExpense},</if>
             <if test="outExpense != null">#{outExpense},</if>
             <if test="businessExpense != null">#{businessExpense},</if>
             <if test="rentExpense != null">#{rentExpense},</if>
             <if test="otherExpense != null">#{otherExpense},</if>
-            <if test="totalExpense != null">#{totalExpense},</if>
+            <if test="directExpense != null">#{directExpense},</if>
+            <if test="totalBudget != null">#{totalBudget},</if>
             <if test="compiler != null">#{compiler},</if>
             <if test="auditor != null">#{auditor},</if>
             <if test="createTime != null">#{createTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateCmcBudget" parameterType="CmcBudget">
@@ -91,12 +107,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="staffCost != null">staff_cost = #{staffCost},</if>
             <if test="carCost != null">car_cost = #{carCost},</if>
             <if test="deviceCost != null">device_cost = #{deviceCost},</if>
-            <if test="budgetSettle != null">budget_settle = #{budgetSettle},</if>
+            <if test="fixCost != null">fix_cost = #{fixCost},</if>
+            <if test="settleExpense != null">settle_expense = #{settleExpense},</if>
             <if test="outExpense != null">out_expense = #{outExpense},</if>
             <if test="businessExpense != null">business_expense = #{businessExpense},</if>
             <if test="rentExpense != null">rent_expense = #{rentExpense},</if>
             <if test="otherExpense != null">other_expense = #{otherExpense},</if>
-            <if test="totalExpense != null">total_expense = #{totalExpense},</if>
+            <if test="directExpense != null">direct_expense = #{directExpense},</if>
+            <if test="totalBudget != null">total_budget = #{totalBudget},</if>
             <if test="compiler != null">compiler = #{compiler},</if>
             <if test="auditor != null">auditor = #{auditor},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -109,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcBudgetByBudgetIds" parameterType="String">
-        delete from cmc_budget where budget_id in 
+        delete from cmc_budget where budget_id in
         <foreach item="budgetId" collection="array" open="(" separator="," close=")">
             #{budgetId}
         </foreach>

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

@@ -59,8 +59,8 @@
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
         <include refid="selectCmcCarApprovalVo"/>
         <where>
-            <if test="applier != null "> and ca.ca.applier = #{applier}</if>
-            <if test="useDept != null "> and da.use_dept = #{useDept}</if>
+            <if test="applier != null "> and ca.applier = #{applier}</if>
+            <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
             <if test="cars != null  and cars != ''"> and ca.cars = #{cars}</if>
             <if test="drivers != null  and drivers != ''"> and ca.drivers = #{drivers}</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>

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

@@ -0,0 +1,93 @@
+<?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.CmcProjectWorkerMapper">
+    
+    <resultMap type="CmcProjectWorker" id="CmcProjectWorkerResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectLeader"    column="project_leader"    />
+        <result property="inWorker"    column="in_worker"    />
+        <result property="outWorker"    column="out_worker"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectWorkerVo">
+        select pw.id, pw.project_id, p.project_number, p.project_name, pw.project_leader, u.nick_name, pw.in_worker, pw.out_worker from cmc_project_worker as pw
+            left join sys_user as u on u.user_id = pw.project_leader
+            left join cmc_project as p on p.project_id = pw.project_id
+    </sql>
+
+    <select id="selectCmcProjectWorkerList" parameterType="CmcProjectWorker" resultMap="CmcProjectWorkerResult">
+        <include refid="selectCmcProjectWorkerVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and pw.project_id = #{projectId}</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and pw.project_leader = #{projectLeader}</if>
+            <if test="inWorker != null  and inWorker != ''"> and pw.in_worker = #{inWorker}</if>
+            <if test="outWorker != null  and outWorker != ''"> and pw.out_worker = #{outWorker}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcProjectWorkerById" parameterType="String" resultMap="CmcProjectWorkerResult">
+        <include refid="selectCmcProjectWorkerVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectCmcProjectWorkerListByProjectLeader" parameterType="String" resultMap="CmcProjectWorkerResult">
+        <include refid="selectCmcProjectWorkerVo"/>
+        where pw.project_leader = #{projectLeader}
+    </select>
+
+    <insert id="insertCmcProjectWorker" parameterType="CmcProjectWorker">
+        insert into cmc_project_worker
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="projectLeader != null">project_leader,</if>
+            <if test="inWorker != null">in_worker,</if>
+            <if test="outWorker != null">out_worker,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectLeader != null">#{projectLeader},</if>
+            <if test="inWorker != null">#{inWorker},</if>
+            <if test="outWorker != null">#{outWorker},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectWorker" parameterType="CmcProjectWorker">
+        update cmc_project_worker
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="projectLeader != null">project_leader = #{projectLeader},</if>
+            <if test="inWorker != null">in_worker = #{inWorker},</if>
+            <if test="outWorker != null">out_worker = #{outWorker},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCmcProjectWorkerById" parameterType="String">
+        delete from cmc_project_worker where id = #{id}
+    </delete>
+
+    <delete id="deleteCmcProjectWorkerByIds" parameterType="String">
+        delete from cmc_project_worker where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/sql.sql

@@ -1360,8 +1360,8 @@ create table cmc_project  (
   is_finished			char(1)					default null		comment '项目状态（0进行中、1已结束）',
   project_source		char(1)					default null		comment '项目来源（0院内、1院外）',
   party_a				varchar(50)				default null		comment '甲方单位',
-  contact_person		varchar(10)				default null		comment '联系人',
-  telephone				char(11)				default null		comment '联系电话',
+  contact_person		varchar(20)				default null		comment '联系人',
+  telephone				char(50)				default null		comment '联系电话',
   contract_id			char(10)				default null		comment '合同编码',
   project_type			varchar(20)				default null		comment '项目类型',
   project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
@@ -1375,123 +1375,122 @@ create table cmc_project  (
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-INSERT INTO `cmc_project` VALUES ('1', NULL, '重庆地铁监测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('2', NULL, '金川测量中心', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('3', NULL, '双江口测量中心', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('4', NULL, '泸县房地一体', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('5', NULL, '南江县农房登记权籍调查', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('6', NULL, '牙根5000地形图', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('7', NULL, '都江堰管网', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('8', '2019W33', '美姑县扶贫项目土地整理区域1:2000高清正摄影像（DOM）制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('9', '2021C101', '惠州惠阳区屋顶分布式光伏电站测绘项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('10', '2021C40', '重庆轨道交通4号线西延伸段工程施工监测及控制测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('11', '2021C81', '雅鲁藏布江下游JW梯级水电站测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('12', '2021C85', '老木孔航电枢纽工程施工测量控制网建网及首次观测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('13', '2022C12', '硬梁包电站扯索坝和二里坝桥行洪论证测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('14', '2022C29', '雅安市名山区百丈镇临溪河综合整治项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('15', '2022C46', '猴子岩水电站取水口及水厂新址1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('16', '2022C56', '新华水力发电有限公司博州10万千瓦储热型光热配建90万千瓦新能源项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('17', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('18', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('19', '2022C76', '芦山县市政公园恢复及重建工程项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('20', '2022C81', ' 宜宾蟠龙抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('21', '2022C85', '金沙江上游清洁能源基地叶巴滩抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('22', '2022C86', '双滩抽蓄电站测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('23', '2022W07', '大渡河猴子岩水电站外部变形监测工程（2022年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('24', '2022W17', '国网西藏拉萨发电公司直孔电站变形监测控制网复测及工作基点校测技术服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('25', '2022W18', '国网拉萨发电公司2022年直孔大坝、羊湖压力钢管等定期变形监测及年度资料整编技术服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('26', '2022W24', '广西平那高速公路测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('27', '2022W27', 'G4216线屏山新市至金阳段永善支线基础控制测量及地形图测绘项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('28', '2022W30', '广元市自然资源局昭化区分局昭化区林权权籍补充调查服务采购项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('29', '2022W34', '大唐观音岩水电站2022年度变形监测控制网复测及坝前淤积和坝后冲刷测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('30', '2022W38', '仪陇县林权数据整合建库采购项目政府采购合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('31', '2022W45', '国网西藏拉萨发电公司羊湖电站压力钢管永久变形监测沉降水准工作基点改造施工合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('32', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('33', '2023C02', '江油抽水蓄能电站可研阶段工程区1:1000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('34', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('35', '2023C08', '孟底沟水电站2023年地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('36', '2023C10', '德登抽水蓄能电站规划阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('37', '2023C101', 'ML水电站可研阶段1:1000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('38', '2023C102', '硬梁包水电站建设征地移民安置土地开发整理临时占地复垦刘河坝1:1000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('39', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('40', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('41', '2023C18', '芦山抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('42', '2023C20', '平昌抽水蓄能电站（苟家河库址）预可、可研阶段地形图测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('43', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('44', '2023C23', 'YX移民项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('45', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('46', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('47', '2023C29', 'ML坝址实景三维模型及库区电子沙盘制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('48', '2023C40', '金阳施控网成果复核', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('49', '2023C41', 'ML库区点位配合测量（配合基础设施分公司）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('50', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('51', '2023C47', '绵竹抽水蓄能电站界桩测设工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('52', '2023C49', '甘孜抽水蓄能水电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('53', '2023C52', '老木孔航电枢纽工程排涝区域1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('54', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('55', '2023C54', '国能大渡河汉源永利坪光伏电站项目1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('56', '2023C56', '长河坝水电站汤坝居民点和土地复垦外部引水工程地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('57', '2023C57', '官地水电站地形图测绘本', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('58', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('59', '2023C59', '老沟水库库容曲线测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('60', '2023C60', '大渡河流域扩机电站坐标转换', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('61', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('62', '2023C62', '铜街子水电站坝后段及渣场1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('63', '2023C63', '波罗水电站补充地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('64', '2023C66', '硬梁包水电站库区实物指标配合测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('65', '2023C69', '金沙江岗托水电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('66', '2023C72', '江油抽水蓄能电站界桩测设工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('67', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('68', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('69', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('70', '2023C76', '牙根二级水电站1:2000地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('71', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('72', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('73', '2023C80', '安徽西形冲抽水蓄能电站可研阶段地形图测绘项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('74', '2023C82', '叙州区抽水蓄能电站1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('75', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('76', '2023C86', '叶巴滩水电站连接道路硬化改建工程1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('77', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('78', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('79', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('80', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('81', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('82', '2023C94', 'JW梯级电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('83', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('84', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('85', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('86', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('87', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('88', '2023HY01', '航测遥感中心零星及借调项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('89', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('90', '2023W03', '雅砻江二滩水电站大坝外部变形观测及谷坡稳定性监测（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('91', '2023W06', '四川大渡河双江口水电站枢纽工程测量中心服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('92', '2023W08', '大渡河金川水电站工程测量中心劳务配合（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('93', '2023W09', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('94', '2023W11', '四川省盐源县测量标志普查维护工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('95', '2023W13', '拉萨水环境项目测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('96', '2023W16', '泸定水电站2023年水库泥沙监测服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('97', '2023W19', '国网拉萨发电公司2023年直孔、羊湖电站变形监测及资料整编技术服务合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('98', '2023W21', '大渡河公司大岗山水电站大坝及库岸边坡监测设备设施完善工程合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('99', '2023W23', '马来西亚东海岸铁路项目精测网复测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('100', '2023W24', '双流地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('101', '2023W26', '巴福大健康组团路网一标段第三方监测外协合同协议书', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('102', '2023W27', '简阳1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('103', '2023W28', '安州区黄洞子沟河道清淤项目测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('104', '2023W31', '黄河干流四川段防洪治理工程初设阶段勘察工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('105', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('106', '2024C03', '川藏铁路康定段三道桥放线配合测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('107', '2024C05', '卡瓦白庆抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('108', '2024C06', '安徽芜湖西形冲抽水蓄能电站建设征地界桩测设及居民点等地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('109', '2024C07', '绵竹抽水蓄能电站技施阶段测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('110', '2024C08', '猴子岩水电站江口村及周边1:1000地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('111', '2024HY01', '航测遥感中心借调、零星项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('112', '2024W01', '重庆区县建成区实景三维制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('113', '2024W02', '凤山平乐风电场地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('114', '2024W08', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('115', '2024W09', '四川省雅砻江两河口水电站工程测量中心服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('116', '2024W11', '国网拉萨发电公司2024年直孔、羊湖电站变形监测及资料整编', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
+INSERT INTO cmc_project VALUES ('1', NULL, '重庆地铁监测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('2', NULL, '金川测量中心', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('3', NULL, '双江口测量中心', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('4', NULL, '泸县房地一体', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('5', NULL, '南江县农房登记权籍调查', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('6', NULL, '牙根5000地形图', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('7', NULL, '都江堰管网', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('8', '2019W33', '美姑县扶贫项目土地整理区域1:2000高清正摄影像（DOM）制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('9', '2021C101', '惠州惠阳区屋顶分布式光伏电站测绘项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('10', '2021C40', '重庆轨道交通4号线西延伸段工程施工监测及控制测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('11', '2021C81', '雅鲁藏布江下游JW梯级水电站测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('12', '2021C85', '老木孔航电枢纽工程施工测量控制网建网及首次观测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('13', '2022C12', '硬梁包电站扯索坝和二里坝桥行洪论证测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('14', '2022C29', '雅安市名山区百丈镇临溪河综合整治项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('15', '2022C46', '猴子岩水电站取水口及水厂新址1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('16', '2022C56', '新华水力发电有限公司博州10万千瓦储热型光热配建90万千瓦新能源项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('17', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('18', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('19', '2022C76', '芦山县市政公园恢复及重建工程项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('20', '2022C81', ' 宜宾蟠龙抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('21', '2022C85', '金沙江上游清洁能源基地叶巴滩抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('22', '2022C86', '双滩抽蓄电站测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('23', '2022W07', '大渡河猴子岩水电站外部变形监测工程（2022年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('24', '2022W17', '国网西藏拉萨发电公司直孔电站变形监测控制网复测及工作基点校测技术服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('25', '2022W18', '国网拉萨发电公司2022年直孔大坝、羊湖压力钢管等定期变形监测及年度资料整编技术服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('26', '2022W24', '广西平那高速公路测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('27', '2022W27', 'G4216线屏山新市至金阳段永善支线基础控制测量及地形图测绘项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('28', '2022W30', '广元市自然资源局昭化区分局昭化区林权权籍补充调查服务采购项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('29', '2022W34', '大唐观音岩水电站2022年度变形监测控制网复测及坝前淤积和坝后冲刷测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('30', '2022W38', '仪陇县林权数据整合建库采购项目政府采购合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('31', '2022W45', '国网西藏拉萨发电公司羊湖电站压力钢管永久变形监测沉降水准工作基点改造施工合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('32', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('33', '2023C02', '江油抽水蓄能电站可研阶段工程区1:1000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('34', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('35', '2023C08', '孟底沟水电站2023年地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('36', '2023C10', '德登抽水蓄能电站规划阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('37', '2023C101', 'ML水电站可研阶段1:1000地形图测绘', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('38', '2023C102', '硬梁包水电站建设征地移民安置土地开发整理临时占地复垦刘河坝1:1000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('39', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('40', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('41', '2023C18', '芦山抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('42', '2023C20', '平昌抽水蓄能电站（苟家河库址）预可、可研阶段地形图测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('43', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('44', '2023C23', 'YX移民项目地形图测绘', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('45', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('46', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', '39', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('47', '2023C29', 'ML坝址实景三维模型及库区电子沙盘制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('48', '2023C40', '金阳施控网成果复核', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('49', '2023C41', 'ML库区点位配合测量（配合基础设施分公司）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('50', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL, NULL);
+INSERT INTO cmc_project VALUES ('51', '2023C47', '绵竹抽水蓄能电站界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('52', '2023C49', '甘孜抽水蓄能水电站地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('53', '2023C52', '老木孔航电枢纽工程排涝区域1:2000地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('54', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1:2000地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('55', '2023C54', '国能大渡河汉源永利坪光伏电站项目1:500地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('56', '2023C56', '长河坝水电站汤坝居民点和土地复垦外部引水工程地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('57', '2023C57', '官地水电站地形图测绘本', '39', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('58', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('59', '2023C59', '老沟水库库容曲线测量', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('60', '2023C60', '大渡河流域扩机电站坐标转换', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('61', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('62', '2023C62', '铜街子水电站坝后段及渣场1:500地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('63', '2023C63', '波罗水电站补充地形地类图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('64', '2023C66', '硬梁包水电站库区实物指标配合测量', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('65', '2023C69', '金沙江岗托水电站地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('66', '2023C72', '江油抽水蓄能电站界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('67', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('68', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('69', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', '66', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('70', '2023C76', '牙根二级水电站1:2000地形地类图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('71', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('72', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('73', '2023C80', '安徽西形冲抽水蓄能电站可研阶段地形图测绘项目', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('74', '2023C82', '叙州区抽水蓄能电站1:2000地形图测绘', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('75', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', '83', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('76', '2023C86', '叶巴滩水电站连接道路硬化改建工程1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('77', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('78', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('79', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', '83', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('80', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('81', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('82', '2023C94', 'JW梯级电站可研阶段地形图测绘', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('83', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('84', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('85', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('86', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('87', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('88', '2023HY01', '航测遥感中心零星及借调项目', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('89', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('90', '2023W03', '雅砻江二滩水电站大坝外部变形观测及谷坡稳定性监测（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('91', '2023W06', '四川大渡河双江口水电站枢纽工程测量中心服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('92', '2023W08', '大渡河金川水电站工程测量中心劳务配合（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('93', '2023W09', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('94', '2023W11', '四川省盐源县测量标志普查维护工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('95', '2023W13', '拉萨水环境项目测绘工作', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('96', '2023W16', '泸定水电站2023年水库泥沙监测服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('97', '2023W19', '国网拉萨发电公司2023年直孔、羊湖电站变形监测及资料整编技术服务合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('98', '2023W21', '大渡河公司大岗山水电站大坝及库岸边坡监测设备设施完善工程合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('99', '2023W23', '马来西亚东海岸铁路项目精测网复测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('100', '2023W24', '双流地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('101', '2023W26', '巴福大健康组团路网一标段第三方监测外协合同协议书', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('102', '2023W27', '简阳1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('103', '2023W28', '安州区黄洞子沟河道清淤项目测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('104', '2023W31', '黄河干流四川段防洪治理工程初设阶段勘察工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('105', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('106', '2024C03', '川藏铁路康定段三道桥放线配合测量', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('107', '2024C05', '卡瓦白庆抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('108', '2024C06', '安徽芜湖西形冲抽水蓄能电站建设征地界桩测设及居民点等地形地类图测绘', '96', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('109', '2024C07', '绵竹抽水蓄能电站技施阶段测绘工作', '79', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('110', '2024C08', '猴子岩水电站江口村及周边1:1000地形地类图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('111', '2024HY01', '航测遥感中心借调、零星项目', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('112', '2024W01', '重庆区县建成区实景三维制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('113', '2024W02', '凤山平乐风电场地形图测绘', '75', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('114', '2024W08', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('115', '2024W09', '四川省雅砻江两河口水电站工程测量中心服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('116', '2024W11', '国网拉萨发电公司2024年直孔、羊湖电站变形监测及资料整编', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
 -- ----------------------------
@@ -3541,6 +3540,40 @@ create table `cmc_budget`  (
 -- ----------------------------
 -- 初始化-预算管理表数据
 -- ----------------------------
+insert into `cmc_budget` values ('105', '105', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('106', '106', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('110', '110', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('17', '17', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('18', '18', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('32', '32', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('33', '33', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('34', '34', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('37', '37', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('51', '51', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('52', '52', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('53', '53', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('54', '54', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('55', '55', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('57', '57', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('59', '59', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('63', '63', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('65', '65', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('66', '66', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('68', '68', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('70', '70', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('71', '71', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('72', '72', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('74', '74', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('75', '75', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('76', '76', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('77', '77', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('78', '78', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('80', '80', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('81', '81', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('82', '82', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('83', '83', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('84', '84', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_budget` values ('85', '85', null, null, null, null, null, null, null, null, null, null, null, null, null, null);
 
 -- ----------------------------
 -- 38、cmc车辆预算表
@@ -3615,6 +3648,146 @@ create table `cmc_budget_staff`  (
 -- ----------------------------
 -- 初始化-人员预算表数据
 -- ----------------------------
+insert into `cmc_budget_staff` values ('105', '105', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('106', '106', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('110', '110', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('1633765257669246977', '34', 83, null, null, null, null);
+insert into `cmc_budget_staff` values ('1633770811569471490', '32', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1633771027018285057', '33', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1673601192074149890', '52', 75, null, null, null, null);
+insert into `cmc_budget_staff` values ('1673601523608715266', '55', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1673601908515799042', '53', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('1673602123545182210', '54', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('1676948591949643777', '59', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('1676948942941585410', '57', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('1679769237196898306', '17', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1679769589929476097', '18', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1679770747494465538', '51', 66, null, null, null, null);
+insert into `cmc_budget_staff` values ('1694527969734688770', '63', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1694528325550080002', '65', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1697108010087743490', '66', 77, null, null, null, null);
+insert into `cmc_budget_staff` values ('17', '17', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('1702491945512730626', '70', 96, null, null, null, null);
+insert into `cmc_budget_staff` values ('1707211932139782146', '71', 96, null, null, null, null);
+insert into `cmc_budget_staff` values ('1707626752387317762', '68', 95, null, null, null, null);
+insert into `cmc_budget_staff` values ('1713455412201652225', '72', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('1718965187043655682', '74', 95, null, null, null, null);
+insert into `cmc_budget_staff` values ('1718973009617747970', '75', 83, null, null, null, null);
+insert into `cmc_budget_staff` values ('1729523067262074882', '76', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1729523327594135553', '78', 69, null, null, null, null);
+insert into `cmc_budget_staff` values ('1729523650169667586', '80', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('1729523884455100418', '81', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('1730092422756564993', '77', 95, null, null, null, null);
+insert into `cmc_budget_staff` values ('1731465142576611330', '82', 83, null, null, null, null);
+insert into `cmc_budget_staff` values ('1737454765236813825', '37', 83, null, null, null, null);
+insert into `cmc_budget_staff` values ('1739658607567306754', '105', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('1739961827233628162', '85', 98, null, null, null, null);
+insert into `cmc_budget_staff` values ('1741422198586867714', '83', 75, null, null, null, null);
+insert into `cmc_budget_staff` values ('1741422566360219650', '84', 75, null, null, null, null);
+insert into `cmc_budget_staff` values ('1763373750746611714', '106', 66, null, null, null, null);
+insert into `cmc_budget_staff` values ('1765674388075577346', '110', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('18', '18', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('32', '32', 72, null, null, null, null);
+insert into `cmc_budget_staff` values ('33', '33', 72, null, null, null, null);
+insert into `cmc_budget_staff` values ('34', '34', 73, null, null, null, null);
+insert into `cmc_budget_staff` values ('37', '37', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('51', '51', 63, null, null, null, null);
+insert into `cmc_budget_staff` values ('52', '52', 72, null, null, null, null);
+insert into `cmc_budget_staff` values ('53', '53', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('54', '54', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('55', '55', 72, null, null, null, null);
+insert into `cmc_budget_staff` values ('57', '57', 39, null, null, null, null);
+insert into `cmc_budget_staff` values ('59', '59', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('63', '63', 71, null, null, null, null);
+insert into `cmc_budget_staff` values ('65', '65', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('66', '66', 98, null, null, null, null);
+insert into `cmc_budget_staff` values ('68', '68', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('70', '70', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('71', '71', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('72', '72', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('74', '74', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('75', '75', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('76', '76', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('77', '77', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('78', '78', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('80', '80', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('81', '81', 74, null, null, null, null);
+insert into `cmc_budget_staff` values ('82', '82', 84, null, null, null, null);
+insert into `cmc_budget_staff` values ('83', '83', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('84', '84', 64, null, null, null, null);
+insert into `cmc_budget_staff` values ('85', '85', 84, null, null, null, null);
+
+-- ----------------------------
+-- 40、cmc项目人员表
+-- ----------------------------
+drop table if exists `cmc_project_worker`;
+create table `cmc_project_worker`  (
+  `id` 				varchar(32) not null 	comment 'id',
+  `project_id` 		varchar(32) default null comment '项目id',
+  `project_leader` 	varchar(32) default null comment '项目负责人',
+  `in_worker` 		varchar(32) default null comment '内业负责人',
+  `out_worker` 		varchar(32) default null comment '外业负责人',
+  primary key (`id`)
+) engine = innodb comment = 'cmc项目人员表';
+
+-- ----------------------------
+-- 初始化-项目人员表数据
+-- ----------------------------
+INSERT INTO `cmc_project_worker` VALUES ('1633765257669246978', '1633765257669246977', '83', '73', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1633768222907957250', '1633768222907957249', '63', '63', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1633770811569471491', '1633770811569471490', '74', '72', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1633771027018285058', '1633771027018285057', '74', '72', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1633771294472273923', '1633771294472273922', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1633781742236073986', '1633781742236073985', '63', '63', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1641355612560293890', '1641355612560293889', '39', '39', '39');
+INSERT INTO `cmc_project_worker` VALUES ('1641805297456513027', '1641805297456513026', '63', '63', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1641807061123596291', '1641807061123596290', '63', '63', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1652690353125326850', '1652690353125326849', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1658656258510553090', '1658656258510553089', '84', '84', '84');
+INSERT INTO `cmc_project_worker` VALUES ('1673601192074149891', '1673601192074149890', '63', '72', '75');
+INSERT INTO `cmc_project_worker` VALUES ('1673601523608715267', '1673601523608715266', '63', '72', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1673601908515799043', '1673601908515799042', '63', '64', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1673602123545182211', '1673602123545182210', '63', '64', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1676948354560425987', '1676948354560425986', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1676948591949643778', '1676948591949643777', '63', '64', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1676948942941585411', '1676948942941585410', '39', '39', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1679769237196898307', '1679769237196898306', '74', '84', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1679769589929476098', '1679769589929476097', '74', '84', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1679769796872241155', '1679769796872241154', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1679770747494465539', '1679770747494465538', '63', '63', '66');
+INSERT INTO `cmc_project_worker` VALUES ('1679772570787774467', '1679772570787774466', '63', '75', '75');
+INSERT INTO `cmc_project_worker` VALUES ('1685853339360690178', '1685853339360690177', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1685853709264748547', '1685853709264748546', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1694527969734688771', '1694527969734688770', '74', '71', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1694528325550080003', '1694528325550080002', '74', '64', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1697108010087743491', '1697108010087743490', '63', '98', '77');
+INSERT INTO `cmc_project_worker` VALUES ('1702491945512730627', '1702491945512730626', '63', '64', '96');
+INSERT INTO `cmc_project_worker` VALUES ('1702492292125818882', '1702492292125818881', '66', '66', '66');
+INSERT INTO `cmc_project_worker` VALUES ('1707211932139782147', '1707211932139782146', '84', '84', '96');
+INSERT INTO `cmc_project_worker` VALUES ('1707626752387317763', '1707626752387317762', '84', '84', '95');
+INSERT INTO `cmc_project_worker` VALUES ('1713455412201652226', '1713455412201652225', '63', '64', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1715703538933301250', '1715703538933301249', '83', '83', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1718965187043655683', '1718965187043655682', '84', '84', '95');
+INSERT INTO `cmc_project_worker` VALUES ('1718973009617747971', '1718973009617747970', '83', '84', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1721876576657735683', '1721876576657735682', '83', '83', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1729523067262074883', '1729523067262074882', '74', '64', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1729523327598329858', '1729523327594135553', '64', '64', '69');
+INSERT INTO `cmc_project_worker` VALUES ('1729523650169667587', '1729523650169667586', '63', '74', '64');
+INSERT INTO `cmc_project_worker` VALUES ('1729523884455100419', '1729523884455100418', '64', '74', '64');
+INSERT INTO `cmc_project_worker` VALUES ('1730092422756564994', '1730092422756564993', '84', '84', '95');
+INSERT INTO `cmc_project_worker` VALUES ('1731465142576611331', '1731465142576611330', '83', '84', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1737454765236813826', '1737454765236813825', '83', '84', '83');
+INSERT INTO `cmc_project_worker` VALUES ('1739658607567306755', '1739658607567306754', '74', '64', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1739658998220587010', '1739658998220587009', '74', '74', '74');
+INSERT INTO `cmc_project_worker` VALUES ('1739961827233628163', '1739961827233628162', '84', '84', '98');
+INSERT INTO `cmc_project_worker` VALUES ('1741422198586867715', '1741422198586867714', '64', '64', '75');
+INSERT INTO `cmc_project_worker` VALUES ('1741422566360219651', '1741422566360219650', '64', '64', '75');
+INSERT INTO `cmc_project_worker` VALUES ('1752902350986543106', '1752902350986543105', '63', '63', '63');
+INSERT INTO `cmc_project_worker` VALUES ('1752903021416677379', '1752903021416677378', '75', '75', '75');
+INSERT INTO `cmc_project_worker` VALUES ('1763373750750806018', '1763373750746611714', '84', '84', '66');
+INSERT INTO `cmc_project_worker` VALUES ('1764836188989947907', '1764836188989947906', '96', '96', '96');
+INSERT INTO `cmc_project_worker` VALUES ('1765673949439459330', '1765673949439459329', '79', '79', '79');
+INSERT INTO `cmc_project_worker` VALUES ('1765674388075577347', '1765674388075577346', '74', '64', '74');
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

oa-ui/src/api/oa/project/projectWorker.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询cmc项目人员列表
+export function listProjectWorker(query) {
+  return request({
+    url: '/oa/projectWorker/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目人员详细
+export function getProjectWorker(id) {
+  return request({
+    url: '/oa/projectWorker/' + id,
+    method: 'get'
+  })
+}
+
+// 获取项目负责人负责的项目详细信息
+export function getListByProjectLeader(projectLeader) {
+  return request({
+    url: '/oa/projectWorker/projectLeader',
+    method: 'get',
+    params: projectLeader
+  })
+}
+
+// 新增cmc项目人员
+export function addProjectWorker(data) {
+  return request({
+    url: '/oa/projectWorker',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目人员
+export function updateProjectWorker(data) {
+  return request({
+    url: '/oa/projectWorker',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目人员
+export function delProjectWorker(id) {
+  return request({
+    url: '/oa/projectWorker/' + id,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/budget/index.vue

@@ -1,9 +1,117 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员成本" prop="staffCost">
+        <el-input
+          v-model="queryParams.staffCost"
+          placeholder="请输入人员成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆成本" prop="carCost">
+        <el-input
+          v-model="queryParams.carCost"
+          placeholder="请输入车辆成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备成本" prop="deviceCost">
+        <el-input
+          v-model="queryParams.deviceCost"
+          placeholder="请输入设备成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="固定成本" prop="fixCost">
+        <el-input
+          v-model="queryParams.fixCost"
+          placeholder="请输入固定成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预结算额" prop="settleExpense">
+        <el-input
+          v-model="queryParams.settleExpense"
+          placeholder="请输入预结算额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外协费用" prop="outExpense">
+        <el-input
+          v-model="queryParams.outExpense"
+          placeholder="请输入外协费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商务费用" prop="businessExpense">
+        <el-input
+          v-model="queryParams.businessExpense"
+          placeholder="请输入商务费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车船租赁" prop="rentExpense">
+        <el-input
+          v-model="queryParams.rentExpense"
+          placeholder="请输入车船租赁"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="其他费用" prop="otherExpense">
+        <el-input
+          v-model="queryParams.otherExpense"
+          placeholder="请输入其他费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="直接成本" prop="directExpense">
+        <el-input
+          v-model="queryParams.directExpense"
+          placeholder="请输入直接成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预算总额" prop="totalBudget">
+        <el-input
+          v-model="queryParams.totalBudget"
+          placeholder="请输入预算总额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编制人" prop="compiler">
+        <el-input
+          v-model="queryParams.compiler"
+          placeholder="请输入编制人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核人" prop="auditor">
+        <el-input
+          v-model="queryParams.auditor"
+          placeholder="请输入审核人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -13,20 +121,46 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:budget:add']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:budget:add']"
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:budget:edit']">修改</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:budget:edit']"
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:budget:remove']">删除</el-button>
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:budget:remove']"
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:budget:export']">导出</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:budget:export']"
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -38,26 +172,43 @@
       <el-table-column label="人员成本" align="center" prop="staffCost" />
       <el-table-column label="车辆成本" align="center" prop="carCost" />
       <el-table-column label="设备成本" align="center" prop="deviceCost" />
-      <el-table-column label="预结算额" align="center" prop="budgetSettle" />
+      <el-table-column label="固定成本" align="center" prop="fixCost" />
+      <el-table-column label="预结算额" align="center" prop="settleExpense" />
       <el-table-column label="外协费用" align="center" prop="outExpense" />
       <el-table-column label="商务费用" align="center" prop="businessExpense" />
       <el-table-column label="车船租赁" align="center" prop="rentExpense" />
       <el-table-column label="其他费用" align="center" prop="otherExpense" />
-      <el-table-column label="预算总额" align="center" prop="totalExpense" />
+      <el-table-column label="直接成本" align="center" prop="directExpense" />
+      <el-table-column label="预算总额" align="center" prop="totalBudget" />
       <el-table-column label="编制人" align="center" prop="compiler" />
       <el-table-column label="审核人" align="center" prop="auditor" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:budget:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:budget:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:budget:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改cmc预算管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -74,8 +225,11 @@
         <el-form-item label="设备成本" prop="deviceCost">
           <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
         </el-form-item>
-        <el-form-item label="预结算额" prop="budgetSettle">
-          <el-input v-model="form.budgetSettle" placeholder="请输入预结算额" />
+        <el-form-item label="固定成本" prop="fixCost">
+          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+        </el-form-item>
+        <el-form-item label="预结算额" prop="settleExpense">
+          <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
         </el-form-item>
         <el-form-item label="外协费用" prop="outExpense">
           <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
@@ -89,8 +243,11 @@
         <el-form-item label="其他费用" prop="otherExpense">
           <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
         </el-form-item>
-        <el-form-item label="预算总额" prop="totalExpense">
-          <el-input v-model="form.totalExpense" placeholder="请输入预算总额" />
+        <el-form-item label="直接成本" prop="directExpense">
+          <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
+        </el-form-item>
+        <el-form-item label="预算总额" prop="totalBudget">
+          <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
         </el-form-item>
         <el-form-item label="编制人" prop="compiler">
           <el-input v-model="form.compiler" placeholder="请输入编制人" />
@@ -140,12 +297,14 @@ export default {
         staffCost: null,
         carCost: null,
         deviceCost: null,
-        budgetSettle: null,
+        fixCost: null,
+        settleExpense: null,
         outExpense: null,
         businessExpense: null,
         rentExpense: null,
         otherExpense: null,
-        totalExpense: null,
+        directExpense: null,
+        totalBudget: null,
         compiler: null,
         auditor: null,
       },
@@ -182,12 +341,14 @@ export default {
         staffCost: null,
         carCost: null,
         deviceCost: null,
-        budgetSettle: null,
+        fixCost: null,
+        settleExpense: null,
         outExpense: null,
         businessExpense: null,
         rentExpense: null,
         otherExpense: null,
-        totalExpense: null,
+        directExpense: null,
+        totalBudget: null,
         compiler: null,
         auditor: null,
         createTime: null
@@ -207,7 +368,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.budgetId)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -250,12 +411,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const budgetIds = row.budgetId || this.ids;
-      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function() {
         return delBudget(budgetIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/staff/info.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-25 13:56:25
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-26 17:42:45
 -->
 <template>
   <div class="bg">
@@ -161,7 +161,7 @@ export default {
     goBack() {
       let obj = { path: "/staff/info" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/staff' });
+      this.$router.push({ path: '/staff/user' });
     },
   }
 }
@@ -227,7 +227,7 @@ export default {
     font-size: 14px;
     padding-left: 30px;
     display: flex;
-    align-items: start;
+    align-items: flex-start;
 
     .info-icon {
       font-size: 20px;

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-03-25 17:38:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-26 17:54:49
+-->
 <template>
   <div>
     <!-- <el-table :data="tableData" style="width: 100%">
@@ -20,11 +26,11 @@
 </el-table-column>
 </el-table> -->
     <el-collapse v-model="activeNames" @change="handleChange">
-      <el-collapse-item :name="item.projectNumber" v-for="item in tableData">
+      <el-collapse-item :name="item.project.projectNumber" v-for="item in tableData" :key="item.project.projectNumber">
         <template slot="title">
           <div>
             <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
-            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeader }}
+            {{ item.project.projectNumber + ' ' + ' ' + item.project.projectName + ' ' + ' ' + item.user.nickName }}
           </div>
         </template>
         <div>暂无信息，敬请期待</div>
@@ -34,15 +40,19 @@
 </template>
 
 <script>
+
+import { listProjectWorker, getProjectWorker, getListByProjectLeader, delProjectWorker, addProjectWorker, updateProjectWorker } from "@/api/oa/project/projectWorker";
+
 export default {
   data() {
     return {
+
       tableData: [
         {
           projectNumber: '2021C40',
           projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
           projectLeader: 'XXX'
-        }, 
+        },
         {
           projectNumber: '2021C50',
           projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
@@ -57,16 +67,27 @@ export default {
       activeNames: ['1']
     }
   },
+  created() {
+    this.getListByProjectLeader();
+  },
   methods: {
     handleChange(val) {
       console.log(val);
+    },
+    getListByProjectLeader() {
+      console.log(this.$route.query.userId);
+      let projectLeader = this.$route.query.userId;
+      getListByProjectLeader({ projectLeader: projectLeader }).then(res => {
+        this.tableData = res.data
+        console.log(this.tableData);
+      });
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.info-icon{
+.info-icon {
   font-size: 20px;
 }
 </style>