Browse Source

项目列表修改

anderx 1 year ago
parent
commit
17249acaa5

+ 17 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectListInput.java

@@ -9,7 +9,9 @@ public class ProjectListInput extends BaseEntity {
     private String endTime;
     private Long rolesId,companyId;
     private Long headId;
+    private Long headName;
     private Long staffId;
+    private Long staffName;
     private String projectNumber;
     private String projectYear;
     private Integer crossYear;
@@ -26,6 +28,21 @@ public class ProjectListInput extends BaseEntity {
      */
     private Integer roleType;
 
+    public Long getHeadName() {
+        return headName;
+    }
+
+    public void setHeadName(Long headName) {
+        this.headName = headName;
+    }
+
+    public Long getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(Long staffName) {
+        this.staffName = staffName;
+    }
 
     public Integer getDeptId() {
         return deptId;

+ 5 - 2
ruoyi-system/src/main/resources/mapper/project/ProjectTaskMapper.xml

@@ -270,8 +270,11 @@
     <if test="headId !=null">
       and a.aid= #{headId}
     </if>
-    <if test="staffId !=null">
-      and a.id in (select pid from project_staff where aid= #{staffId})
+    <if test="headName !=null">
+      and a.admin_name like concat('%',#{headname},'%')
+    </if>
+    <if test="staffName !=null">
+      and a.staff_name  like concat('%',#{staffName},'%')
     </if>
       <if test="createAid !=null">
         and a.create_aid= #{createAid}