新增修改项目工作内容

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

@@ -3,16 +3,13 @@ package com.ruoyi.web.controller.oa;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcProjectWork;
+import com.ruoyi.oa.service.ICmcProjectWorkService;
 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -35,6 +32,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcProjectService cmcProjectService;
 
+    @Autowired
+    private ICmcProjectWorkService cmcProjectWorkService;
+
     /**
      * 查询cmc项目列表
      */
@@ -78,6 +78,60 @@ public class CmcProjectController extends BaseController
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
+    /**
+     * 新增cmc项目
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.INSERT)
+    @PostMapping( "/submit")
+    public AjaxResult submit(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcProject cmcProject = new CmcProject();
+        cmcProject.setProjectId(new SnowFlake().generateId());
+        cmcProject.setProjectName(formDataJson.getString("projectName"));
+        cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
+        cmcProject.setIsFinished(formDataJson.getString("isFinished"));
+        cmcProject.setProjectSource(formDataJson.getString("projectSource"));
+        cmcProject.setPartyA(formDataJson.getString("partyA"));
+        cmcProject.setContactPerson(formDataJson.getString("contactPerson"));
+        cmcProject.setTelephone(formDataJson.getString("telephone"));
+        cmcProject.setProjectType(formDataJson.getString("projectType"));
+        cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
+        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
+        cmcProject.setCreateTime(DateUtils.getNowDate());
+        String workList = formDataJson.getString("workList");
+        workList = workList.substring(1, workList.length() - 1);
+        if (workList.split("}").length > 1) {
+            for (int i = 0; i < workList.split("}").length; i++) {
+                String workArri = workList.split("}")[i] + "}";
+                if (i > 0)
+                    workArri = workArri.substring(1);
+                JSONObject workArrObject = JSONObject.parse(workArri);
+                CmcProjectWork cmcProjectWork = new CmcProjectWork();
+                cmcProjectWork.setProjectId(cmcProject.getProjectId());
+                cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
+                cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+                cmcProjectWork.setUnit(workArrObject.getString("unit"));
+                cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
+                cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+                cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
+            }
+        }
+        else {
+            JSONObject workArrObject = JSONObject.parse(workList);
+            CmcProjectWork cmcProjectWork = new CmcProjectWork();
+            cmcProjectWork.setProjectId(cmcProject.getProjectId());
+            cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
+            cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+            cmcProjectWork.setUnit(workArrObject.getString("unit"));
+            cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
+            cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+            cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
+        }
+        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
+    }
+
     /**
      * 修改cmc项目
      */
@@ -88,6 +142,57 @@ public class CmcProjectController extends BaseController
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 
+    /**
+     * 修改cmc项目
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.UPDATE)
+    @PutMapping( "/modify")
+    public AjaxResult modify(@RequestParam("taskForm") String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(formDataJson.getString("projectId"));
+        cmcProject.setProjectName(formDataJson.getString("projectName"));
+        cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
+        cmcProject.setIsFinished(formDataJson.getString("isFinished"));
+        cmcProject.setProjectSource(formDataJson.getString("projectSource"));
+        cmcProject.setPartyA(formDataJson.getString("partyA"));
+        cmcProject.setContactPerson(formDataJson.getString("contactPerson"));
+        cmcProject.setTelephone(formDataJson.getString("telephone"));
+        cmcProject.setProjectType(formDataJson.getString("projectType"));
+        cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
+        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
+        cmcProject.setCreateTime(DateUtils.getNowDate());
+        String workList = formDataJson.getString("workList");
+        workList = workList.substring(1, workList.length() - 1);
+        if (workList.split("}").length > 1) {
+            for (int i = 0; i < workList.split("}").length; i++) {
+                String workArri = workList.split("}")[i] + "}";
+                if (i > 0)
+                    workArri = workArri.substring(1);
+                JSONObject workArrObject = JSONObject.parse(workArri);
+                CmcProjectWork cmcProjectWork = cmcProjectWorkService.selectCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
+                cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
+                cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+                cmcProjectWork.setUnit(workArrObject.getString("unit"));
+                cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
+                cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+                cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork);
+            }
+        }
+        else {
+            JSONObject workArrObject = JSONObject.parse(workList);
+            CmcProjectWork cmcProjectWork = cmcProjectWorkService.selectCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
+            cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
+            cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+            cmcProjectWork.setUnit(workArrObject.getString("unit"));
+            cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
+            cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+            cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork);
+        }
+        return toAjax(cmcProjectService.updateCmcProject(cmcProject));
+    }
+
     /**
      * 删除cmc项目
      */

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

