新增、修改、删除项目

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

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcProjectWork;
@@ -47,13 +48,21 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> orilist = cmcProjectService.selectCmcProjectList(cmcProject);
         List<CmcProject> list = new ArrayList<>();
-        for (CmcProject project : orilist) {
-            if (project.getProjectLeader() != null && !project.getProjectLeader().equals(""))
-                project.setProjectLeader(userService.selectUserById(Long.parseLong(project.getProjectLeader())).getNickName());
-            list.add(project);
+        if (cmcProject.getProjectLeaderName() != null && !cmcProject.getProjectLeaderName().equals("")) {
+            SysUser user = new SysUser();
+            user.setNickName(cmcProject.getProjectLeaderName());
+            List<SysUser> userList = userService.selectUserList(user);
+            if (userList.size() > 0)
+                for (SysUser sysUser : userList) {
+                    cmcProject.setProjectLeader(sysUser.getUserId().toString());
+                    list.addAll(cmcProjectService.selectCmcProjectList(cmcProject));
+                }
+            else
+                list = cmcProjectService.selectCmcProjectList(cmcProject);
         }
+        else
+            list = cmcProjectService.selectCmcProjectList(cmcProject);
         return getDataTable(list);
     }
 
@@ -75,10 +84,7 @@ public class CmcProjectController extends BaseController
     @GetMapping(value = "/{projectId}")
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
-        CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
-        if (cmcProject.getProjectLeader() != null && !cmcProject.getProjectLeader().equals(""))
-            cmcProject.setProjectLeader(userService.selectUserById(Long.parseLong(cmcProject.getProjectLeader())).getNickName());
-        return success(cmcProject);
+        return success(cmcProjectService.selectCmcProjectByProjectId(projectId));
     }
 
     /**
@@ -114,6 +120,8 @@ public class CmcProjectController extends BaseController
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
         cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
+        cmcProject.setIsFinished("0");
+        cmcProject.setRemark(formDataJson.getString("remark"));
         String workList = formDataJson.getString("workList");
         workList = workList.substring(1, workList.length() - 1);
         if (workList.split("}").length > 1) {
@@ -123,24 +131,28 @@ public class CmcProjectController extends BaseController
                     workArri = workArri.substring(1);
                 JSONObject workArrObject = JSONObject.parse(workArri);
                 CmcProjectWork cmcProjectWork = new CmcProjectWork();
+                cmcProjectWork.setWorkId(new SnowFlake().generateId());
                 cmcProjectWork.setProjectId(cmcProject.getProjectId());
-                cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
-                cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+                cmcProjectWork.setContent(workArrObject.getString("content"));
+                cmcProjectWork.setScale(workArrObject.getString("scale"));
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
-                cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
-                cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+                cmcProjectWork.setWorkload(workArrObject.getString("workload"));
+                cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                cmcProjectWork.setRemark(workArrObject.getString("remark"));
                 cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
             }
         }
         else {
             JSONObject workArrObject = JSONObject.parse(workList);
             CmcProjectWork cmcProjectWork = new CmcProjectWork();
+            cmcProjectWork.setWorkId(new SnowFlake().generateId());
             cmcProjectWork.setProjectId(cmcProject.getProjectId());
-            cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
-            cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+            cmcProjectWork.setContent(workArrObject.getString("content"));
+            cmcProjectWork.setScale(workArrObject.getString("scale"));
             cmcProjectWork.setUnit(workArrObject.getString("unit"));
-            cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
-            cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
+            cmcProjectWork.setWorkload(workArrObject.getString("workload"));
+            cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+            cmcProjectWork.setRemark(workArrObject.getString("remark"));
             cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
         }
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
@@ -161,7 +173,7 @@ public class CmcProjectController extends BaseController
      */
     @Log(title = "cmc项目", businessType = BusinessType.UPDATE)
     @PutMapping( "/modify")
-    public AjaxResult modify(@RequestParam("taskForm") String formData)
+    public AjaxResult modify(@RequestParam("form") String formData)
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(formDataJson.getString("projectId"));
@@ -177,32 +189,42 @@ public class CmcProjectController extends BaseController
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
         cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
