优化代码

java110-bean/src/main/java/com/java110/dto/work/WorkPoolDto.java

@@ -41,6 +41,10 @@ public class WorkPoolDto extends PageDto implements Serializable {
 
     private String communityId;
 
+    private String staffName;
+
+    private String copyName;
+
     private String curStaffName;
 
     private String curCopyName;
@@ -390,4 +394,20 @@ public class WorkPoolDto extends PageDto implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getCopyName() {
+        return copyName;
+    }
+
+    public void setCopyName(String copyName) {
+        this.copyName = copyName;
+    }
 }

service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java

@@ -162,14 +162,16 @@ public class ListWorkPoolCmd extends Cmd {
         List<WorkTaskDto> workTaskDtos = workTaskV1InnerServiceSMOImpl.queryWorkTasks(workTaskDto);
 
         String curStaffName = "";
+        String staffName;
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curStaffName = "";
+            staffName = "";
             for (WorkTaskDto tmpWorkTaskDto : workTaskDtos) {
-                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
+                if (!workPoolDto.getWorkId().equals(tmpWorkTaskDto.getWorkId())) {
                     continue;
                 }
-
-                if (!workPoolDto.getWorkId().equals(tmpWorkTaskDto.getWorkId())) {
+                staffName = tmpWorkTaskDto.getStaffName();
+                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
                     continue;
                 }
 
@@ -181,6 +183,7 @@ public class ListWorkPoolCmd extends Cmd {
             }
 
             workPoolDto.setCurStaffName(curStaffName);
+            workPoolDto.setStaffName(staffName);
         }
 
         WorkCopyDto workCopyDto = new WorkCopyDto();
@@ -188,16 +191,20 @@ public class ListWorkPoolCmd extends Cmd {
         List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);
 
         String curCopyName = "";
+        String copyName ;
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curCopyName = "";
+            copyName= "";
             for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
-                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
-                    continue;
-                }
+
 
                 if (!workPoolDto.getWorkId().equals(tmpWorkCopyDto.getWorkId())) {
                     continue;
                 }
+                copyName = tmpWorkCopyDto.getStaffName();
+                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
+                    continue;
+                }
 
                 if (curCopyName.split(",").length > 2) {
                     continue;
@@ -207,6 +214,7 @@ public class ListWorkPoolCmd extends Cmd {
             }
 
             workPoolDto.setCurCopyName(curCopyName);
+            workPoolDto.setCopyName(copyName);
         }
 
     }