@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc项目对象 cmc_project
- * 
+ *
  * @author cmc
- * @date 2024-01-30
+ * @date 2024-02-28
  */
 public class CmcProject extends BaseEntity
 {
@@ -18,55 +18,83 @@ public class CmcProject extends BaseEntity
     /** 项目id */
     private String projectId;
 
-    /** 项目名称 */
-    @Excel(name = "项目名称")
-    private String projectName;
-
     /** 项目编号 */
     @Excel(name = "项目编号")
     private String projectNumber;
 
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
     /** 项目负责人 */
     @Excel(name = "项目负责人")
-    private Integer projectLeader;
+    private Long projectLeader;
 
-    /** 项目状态 */
-    @Excel(name = "项目状态")
+    /** 项目状态（0进行中、1已结束） */
+    @Excel(name = "项目状态", readConverterExp = "0=进行中、1=已结束")
     private String isFinished;
 
-    public void setProjectId(String projectId) 
+    /** 项目来源（0院内、1院外） */
+    @Excel(name = "项目来源", readConverterExp = "0=院内、1=院外")
+    private String projectSource;
+
+    /** 甲方单位 */
+    @Excel(name = "甲方单位")
+    private String partyA;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telephone;
+
+    /** 项目类型 */
+    @Excel(name = "项目类型")
+    private String projectType;
+
+    /** 项目级别（0一般项目、1重大项目） */
+    @Excel(name = "项目级别", readConverterExp = "0=一般项目、1=重大项目")
+    private String projectLevel;
+
+    /** 项目登记人 */
+    @Excel(name = "项目登记人")
+    private Long projectRegistrant;
+
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public String getProjectId()
     {
         return projectId;
     }
-    public void setProjectName(String projectName) 
+    public void setProjectNumber(String projectNumber)
     {
-        this.projectName = projectName;
+        this.projectNumber = projectNumber;
     }
 
-    public String getProjectName() 
+    public String getProjectNumber()
     {
-        return projectName;
+        return projectNumber;
     }
-    public void setProjectNumber(String projectNumber) 
+    public void setProjectName(String projectName)
     {
-        this.projectNumber = projectNumber;
+        this.projectName = projectName;
     }
 
-    public String getProjectNumber() 
+    public String getProjectName()
     {
-        return projectNumber;
+        return projectName;
     }
-    public void setProjectLeader(Integer projectLeader)
+    public void setProjectLeader(Long projectLeader)
     {
         this.projectLeader = projectLeader;
     }
 
-    public Integer getProjectLeader()
+    public Long getProjectLeader()
     {
         return projectLeader;
     }
@@ -79,15 +107,85 @@ public class CmcProject extends BaseEntity
     {
         return isFinished;
     }
+    public void setProjectSource(String projectSource)
+    {
+        this.projectSource = projectSource;
+    }
+
+    public String getProjectSource()
+    {
+        return projectSource;
+    }
+    public void setPartyA(String partyA)
+    {
+        this.partyA = partyA;
+    }
+
+    public String getPartyA()
+    {
+        return partyA;
+    }
+    public void setContactPerson(String contactPerson)
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson()
+    {
+        return contactPerson;
+    }
+    public void setTelephone(String telephone)
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone()
+    {
+        return telephone;
+    }
+    public void setProjectType(String projectType)
+    {
+        this.projectType = projectType;
+    }
+
+    public String getProjectType()
+    {
+        return projectType;
+    }
+    public void setProjectLevel(String projectLevel)
+    {
+        this.projectLevel = projectLevel;
+    }
+
+    public String getProjectLevel()
+    {
+        return projectLevel;
+    }
+    public void setProjectRegistrant(Long projectRegistrant)
+    {
+        this.projectRegistrant = projectRegistrant;
+    }
+
+    public Long getProjectRegistrant()
+    {
+        return projectRegistrant;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("projectId", getProjectId())
-            .append("projectName", getProjectName())
-            .append("projectLeader", getProjectLeader())
-            .append("projectNumber", getProjectNumber())
-            .append("isFinished", getIsFinished())
-            .toString();
+                .append("projectId", getProjectId())
+                .append("projectNumber", getProjectNumber())
+                .append("projectName", getProjectName())
+                .append("projectLeader", getProjectLeader())
+                .append("isFinished", getIsFinished())
+                .append("projectSource", getProjectSource())
+                .append("partyA", getPartyA())
+                .append("contactPerson", getContactPerson())
+                .append("telephone", getTelephone())
+                .append("projectType", getProjectType())
+                .append("projectLevel", getProjectLevel())
+                .append("projectRegistrant", getProjectRegistrant())
+                .toString();
     }
 }

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