+        cmcProject.setIsFinished("0");
+        cmcProject.setRemark(formDataJson.getString("remark"));
         String workList = formDataJson.getString("workList");
         workList = workList.substring(1, workList.length() - 1);
         if (workList.split("}").length > 1) {
+            cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
             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 cmcProjectWork = new CmcProjectWork();
+                cmcProjectWork.setWorkId(new SnowFlake().generateId());
+                cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
+                cmcProjectWork.setContent(workArrObject.getString("content"));
+                cmcProjectWork.setScale(workArrObject.getString("scale"));
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
-                cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
-                cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
-                cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork);
+                cmcProjectWork.setWorkload(workArrObject.getString("workload"));
+                cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                cmcProjectWork.setRemark(workArrObject.getString("remark"));
+                cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
             }
         }
         else {
             JSONObject workArrObject = JSONObject.parse(workList);
-            CmcProjectWork cmcProjectWork = cmcProjectWorkService.selectCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
-            cmcProjectWork.setWorkContent(workArrObject.getString("workContent"));
-            cmcProjectWork.setScaleGrade(workArrObject.getString("scaleGrade"));
+            cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
+            CmcProjectWork cmcProjectWork = new CmcProjectWork();
+            cmcProjectWork.setWorkId(new SnowFlake().generateId());
+            cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
+            cmcProjectWork.setContent(workArrObject.getString("content"));
+            cmcProjectWork.setScale(workArrObject.getString("scale"));
             cmcProjectWork.setUnit(workArrObject.getString("unit"));
-            cmcProjectWork.setWorkLoad(workArrObject.getString("workLoad"));
-            cmcProjectWork.setFinishTime(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("finishTime")));
-            cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork);
+            cmcProjectWork.setWorkload(workArrObject.getString("workload"));
+            cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+            cmcProjectWork.setRemark(workArrObject.getString("remark"));
+            cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
         }
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
@@ -214,6 +236,7 @@ public class CmcProjectController extends BaseController
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
+        cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectIds);
         return toAjax(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
     }
 }

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

@@ -30,6 +30,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目负责人")
     private String projectLeader;
 
+    /** 项目负责人名字 */
+    @Excel(name = "项目负责人名字")
+    private String projectLeaderName;
+
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中、1=已结束")
     private String isFinished;
@@ -98,6 +102,15 @@ public class CmcProject extends BaseEntity
     {
         return projectLeader;
     }
+    public void setProjectLeaderName(String projectLeaderName)
+    {
+        this.projectLeaderName = projectLeaderName;
+    }
+
+    public String getProjectLeaderName()
+    {
+        return projectLeaderName;
+    }
     public void setIsFinished(String isFinished)
     {
         this.isFinished = isFinished;

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

@@ -17,16 +17,19 @@ public class CmcProjectWork extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 工作内容id */
+    private String workId;
+
     /** 项目id */
     private String projectId;
 
     /** 工作内容 */
     @Excel(name = "工作内容")
-    private String workContent;
+    private String content;
 
     /** 等级或比例尺 */
     @Excel(name = "等级或比例尺")
-    private String scaleGrade;
+    private String scale;
 
     /** 单位 */
     @Excel(name = "单位")
@@ -34,39 +37,48 @@ public class CmcProjectWork extends BaseEntity
 
     /** 工作量 */
     @Excel(name = "工作量")
-    private String workLoad;
+    private String workload;
 
     /** 要求完成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date finishTime;
+    private Date deadline;
+
+    public void setWorkId(String workId)
+    {
+        this.workId = workId;
+    }
 
-    public void setProjectId(String projectId) 
+    public String getWorkId()
+    {
+        return workId;
+    }
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public String getProjectId()
     {
         return projectId;
     }
-    public void setWorkContent(String workContent) 
+    public void setContent(String content) 
     {
-        this.workContent = workContent;
+        this.content = content;
     }
 
-    public String getWorkContent() 
+    public String getContent() 
     {
-        return workContent;
+        return content;
     }
-    public void setScaleGrade(String scaleGrade) 
+    public void setScale(String scale) 
     {
-        this.scaleGrade = scaleGrade;
+        this.scale = scale;
     }
 
-    public String getScaleGrade() 
+    public String getScale() 
     {
-        return scaleGrade;
+        return scale;
     }
     public void setUnit(String unit) 
     {
@@ -77,34 +89,34 @@ public class CmcProjectWork extends BaseEntity
     {
         return unit;
     }
-    public void setWorkLoad(String workLoad) 
+    public void setWorkload(String workload) 
     {
-        this.workLoad = workLoad;
+        this.workload = workload;
     }
 
-    public String getWorkLoad() 
+    public String getWorkload() 
     {
-        return workLoad;
+        return workload;
     }
-    public void setFinishTime(Date finishTime) 
+    public void setDeadline(Date deadline) 
     {
-        this.finishTime = finishTime;
+        this.deadline = deadline;
     }
 
-    public Date getFinishTime() 
+    public Date getDeadline() 
     {
-        return finishTime;
+        return deadline;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("projectId", getProjectId())
-            .append("workContent", getWorkContent())
-            .append("scaleGrade", getScaleGrade())
+            .append("content", getContent())
+            .append("scale", getScale())
             .append("unit", getUnit())
-            .append("workLoad", getWorkLoad())
-            .append("finishTime", getFinishTime())
+            .append("workload", getWorkload())
+            .append("deadline", getDeadline())
             .toString();
     }
 }

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

@@ -14,10 +14,10 @@ public interface CmcProjectWorkMapper
     /**
      * 查询cmc项目内容
      * 
-     * @param projectId cmc项目内容主键
-     * @return cmc项目内容
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
      */
-    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId);
+    public List<CmcProjectWork> selectCmcProjectWorkListByProjectId(String projectId);
 
     /**
      * 查询cmc项目内容列表
@@ -46,16 +46,16 @@ public interface CmcProjectWorkMapper
     /**
      * 删除cmc项目内容
      * 
-     * @param projectId cmc项目内容主键
+     * @param workId cmc项目内容主键
      * @return 结果
      */
