新增项目信息表

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

@@ -1,104 +0,0 @@
-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.CmcAssessContent;
-import com.ruoyi.oa.service.ICmcAssessContentService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 考核内容Controller
- * 
- * @author cmc
- * @date 2024-01-09
- */
-@RestController
-@RequestMapping("/oa/assessContent")
-public class CmcAssessContentController extends BaseController
-{
-    @Autowired
-    private ICmcAssessContentService cmcAssessContentService;
-
-    /**
-     * 查询考核内容列表
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CmcAssessContent cmcAssessContent)
-    {
-        startPage();
-        List<CmcAssessContent> list = cmcAssessContentService.selectCmcAssessContentList(cmcAssessContent);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出考核内容列表
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:export')")
-    @Log(title = "考核内容", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcAssessContent cmcAssessContent)
-    {
-        List<CmcAssessContent> list = cmcAssessContentService.selectCmcAssessContentList(cmcAssessContent);
-        ExcelUtil<CmcAssessContent> util = new ExcelUtil<CmcAssessContent>(CmcAssessContent.class);
-        util.exportExcel(response, list, "考核内容数据");
-    }
-
-    /**
-     * 获取考核内容详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:query')")
-    @GetMapping(value = "/{contentId}")
-    public AjaxResult getInfo(@PathVariable("contentId") String contentId)
-    {
-        return success(cmcAssessContentService.selectCmcAssessContentByContentId(contentId));
-    }
-
-    /**
-     * 新增考核内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:add')")
-    @Log(title = "考核内容", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CmcAssessContent cmcAssessContent)
-    {
-        return toAjax(cmcAssessContentService.insertCmcAssessContent(cmcAssessContent));
-    }
-
-    /**
-     * 修改考核内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:edit')")
-    @Log(title = "考核内容", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CmcAssessContent cmcAssessContent)
-    {
-        return toAjax(cmcAssessContentService.updateCmcAssessContent(cmcAssessContent));
-    }
-
-    /**
-     * 删除考核内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContent:remove')")
-    @Log(title = "考核内容", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{contentIds}")
-    public AjaxResult remove(@PathVariable String[] contentIds)
-    {
-        return toAjax(cmcAssessContentService.deleteCmcAssessContentByContentIds(contentIds));
-    }
-}

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

@@ -1,104 +0,0 @@
-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.CmcAssessContentWork;
-import com.ruoyi.oa.service.ICmcAssessContentWorkService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 考核工作内容Controller
- * 
- * @author cmc
- * @date 2024-01-09
- */
-@RestController
-@RequestMapping("/oa/assessContentWork")
-public class CmcAssessContentWorkController extends BaseController
-{
-    @Autowired
-    private ICmcAssessContentWorkService cmcAssessContentWorkService;
-
-    /**
-     * 查询考核工作内容列表
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CmcAssessContentWork cmcAssessContentWork)
-    {
-        startPage();
-        List<CmcAssessContentWork> list = cmcAssessContentWorkService.selectCmcAssessContentWorkList(cmcAssessContentWork);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出考核工作内容列表
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:export')")
-    @Log(title = "考核工作内容", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcAssessContentWork cmcAssessContentWork)
-    {
-        List<CmcAssessContentWork> list = cmcAssessContentWorkService.selectCmcAssessContentWorkList(cmcAssessContentWork);
-        ExcelUtil<CmcAssessContentWork> util = new ExcelUtil<CmcAssessContentWork>(CmcAssessContentWork.class);
-        util.exportExcel(response, list, "考核工作内容数据");
-    }
-
-    /**
-     * 获取考核工作内容详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:query')")
-    @GetMapping(value = "/{workId}")
-    public AjaxResult getInfo(@PathVariable("workId") String workId)
-    {
-        return success(cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(workId));
-    }
-
-    /**
-     * 新增考核工作内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:add')")
-    @Log(title = "考核工作内容", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CmcAssessContentWork cmcAssessContentWork)
-    {
-        return toAjax(cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork));
-    }
-
-    /**
-     * 修改考核工作内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:edit')")
-    @Log(title = "考核工作内容", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CmcAssessContentWork cmcAssessContentWork)
-    {
-        return toAjax(cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWork));
-    }
-
-    /**
-     * 删除考核工作内容
-     */
-    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:remove')")
-    @Log(title = "考核工作内容", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{workIds}")
-    public AjaxResult remove(@PathVariable String[] workIds)
-    {
-        return toAjax(cmcAssessContentWorkService.deleteCmcAssessContentWorkByWorkIds(workIds));
-    }
-}

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

@@ -13,7 +13,6 @@ import com.ruoyi.oa.service.ICmcAssessContentService;
 import com.ruoyi.oa.service.ICmcAssessContentWorkService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -49,7 +48,6 @@ public class CmcAssessController extends BaseController
     /**
      * 查询考核表列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcAssess cmcAssess)
     {
@@ -61,7 +59,6 @@ public class CmcAssessController extends BaseController
     /**
      * 导出考核表列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:export')")
     @Log(title = "考核表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcAssess cmcAssess)
@@ -74,7 +71,6 @@ public class CmcAssessController extends BaseController
     /**
      * 获取考核表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:query')")
     @GetMapping(value = "/{assessId}")
     public AjaxResult getInfo(@PathVariable("assessId") String assessId)
     {
@@ -122,7 +118,6 @@ public class CmcAssessController extends BaseController
     /**
      * 新增考核表
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:add')")
     @Log(title = "考核表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcAssess cmcAssess)
@@ -191,7 +186,6 @@ public class CmcAssessController extends BaseController
     /**
      * 修改考核表
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:edit')")
     @Log(title = "考核表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcAssess cmcAssess)
@@ -283,7 +277,6 @@ public class CmcAssessController extends BaseController
     /**
      * 删除考核表
      */
-    @PreAuthorize("@ss.hasPermi('oa:assess:remove')")
     @Log(title = "考核表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{assessIds}")
     public AjaxResult remove(@PathVariable String[] assessIds)

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

@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
+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.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目Controller
+ * 
+ * @author cmc
+ * @date 2024-01-30
+ */
+@RestController
+@RequestMapping("/oa/project")
+public class CmcProjectController extends BaseController
+{
+    @Autowired
+    private ICmcProjectService cmcProjectService;
+
+    /**
+     * 查询cmc项目列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProject cmcProject)
+    {
+        startPage();
+        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目列表
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProject cmcProject)
+    {
+        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
+        util.exportExcel(response, list, "cmc项目数据");
+    }
+
+    /**
+     * 获取cmc项目详细信息
+     */
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
+    {
+        return success(cmcProjectService.selectCmcProjectByProjectId(projectId));
+    }
+
+    /**
+     * 新增cmc项目
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProject cmcProject)
+    {
+        cmcProject.setProjectId(new SnowFlake().generateId());
+        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
+    }
+
+    /**
+     * 修改cmc项目
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProject cmcProject)
+    {
+        return toAjax(cmcProjectService.updateCmcProject(cmcProject));
+    }
+
+    /**
+     * 删除cmc项目
+     */
+    @Log(title = "cmc项目", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
+    {
+        return toAjax(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.ruoyi.oa.domain;
+
+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
+ * 
+ * @author cmc
+ * @date 2024-01-30
+ */
+public class CmcProject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setProjectNumber(String projectNumber) 
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber() 
+    {
+        return projectNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("projectId", getProjectId())
+            .append("projectName", getProjectName())
+            .append("projectNumber", getProjectNumber())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProject;
+
+/**
+ * cmc项目Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-01-30
+ */
+public interface CmcProjectMapper 
+{
+    /**
+     * 查询cmc项目
+     * 
+     * @param projectId cmc项目主键
+     * @return cmc项目
+     */
+    public CmcProject selectCmcProjectByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目列表
+     * 
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
+
+    /**
+     * 新增cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    public int insertCmcProject(CmcProject cmcProject);
+
+    /**
+     * 修改cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    public int updateCmcProject(CmcProject cmcProject);
+
+    /**
+     * 删除cmc项目
+     * 
+     * @param projectId cmc项目主键
+     * @return 结果
+     */
+    public int deleteCmcProjectByProjectId(String projectId);
+
+    /**
+     * 批量删除cmc项目
+     * 
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectByProjectIds(String[] projectIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProject;
+
+/**
+ * cmc项目Service接口
+ * 
+ * @author cmc
+ * @date 2024-01-30
+ */
+public interface ICmcProjectService 
+{
+    /**
+     * 查询cmc项目
+     * 
+     * @param projectId cmc项目主键
+     * @return cmc项目
+     */
+    public CmcProject selectCmcProjectByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目列表
+     * 
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
+
+    /**
+     * 新增cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    public int insertCmcProject(CmcProject cmcProject);
+
+    /**
+     * 修改cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    public int updateCmcProject(CmcProject cmcProject);
+
+    /**
+     * 批量删除cmc项目
+     * 
+     * @param projectIds 需要删除的cmc项目主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc项目信息
+     * 
+     * @param projectId cmc项目主键
+     * @return 结果
+     */
+    public int deleteCmcProjectByProjectId(String projectId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.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.CmcProjectMapper;
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
+
+/**
+ * cmc项目Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-01-30
+ */
+@Service
+public class CmcProjectServiceImpl implements ICmcProjectService 
+{
+    @Autowired
+    private CmcProjectMapper cmcProjectMapper;
+
+    /**
+     * 查询cmc项目
+     * 
+     * @param projectId cmc项目主键
+     * @return cmc项目
+     */
+    @Override
+    public CmcProject selectCmcProjectByProjectId(String projectId)
+    {
+        return cmcProjectMapper.selectCmcProjectByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc项目列表
+     * 
+     * @param cmcProject cmc项目
+     * @return cmc项目
+     */
+    @Override
+    public List<CmcProject> selectCmcProjectList(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.selectCmcProjectList(cmcProject);
+    }
+
+    /**
+     * 新增cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProject(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.insertCmcProject(cmcProject);
+    }
+
+    /**
+     * 修改cmc项目
+     * 
+     * @param cmcProject cmc项目
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProject(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.updateCmcProject(cmcProject);
+    }
+
+    /**
+     * 批量删除cmc项目
+     * 
+     * @param projectIds 需要删除的cmc项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectByProjectIds(String[] projectIds)
+    {
+        return cmcProjectMapper.deleteCmcProjectByProjectIds(projectIds);
+    }
+
+    /**
+     * 删除cmc项目信息
+     * 
+     * @param projectId cmc项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectByProjectId(String projectId)
+    {
+        return cmcProjectMapper.deleteCmcProjectByProjectId(projectId);
+    }
+}

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

@@ -0,0 +1,63 @@
+<?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.CmcProjectMapper">
+    
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="projectNumber"    column="project_number"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectVo">
+        select project_id, project_name, project_number 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>
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="projectNumber != null">#{projectNumber},</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>
+        </trim>
+        where project_id = #{projectId}
+    </update>
+
+    <delete id="deleteCmcProjectByProjectId" parameterType="String">
+        delete from cmc_project where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcProjectByProjectIds" parameterType="String">
+        delete from cmc_project where project_id in 
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/ry_20231130.sql

@@ -1292,7 +1292,7 @@ create table cmc_assess (
   self_assess			varchar(255)	default null	comment '自述',
   fill_time				datetime		default null	comment '考核填报时间',
   other_work			varchar(255)	default null	comment '其他工作',
-  PRIMARY KEY (assess_id)
+  primary key (assess_id)
 ) engine=innodb	comment = 'cmc考核表';
 
 
@@ -1302,7 +1302,7 @@ create table cmc_assess (
 drop table if exists cmc_assess_content;
 create table cmc_assess_content (
   content_id			char(21)		not null		comment '考核内容id(总考核表id+2位)',
-  role					varchar(17)			default null	comment '承担角色',
+  role					varchar(17)		default null	comment '承担角色',
   familiar				char(1)			default null	comment '熟练程度（生疏、熟练、精通）',
   remark				varchar(255)	default null	comment '备注',
   workload				char(1)			default null	comment '工作量（较少、正常、较多）',
@@ -1310,7 +1310,7 @@ create table cmc_assess_content (
   quality				char(1)			default null	comment '产品质量（不合格、合格、良好、优秀）',
   assessment			char(1)			default null	comment '岗位表现（不合格、合格、良好、优秀）',
   advice				varchar(255)	default null	comment '考核建议',
-  PRIMARY KEY (content_id)
+  primary key (content_id)
 ) engine=innodb	comment = 'cmc考核内容表';
 
 
@@ -1321,5 +1321,76 @@ 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 '工作量',
-  PRIMARY KEY (work_id)
-) engine=innodb	comment = 'cmc考核工作内容表';
+  primary key (work_id)
+) engine=innodb	comment = 'cmc考核工作内容表';
+
+
+-- ----------------------------
+-- 23、cmc项目表
+-- ----------------------------
+drop table if exists `cmc_project`;
+create table `cmc_project`  (
+  `project_id` char(19)				not null			comment '项目id',
+  `project_name` varchar(255)		default null		comment '项目名称',
+  `project_number` varchar(10)		default null		comment '项目编号',
+  primary key (`project_id`) using btree
+) engine = innodb comment = 'cmc项目表';;
+
+-- ----------------------------
+-- 初始化-项目表数据
+-- ----------------------------
+insert into cmc_project values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量');
+insert into cmc_project values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作');
+insert into cmc_project values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量');
+insert into cmc_project values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘');
+insert into cmc_project values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘');
+insert into cmc_project values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目');
+insert into cmc_project values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作');
+insert into cmc_project values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘');
+insert into cmc_project values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目');
+insert into cmc_project values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作');
+insert into cmc_project values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作');
+insert into cmc_project values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量');
+insert into cmc_project values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘');
+insert into cmc_project values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘');
+insert into cmc_project values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘');
+insert into cmc_project values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘');
+insert into cmc_project values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘');
+insert into cmc_project values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量');
+insert into cmc_project values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量');
+insert into cmc_project values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本');
+insert into cmc_project values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘');
+insert into cmc_project values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘');
+insert into cmc_project values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换');
+insert into cmc_project values ('1679770747494465538', '2023C47', ' 绵竹抽水蓄能电站界桩测设工作');
+insert into cmc_project values ('1679772570787774466', '2023W24', '双流地形图测绘');
+insert into cmc_project values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘');
+insert into cmc_project values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘');
+insert into cmc_project values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘');
+insert into cmc_project values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘');
+insert into cmc_project values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量');
+insert into cmc_project values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘');
+insert into cmc_project values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作');
+insert into cmc_project values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量');
+insert into cmc_project values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘');
+insert into cmc_project values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量');
+insert into cmc_project values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘');
+insert into cmc_project values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘');
+insert into cmc_project values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘');
+insert into cmc_project values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘');
+insert into cmc_project values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘');
+insert into cmc_project values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作');
+insert into cmc_project values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作');
+insert into cmc_project values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘');
+insert into cmc_project values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘');
+insert into cmc_project values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘');
+insert into cmc_project values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）');
+insert into cmc_project values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目');
+insert into cmc_project values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘');
+insert into cmc_project values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘');
+insert into cmc_project values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘');
+insert into cmc_project values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量');
+insert into cmc_project values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图');
+insert into cmc_project values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘');
+insert into cmc_project values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘');
+insert into cmc_project values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）');

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

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-01-30 16:37:46
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-01-30 17:22:10
+ */
+import request from '@/utils/request'
+
+// 查询cmc项目列表
+export function listProject(query) {
+  return request({
+    url: '/oa/project/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目详细
+export function getProject(projectId) {
+  return request({
+    url: '/oa/project/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目
+export function addProject(data) {
+  return request({
+    url: '/oa/project',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目
+export function updateProject(data) {
+  return request({
+    url: '/oa/project',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目
+export function delProject(projectId) {
+  return request({
+    url: '/oa/project/' + projectId,
+    method: 'delete'
+  })
+}

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

@@ -2,14 +2,14 @@
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-30 10:43:19
+ * @LastEditTime: 2024-01-30 17:34:24
 -->
 <template>
   <div>
     <el-form ref="scform" :model="form">
       <el-form-item label="选择项目：">
         <el-select v-model="form.projectId" placeholder="请选择项目">
-          <el-option v-for="item in projectList" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectNumber + item.projectName" :value="item.projectId">
           </el-option>
         </el-select>
       </el-form-item>
@@ -106,6 +106,7 @@ import { MessageBox } from 'element-ui'
 import ScTable from './scTable.vue';
 import { Snowflake } from '@/utils/snowFlake.js'
 import { submitAssess } from '@/api/oa/assess/assess.js'
+import { listProject } from '@/api/oa/project/project.js'
 export default {
   dicts: ['cmc_skill'],
   components: { ScTable },
@@ -130,6 +131,9 @@ export default {
   },
   methods: {
     initForm() {
+      listProject({pageSize: 200}).then(res => {
+        this.projectList = res.rows;
+      })
       for (let i = 0; i < SCContent.length + 1; i++) {
         if (i.toString().length == 1) {
           this.$set(this.form, 'role' + '0' + i, []);