@@ -0,0 +1,110 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc项目内容对象 cmc_project_work
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+public class CmcProjectWork extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 工作内容 */
+    @Excel(name = "工作内容")
+    private String workContent;
+
+    /** 等级或比例尺 */
+    @Excel(name = "等级或比例尺")
+    private String scaleGrade;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 工作量 */
+    @Excel(name = "工作量")
+    private String workLoad;
+
+    /** 要求完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTime;
+
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setWorkContent(String workContent) 
+    {
+        this.workContent = workContent;
+    }
+
+    public String getWorkContent() 
+    {
+        return workContent;
+    }
+    public void setScaleGrade(String scaleGrade) 
+    {
+        this.scaleGrade = scaleGrade;
+    }
+
+    public String getScaleGrade() 
+    {
+        return scaleGrade;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setWorkLoad(String workLoad) 
+    {
+        this.workLoad = workLoad;
+    }
+
+    public String getWorkLoad() 
+    {
+        return workLoad;
+    }
+    public void setFinishTime(Date finishTime) 
+    {
+        this.finishTime = finishTime;
+    }
+
+    public Date getFinishTime() 
+    {
+        return finishTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("projectId", getProjectId())
+            .append("workContent", getWorkContent())
+            .append("scaleGrade", getScaleGrade())
+            .append("unit", getUnit())
+            .append("workLoad", getWorkLoad())
+            .append("finishTime", getFinishTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectWork;
+
+/**
+ * cmc项目内容Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+public interface CmcProjectWorkMapper 
+{
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目内容主键
+     * @return cmc项目内容
+     */
+    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWork> selectCmcProjectWorkList(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    public int insertCmcProjectWork(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    public int updateCmcProjectWork(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 删除cmc项目内容
+     * 
+     * @param projectId cmc项目内容主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkByProjectId(String projectId);
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkByProjectIds(String[] projectIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectWork;
+
+/**
+ * cmc项目内容Service接口
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+public interface ICmcProjectWorkService 
+{
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目内容主键
+     * @return cmc项目内容
+     */
+    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWork> selectCmcProjectWorkList(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    public int insertCmcProjectWork(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    public int updateCmcProjectWork(CmcProjectWork cmcProjectWork);
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param projectIds 需要删除的cmc项目内容主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc项目内容信息
+     * 
+     * @param projectId cmc项目内容主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkByProjectId(String projectId);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProjectWorkMapper;
+import com.ruoyi.oa.domain.CmcProjectWork;
+import com.ruoyi.oa.service.ICmcProjectWorkService;
+
+/**
+ * cmc项目内容Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+@Service
+public class CmcProjectWorkServiceImpl implements ICmcProjectWorkService 
+{
+    @Autowired
+    private CmcProjectWorkMapper cmcProjectWorkMapper;
+
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目内容主键
+     * @return cmc项目内容
+     */
+    @Override
+    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId)
+    {
+        return cmcProjectWorkMapper.selectCmcProjectWorkByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return cmc项目内容
+     */
+    @Override
+    public List<CmcProjectWork> selectCmcProjectWorkList(CmcProjectWork cmcProjectWork)
+    {
+        return cmcProjectWorkMapper.selectCmcProjectWorkList(cmcProjectWork);
+    }
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectWork(CmcProjectWork cmcProjectWork)
+    {
+        return cmcProjectWorkMapper.insertCmcProjectWork(cmcProjectWork);
+    }
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWork cmc项目内容
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectWork(CmcProjectWork cmcProjectWork)
+    {
+        return cmcProjectWorkMapper.updateCmcProjectWork(cmcProjectWork);
+    }
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param projectIds 需要删除的cmc项目内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkByProjectIds(String[] projectIds)
+    {
+        return cmcProjectWorkMapper.deleteCmcProjectWorkByProjectIds(projectIds);
+    }
+
+    /**
+     * 删除cmc项目内容信息
+     * 
+     * @param projectId cmc项目内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkByProjectId(String projectId)
+    {
+        return cmcProjectWorkMapper.deleteCmcProjectWorkByProjectId(projectId);
+    }
+}

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

@@ -1,61 +1,100 @@
 <?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.CmcProjectMapper">
-    
+
     <resultMap type="CmcProject" id="CmcProjectResult">
         <result property="projectId"    column="project_id"    />
-        <result property="projectName"    column="project_name"    />
         <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
         <result property="projectLeader"    column="project_leader"    />
         <result property="isFinished"    column="is_finished"    />
+        <result property="projectSource"    column="project_source"    />
+        <result property="partyA"    column="party_a"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="projectLevel"    column="project_level"    />
+        <result property="projectRegistrant"    column="project_registrant"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_name, project_number, project_leader, is_finished from cmc_project
+        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, project_type, project_level, project_registrant, create_time from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
-        <where>  
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+        <where>
             <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
-            <if test="projectLeader != null  and projectLeader != ''"> and project_laeder like concat('%', #{projectLeader}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null "> and project_leader = #{projectLeader}</if>
             <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
+            <if test="projectSource != null  and projectSource != ''"> and project_source = #{projectSource}</if>
+            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
+            <if test="projectRegistrant != null "> and project_registrant = #{projectRegistrant}</if>
         </where>
     </select>
-    
+
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where project_id = #{projectId}
     </select>
-        
+
     <insert id="insertCmcProject" parameterType="CmcProject">
         insert into cmc_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
-            <if test="projectName != null">project_name,</if>
             <if test="projectNumber != null">project_number,</if>
+            <if test="projectName != null">project_name,</if>
             <if test="projectLeader != null">project_leader,</if>
             <if test="isFinished != null">is_finished,</if>
-         </trim>
+            <if test="projectSource != null">project_source,</if>
+            <if test="partyA != null">party_a,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="telephone != null">telephone,</if>
+            <if test="projectType != null">project_type,</if>
+            <if test="projectLevel != null">project_level,</if>
+            <if test="projectRegistrant != null">project_registrant,</if>
+            <if test="createTime != null">create_time,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
-            <if test="projectName != null">#{projectName},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectName != null">#{projectName},</if>
             <if test="projectLeader != null">#{projectLeader},</if>
             <if test="isFinished != null">#{isFinished},</if>
-         </trim>
+            <if test="projectSource != null">#{projectSource},</if>
+            <if test="partyA != null">#{partyA},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="telephone != null">#{telephone},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="projectLevel != null">#{projectLevel},</if>
+            <if test="projectRegistrant != null">#{projectRegistrant},</if>
+            <if test="createTime != null">#{createTime},</if>
+        </trim>
     </insert>
 
     <update id="updateCmcProject" parameterType="CmcProject">
         update cmc_project
         <trim prefix="SET" suffixOverrides=",">
-            <if test="projectName != null">project_name = #{projectName},</if>
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
             <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="isFinished != null">is_finished = #{isFinished},</if>
+            <if test="projectSource != null">project_source = #{projectSource},</if>
+            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="projectLevel != null">project_level = #{projectLevel},</if>
+            <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where project_id = #{projectId}
     </update>
@@ -65,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcProjectByProjectIds" parameterType="String">
-        delete from cmc_project where project_id in 
+        delete from cmc_project where project_id in
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
             #{projectId}
         </foreach>

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

@@ -0,0 +1,78 @@
+<?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.CmcProjectWorkMapper">
+    
+    <resultMap type="CmcProjectWork" id="CmcProjectWorkResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="workContent"    column="work_content"    />
+        <result property="scaleGrade"    column="scale_grade"    />
+        <result property="unit"    column="unit"    />
+        <result property="workLoad"    column="work_load"    />
+        <result property="finishTime"    column="finish_time"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectWorkVo">
+        select project_id, work_content, scale_grade, unit, work_load, finish_time from cmc_project_work
+    </sql>
+
+    <select id="selectCmcProjectWorkList" parameterType="CmcProjectWork" resultMap="CmcProjectWorkResult">
+        <include refid="selectCmcProjectWorkVo"/>
+        <where>  
+            <if test="workContent != null  and workContent != ''"> and work_content like concat('%', #{workContent}, '%')</if>
+            <if test="scaleGrade != null  and scaleGrade != ''"> and scale_grade like concat('%', #{scaleGrade}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
+            <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProjectWorkByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">
+        <include refid="selectCmcProjectWorkVo"/>
+        where project_id = #{projectId}
+    </select>
+        
+    <insert id="insertCmcProjectWork" parameterType="CmcProjectWork">
+        insert into cmc_project_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="workContent != null">work_content,</if>
+            <if test="scaleGrade != null">scale_grade,</if>
+            <if test="unit != null">unit,</if>
+            <if test="workLoad != null">work_load,</if>
+            <if test="finishTime != null">finish_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="workContent != null">#{workContent},</if>
+            <if test="scaleGrade != null">#{scaleGrade},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="workLoad != null">#{workLoad},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectWork" parameterType="CmcProjectWork">
+        update cmc_project_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workContent != null">work_content = #{workContent},</if>
+            <if test="scaleGrade != null">scale_grade = #{scaleGrade},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="workLoad != null">work_load = #{workLoad},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+        </trim>
+        where project_id = #{projectId}
+    </update>
+
+    <delete id="deleteCmcProjectWorkByProjectId" parameterType="String">
+        delete from cmc_project_work where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcProjectWorkByProjectIds" parameterType="String">
+        delete from cmc_project_work where project_id in 
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/ry_20231130.sql

@@ -1258,7 +1258,7 @@ create table cmc_assess_content (
 drop table if exists cmc_assess_content_work;
 create table cmc_assess_content_work (
   work_id				char(23)		not null		comment '工作内容id(考核内容id+2位)',
-  work_load				varchar(255)	default null	comment '工作量',
+  work_load				varchar(10)	default null	comment '工作量',
   primary key (work_id)
 ) engine=innodb	comment = 'cmc考核工作内容表';
 
@@ -1268,78 +1268,103 @@ create table cmc_assess_content_work (
 -- ----------------------------
 drop table if exists cmc_project;
 create table cmc_project  (
-  project_id		char(19)				not null			comment '项目id',
-  project_number	varchar(10)				default null		comment '项目编号',
-  project_name		varchar(255)			default null		comment '项目名称',
-  project_leader	bigint					default null		comment '项目负责人',
-  is_finished		char(1)					default null		comment '项目状态',
+  project_id			char(19)				not null			comment '项目id',
+  project_number		varchar(10)				default null		comment '项目编号',
+  project_name			varchar(50)				default null		comment '项目名称',
+  project_leader		bigint					default null		comment '项目负责人',
+  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		char(10)				default null		comment '联系人',
+  telephone				char(11)				default null		comment '联系电话',
+  project_type			char(20)				default null		comment '项目类型',
+  project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
+  project_registrant	bigint					default null		comment '项目登记人',
+  create_time			datetime				default null		comment '项目登记时间',
   primary key (project_id)
 ) engine = innodb comment = 'cmc项目表';
 
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0');
-insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null, '0');
-insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0');
-insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null, '0');
-insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0');
-insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null, '0');
-insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0');
-insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null, '0');
-insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0');
-insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null, '0');
-insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0');
-insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null, '0');
-insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0');
-insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null, '0');
-insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0');
-insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null, '0');
-insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0');
-insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null, '0');
-insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0');
-insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null, '0');
-insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0');
-insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', null, '0');
-insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0');
-insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0');
-insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null, '0');
-insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0');
-insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null, '0');
-insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0');
-insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null, '0');
-insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0');
-insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null, '0');
-insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0');
-insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null, '1');
-insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1');
-insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null, '0');
-insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0');
-insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1');
-insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null, '1');
-insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null, '0');
-insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0');
-insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null, '0');
-insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1');
-insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null, '0');
-insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0');
-insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null, '0');
-insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0');
-insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null, '0');
-insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0');
-insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null, '0');
-insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0');
-insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', null, '0');
-insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0');
+insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null, '1', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null, '1', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', null, '0', null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0', null, null, null, null, null, null, null, null);
 
+-- ----------------------------
+-- 24、cmc项目内容表
+-- ----------------------------
+drop table if exists `cmc_project_work`;
+create table `cmc_project_work`  (
+  `project_id`		char(19)		not null		comment '项目id',
+  `work_content`	varchar(255)	default null	comment '工作内容',
+  `scale_grade`		varchar(10)		default null	comment '等级或比例尺',
+  `unit`			varchar(10)		default null	comment '单位',
+  `work_load`		varchar(10)		default null	comment '工作量',
+  `finish_time`		datetime		default null	comment '要求完成时间',
+  primary key (`project_id`)
+) engine = innodb comment = 'cmc项目内容表';
+
+-- ----------------------------
+-- 初始化-项目内容表
+-- ----------------------------
 
 -- ----------------------------
+-- 25、cmc车辆信息表
 -- ----------------------------
 drop table if exists `cmc_car`;
 create table `cmc_car`  (
@@ -1354,7 +1379,7 @@ create table `cmc_car`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 26、cmc用车审批表
 -- ----------------------------
 drop table if exists `cmc_car_approval`;
 create table `cmc_car_approval`  (
@@ -1386,7 +1411,7 @@ create table `cmc_car_approval`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 27、cmc用户历史表
 -- ----------------------------
 drop table if exists `cmc_user_history`;
 create table `cmc_user_history`  (

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-30 17:22:10
+ * @LastEditTime: 2024-02-28 16:53:30
  */
 import request from '@/utils/request'
 
@@ -32,6 +32,15 @@ export function addProject(data) {
   })
 }
 
+// 提交cmc考核
+export function submitProject(data) {
+  return request({
+    url: '/oa/project/submit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改cmc项目
 export function updateProject(data) {
   return request({
@@ -41,6 +50,15 @@ export function updateProject(data) {
   })
 }
 
+// 修改cmc项目
+export function modifyProject(data) {
+  return request({
+    url: '/oa/project/modify',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除cmc项目
 export function delProject(projectId) {
   return request({