-    public int deleteCmcProjectWorkByProjectId(String projectId);
+    public int deleteCmcProjectWorkByProjectId(String workId);
 
     /**
      * 批量删除cmc项目内容
      * 
-     * @param projectIds 需要删除的数据主键集合
+     * @param workIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProjectWorkByProjectIds(String[] projectIds);
+    public int deleteCmcProjectWorkByProjectIds(String[] workIds);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcProjectWorkService
     /**
      * 查询cmc项目内容
      * 
-     * @param projectId cmc项目内容主键
-     * @return cmc项目内容
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
      */
-    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId);
+    public List<CmcProjectWork> selectCmcProjectWorkListByProjectId(String projectId);
 
     /**
      * 查询cmc项目内容列表

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

@@ -22,13 +22,13 @@ public class CmcProjectWorkServiceImpl implements ICmcProjectWorkService
     /**
      * 查询cmc项目内容
      * 
-     * @param projectId cmc项目内容主键
-     * @return cmc项目内容
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
      */
     @Override
-    public CmcProjectWork selectCmcProjectWorkByProjectId(String projectId)
+    public List<CmcProjectWork> selectCmcProjectWorkListByProjectId(String projectId)
     {
-        return cmcProjectWorkMapper.selectCmcProjectWorkByProjectId(projectId);
+        return cmcProjectWorkMapper.selectCmcProjectWorkListByProjectId(projectId);
     }
 
     /**
@@ -70,13 +70,13 @@ public class CmcProjectWorkServiceImpl implements ICmcProjectWorkService
     /**
      * 批量删除cmc项目内容
      * 
-     * @param projectIds 需要删除的cmc项目内容主键
+     * @param workIds 需要删除的cmc项目内容主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectWorkByProjectIds(String[] projectIds)
+    public int deleteCmcProjectWorkByProjectIds(String[] workIds)
     {
-        return cmcProjectWorkMapper.deleteCmcProjectWorkByProjectIds(projectIds);
+        return cmcProjectWorkMapper.deleteCmcProjectWorkByProjectIds(workIds);
     }
 
     /**

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

@@ -5,31 +5,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.oa.mapper.CmcProjectWorkMapper">
     
     <resultMap type="CmcProjectWork" id="CmcProjectWorkResult">
+        <result property="workId"    column="work_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="workContent"    column="work_content"    />
-        <result property="scaleGrade"    column="scale_grade"    />
+        <result property="content"    column="content"    />
+        <result property="scale"    column="scale"    />
         <result property="unit"    column="unit"    />
-        <result property="workLoad"    column="work_load"    />
-        <result property="finishTime"    column="finish_time"    />
+        <result property="workload"    column="workload"    />
+        <result property="deadline"    column="deadline"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcProjectWorkVo">
-        select project_id, work_content, scale_grade, unit, work_load, finish_time, remark from cmc_project_work
+        select work_id, project_id, content, scale, unit, workload, deadline, remark 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="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
+            <if test="scale != null  and scale != ''"> and scale like concat('%', #{scale}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
-            <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
+            <if test="deadline != null "> and deadline like concat('%', #{deadline}, '%')</if>
         </where>
     </select>
     
-    <select id="selectCmcProjectWorkByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">
+    <select id="selectCmcProjectWorkListByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">
         <include refid="selectCmcProjectWorkVo"/>
         where project_id = #{projectId}
     </select>
@@ -37,21 +38,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcProjectWork" parameterType="CmcProjectWork">
         insert into cmc_project_work
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
             <if test="projectId != null">project_id,</if>
-            <if test="workContent != null">work_content,</if>
-            <if test="scaleGrade != null">scale_grade,</if>
+            <if test="content != null">content,</if>
+            <if test="scale != null">scale,</if>
             <if test="unit != null">unit,</if>
-            <if test="workLoad != null">work_load,</if>
-            <if test="finishTime != null">finish_time,</if>
+            <if test="workload != null">workload,</if>
+            <if test="deadline != null">deadline,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
             <if test="projectId != null">#{projectId},</if>
-            <if test="workContent != null">#{workContent},</if>
-            <if test="scaleGrade != null">#{scaleGrade},</if>
+            <if test="content != null">#{content},</if>
+            <if test="scale != null">#{scale},</if>
             <if test="unit != null">#{unit},</if>
-            <if test="workLoad != null">#{workLoad},</if>
-            <if test="finishTime != null">#{finishTime},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="deadline != null">#{deadline},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -59,14 +62,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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="projectId != null">project_id = #{projectId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="scale != null">scale = #{scale},</if>
             <if test="unit != null">unit = #{unit},</if>
-            <if test="workLoad != null">work_load = #{workLoad},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="deadline != null">deadline = #{deadline},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
-        where project_id = #{projectId}
+        where work_id = #{workId}
     </update>
 
     <delete id="deleteCmcProjectWorkByProjectId" parameterType="String">
@@ -74,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcProjectWorkByProjectIds" parameterType="String">
-        delete from cmc_project_work where project_id in 
+        delete from cmc_project_work where project_id in
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
             #{projectId}
         </foreach>

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

@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>

oa-back/sql/ry_20231130.sql

@@ -1226,7 +1226,7 @@ create table cmc_assess (
   manager_assessment	char(1)			default null	comment '分管考核等级（不合格、合格、良好、优秀）',
   manager_advice		varchar(255)	default null	comment '分管考核意见',
   manager_time			datetime		default null	comment '分管考核时间',
-  manager_assesser		varchar(30)		default null	comment '分管考核负责人',
+  manager_assesser		varchar(10)		default null	comment '分管考核负责人',
   self_assess			varchar(255)	default null	comment '自述',
   fill_time				datetime		default null	comment '考核填报时间',
   other_work			varchar(255)	default null	comment '其他工作',
@@ -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(10)	default null	comment '工作量',
+  work_load				varchar(10)		default null	comment '工作量',
   primary key (work_id)
 ) engine=innodb	comment = 'cmc考核工作内容表';
 
@@ -1271,15 +1271,15 @@ create table cmc_project  (
   project_id			char(19)				not null			comment '项目id',
   project_number		varchar(10)				default null		comment '项目编号',
   project_name			varchar(50)				default null		comment '项目名称',
-  project_leader		char(3)					default null		comment '项目负责人',
+  project_leader		varchar(3)				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 '联系人',
+  contact_person		varchar(10)				default null		comment '联系人',
   telephone				char(11)				default null		comment '联系电话',
-  project_type			char(20)				default null		comment '项目类型',
+  project_type			varchar(20)				default null		comment '项目类型',
   project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
-  project_registrant	char(3)					default null		comment '项目登记人',
+  project_registrant	varchar(3)				default null		comment '项目登记人',
   create_time			datetime				default null		comment '项目登记时间',
   remark				varchar(255)				default null		comment '项目备注',
   primary key (project_id)
@@ -1351,14 +1351,15 @@ insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平
 -- ----------------------------
 drop table if exists `cmc_project_work`;
 create table `cmc_project_work`  (
+  `work_id`			char(19)		not null		comment '工作内容id',
   `project_id`		char(19)		not null		comment '项目id',
-  `work_content`	varchar(255)	default null	comment '工作内容',
-  `scale_grade`		varchar(10)		default null	comment '等级或比例尺',
+  `content`			varchar(255)	default null	comment '工作内容',
+  `scale`			varchar(10)		default null	comment '等级或比例尺',
   `unit`			varchar(10)		default null	comment '单位',
-  `work_load`		varchar(10)		default null	comment '工作量',
-  `finish_time`		datetime		default null	comment '要求完成时间',
+  `workload`		varchar(10)		default null	comment '工作量',
+  `deadline`		datetime		default null	comment '要求完成时间',
   `remark`			varchar(255)		default null	comment '工作内容备注',
-  primary key (`project_id`)
+  primary key (`work_id`)
 ) engine = innodb comment = 'cmc项目内容表';
 
 -- ----------------------------
@@ -1371,7 +1372,7 @@ create table `cmc_project_work`  (
 drop table if exists `cmc_car`;
 create table `cmc_car`  (
   `car_id`			int			not null auto_increment		comment '车辆id',
-  `license_plate`	char(8)		default null				comment '车牌号',
+  `license_plate`	varchar(8)	default null				comment '车牌号',
   `driver`			bigint		default null				comment '驾驶员（常用）',
   primary key (`car_id`)
 ) engine = innodb comment = 'cmc车辆信息表';

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-29 11:09:14
+ * @LastEditTime: 2024-02-29 16:59:28
 -->
 <template>
   <div class="project-wrapper">
@@ -13,8 +13,8 @@
           <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="项目负责人" prop="projectLeader">
-          <el-input v-model="queryParams.projectLeader" placeholder="请输入项目负责人" clearable
+        <el-form-item label="项目负责人" prop="projectLeaderName">
+          <el-input v-model="queryParams.projectLeaderName" placeholder="请输入项目负责人" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
@@ -80,7 +80,7 @@
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
-        <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeader" />
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderName" />
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -139,7 +139,7 @@
             </tr>
             <tr v-for="(work, index) in workList" :key="index">
               <td>
-                <el-input v-model="work.name" type="textarea" autosize clearable></el-input>
+                <el-input v-model="work.content" type="textarea" autosize clearable></el-input>
               </td>
               <td>
                 <el-input v-model="work.scale" clearable></el-input>
@@ -213,9 +213,9 @@
 </template>
 
 <script>
-import { listProject } from "@/api/oa/project/project";
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
-import { listUser } from '@/api/system/user'
+import { listUser, getUser } from '@/api/system/user'
 export default {
   data() {
     return {
@@ -247,7 +247,7 @@ export default {
         userList: []
       },
       workList: [{
-        name: '',
+        content: '',
         scale: '',
         unit: '',
         workload: '',
@@ -265,7 +265,15 @@ export default {
     getList() {
       this.loading = true
       listProject(this.queryParams).then(response => {
-        this.projectList = response.rows;
+        this.projectList = [];
+        for (let p of response.rows) {
+          if (p.projectLeader != null) {
+            getUser(Number(p.projectLeader)).then(res => {
+              p.projectLeaderName = res.data.nickName;
+            })
+          }
+          this.projectList.push(p);
+        }
         this.total = response.total;
         this.loading = false;
       })
@@ -293,11 +301,33 @@ export default {
       this.addOpen = true;
     },
     handleDelete(row) {
-
+      const projectIds = row.projectId || this.ids;
+      const projectNumbers = row.projectNumber || this.ids;
+      this.$modal.confirm('是否确认删除项目编号为"' + projectNumbers + '"的数据项？').then(function () {
+        return delProject(projectIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     confirmAddForm() {
-      this.addForm.workList = this.workList
-      console.log(this.addForm);
+      this.addForm.workList = this.workList;
+      let formData = new FormData();
+      let form = JSON.stringify(this.addForm);
+      formData.append("form", form);
+      console.log(this.title);
+      if (this.title == '新增项目')
+        submitProject(formData).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.addOpen = false;
+          this.getList();
+        });
+      else
+        modifyProject(formData).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.addOpen = false;
+            this.getList();
+          });
     },
     // 人员选择
     choosePeople() {
@@ -336,7 +366,7 @@ export default {
     },
     addWorkList() {
       this.workList.push({
-        name: '',
+        content: '',
         scale: '',
         unit: '',
         workload: '',