anderx пре 1 година
родитељ
комит
3f6ff989a5

+ 1 - 1
pom.xml

@@ -187,7 +187,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+<!--                <version>3.1</version>-->
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

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

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

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

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