项目负责人查询工作填报列表

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

@@ -28,6 +28,7 @@ public class CmcDeclare extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
+    private Long projectLeader;
 
     /** 用户id */
     @Excel(name = "填报人")
@@ -98,6 +99,15 @@ public class CmcDeclare extends BaseEntity
     {
         return projectId;
     }
+    public void setProjectLeader(Long projectLeader)
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public Long getProjectLeader()
+    {
+        return projectLeader;
+    }
     public void setProject(CmcProject project)
     {
         this.project = project;

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeclare" id="CmcDeclareResult">
         <result property="formId"    column="form_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectLeader"    column="project_leader"    />
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="workType"    column="work_type"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeclareVo">
-        select d.form_id, d.project_id, p.project_number, p.project_name, d.user_id, u.dept_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
+        select d.form_id, d.project_id, p.project_number, p.project_name, p.project_leader, d.user_id, u.dept_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
         left join sys_user as u on u.user_id = d.user_id
         left join cmc_project as p on p.project_id = d.project_id
     </sql>
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcDeclareVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
+            <if test="projectLeader != null"> and d.project_leader = #{projectLeader}</if>
             <if test="userId != null"> and d.user_id = #{userId}</if>
             <if test="deptId != null"> and u.dept_id = #{deptId}</if>
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>