Explorar o código

查询抄送人功能

wuxw %!s(int64=2) %!d(string=hai) anos
pai
achega
d52f9c34b9

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

@@ -1,6 +1,7 @@
 package com.java110.dto.workEvent;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,15 +16,18 @@ import java.util.Date;
 public class WorkEventDto extends PageDto implements Serializable {
 
     private String eventId;
-private String preStaffName;
-private String preStaffId;
-private String staffName;
-private String remark;
-private String communityId;
-private String storeId;
-private String taskId;
-private String workId;
-private String staffId;
+    private String preStaffName;
+    private String preStaffId;
+    private String staffName;
+    private String remark;
+    private String communityId;
+    private String storeId;
+    private String taskId;
+    private String workId;
+    private String staffId;
+
+    private String startTime;
+    private String endTime;
 
 
     private Date createTime;
@@ -34,61 +38,80 @@ private String staffId;
     public String getEventId() {
         return eventId;
     }
-public void setEventId(String eventId) {
+
+    public void setEventId(String eventId) {
         this.eventId = eventId;
     }
-public String getPreStaffName() {
+
+    public String getPreStaffName() {
         return preStaffName;
     }
-public void setPreStaffName(String preStaffName) {
+
+    public void setPreStaffName(String preStaffName) {
         this.preStaffName = preStaffName;
     }
-public String getPreStaffId() {
+
+    public String getPreStaffId() {
         return preStaffId;
     }
-public void setPreStaffId(String preStaffId) {
+
+    public void setPreStaffId(String preStaffId) {
         this.preStaffId = preStaffId;
     }
-public String getStaffName() {
+
+    public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-public String getWorkId() {
+
+    public String getWorkId() {
         return workId;
     }
-public void setWorkId(String workId) {
+
+    public void setWorkId(String workId) {
         this.workId = workId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
@@ -108,4 +131,20 @@ public void setStaffId(String staffId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

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

@@ -21,8 +21,9 @@
         preStaffName,t.pre_staff_id,t.pre_staff_id preStaffId,t.staff_name,t.staff_name
         staffName,t.remark,t.status_cd,t.status_cd statusCd,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
+        workId,t.staff_id,t.staff_id staffId,t.create_time createTime,wt.start_time startTime,wt.end_time endTime
         from work_event t
+        left join work_task wt on t.task_id = wt.task_id
         where 1 =1
         <if test="eventId !=null and eventId != ''">
             and t.event_id= #{eventId}

+ 5 - 5
service-oa/src/main/java/com/java110/oa/dao/impl/WorkEventV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class WorkEventV1ServiceDaoImpl extends BaseServiceDao implements IWorkEv
     public List<Map> getWorkEventInfo(Map info) throws DAOException {
         logger.debug("查询 getWorkEventInfo 入参 info : {}",info);
 
-        List<Map> businessWorkEventInfos = sqlSessionTemplate.selectList("workEventV1ServiceDaoImpl.getWorkEventInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("workEventV1ServiceDaoImpl.getWorkEventInfo",info);
 
-        return businessWorkEventInfos;
+        return infos;
     }
 
 
@@ -100,12 +100,12 @@ public class WorkEventV1ServiceDaoImpl extends BaseServiceDao implements IWorkEv
     public int queryWorkEventsCount(Map info) {
         logger.debug("查询 queryWorkEventsCount 入参 info : {}",info);
 
-        List<Map> businessWorkEventInfos = sqlSessionTemplate.selectList("workEventV1ServiceDaoImpl.queryWorkEventsCount", info);
-        if (businessWorkEventInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("workEventV1ServiceDaoImpl.queryWorkEventsCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessWorkEventInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }