查询抄送人功能

java110-bean/src/main/java/com/java110/dto/workCopy/WorkCopyDto.java

@@ -23,6 +23,8 @@ public class WorkCopyDto extends PageDto implements Serializable {
 
     private String copyId;
     private String staffName;
+
+    private String staffNameLike;
     private String state;
     private String stateName;
     private String communityId;
@@ -125,4 +127,12 @@ public class WorkCopyDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workEvent/WorkEventDto.java

@@ -19,6 +19,7 @@ public class WorkEventDto extends PageDto implements Serializable {
     private String preStaffName;
     private String preStaffId;
     private String staffName;
+    private String staffNameName;
     private String remark;
     private String communityId;
     private String storeId;
@@ -147,4 +148,12 @@ public class WorkEventDto extends PageDto implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getStaffNameName() {
+        return staffNameName;
+    }
+
+    public void setStaffNameName(String staffNameName) {
+        this.staffNameName = staffNameName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workPoolFile/WorkPoolFileDto.java

@@ -19,6 +19,8 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     public static final String FILE_TYPE_JPG = "J"; //文件类型,S 工作单附件，J 任务图片 E 任务附件
     public static final String FILE_TYPE_END = "E"; //文件类型,S 工作单附件，J 任务图片 E 任务附件
 
+
+
     private String pathUrl;
     private String communityId;
     private String storeId;
@@ -27,6 +29,7 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     private String taskId;
     private String fileType;
 
+    private String staffName;
 
 
     private Date createTime;
@@ -106,4 +109,12 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     public void setFileType(String fileType) {
         this.fileType = fileType;
     }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java

@@ -30,6 +30,8 @@ public class WorkTaskDto extends PageDto implements Serializable {
     private String[] workIds;
     private String staffId;
 
+    private String staffNameLike;
+
 
     private Date createTime;
 
@@ -140,4 +142,12 @@ public class WorkTaskDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkCopyV1ServiceDaoImplMapper.xml

@@ -29,6 +29,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -105,6 +108,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>

java110-db/src/main/resources/mapper/oa/WorkEventV1ServiceDaoImplMapper.xml

@@ -37,6 +37,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
@@ -124,6 +127,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>

java110-db/src/main/resources/mapper/oa/WorkPoolFileV1ServiceDaoImplMapper.xml

@@ -19,8 +19,9 @@
     <select id="getWorkPoolFileInfo" parameterType="Map" resultType="Map">
         select t.path_url,t.path_url pathUrl,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
         communityId,t.store_id,t.store_id storeId,t.work_id,t.work_id workId,t.file_id,t.file_id fileId,t.task_id taskId,
-        t.file_type fileType
+        t.file_type fileType,wt.staff_name staffName
         from work_pool_file t
+        left join work_task wt on t.task_id = wt.task_id
         where 1 =1
         <if test="pathUrl !=null and pathUrl != ''">
             and t.path_url= #{pathUrl}

java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml

@@ -19,7 +19,8 @@
     <select id="getWorkTaskInfo" parameterType="Map" resultType="Map">
         select t.staff_name,t.staff_name staffName,t.start_time,t.start_time startTime,t.status_cd,t.status_cd
         statusCd,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.store_id,t.store_id
-        storeId,t.task_id,t.task_id taskId,t.work_id,t.work_id workId,t.staff_id,t.staff_id staffId,t.create_time createTime,
+        storeId,t.task_id,t.task_id taskId,t.work_id,t.work_id workId,t.staff_id,t.staff_id staffId,t.create_time
+        createTime,
         td.`name` stateName
         from work_task t
         left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
@@ -27,6 +28,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="startTime !=null and startTime != ''">
             and t.start_time= #{startTime}
         </if>
@@ -114,6 +118,9 @@
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
+        <if test="staffNameLike !=null and staffNameLike != ''">
+            and t.staff_name like concat('%', #{staffNameLike},'%')
+        </if>
         <if test="startTime !=null and startTime != ''">
             and t.start_time= #{startTime}
         </if>
@@ -149,7 +156,6 @@
         </if>
 
 
-
     </select>
 
 </mapper>