wangbo 4 years ago
parent
commit
bb7ad6411c

+ 20 - 0
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -855,6 +855,14 @@ public class WorkOrderManageController {
                     if(workOrder.getUpdateBy()!=null) {
                         idList.add(Long.valueOf(workOrder.getUpdateBy()));
                     }
+                    if(workOrder.getCurrentUsers() != null) {
+                        String[] currentUserIds = workOrder.getCurrentUsers().split(",");
+                        for(String currentUserId:currentUserIds){
+                            if(!StringUtils.isEmpty(currentUserId)) {
+                                idList.add(Long.valueOf(currentUserId));
+                            }
+                        }
+                    }
                 }
                 Long[] ids = idList.toArray(new Long[0]);
                 List<UserEntity> userEntityList=userCenterClient.findUserIdsByUserIds(ids);
@@ -864,6 +872,18 @@ public class WorkOrderManageController {
                 for(int i = 0; i < result.size(); i++) {
                     WorkOrderManageDto workOrder = result.get(i);
                     try {
+                        String currentUsersName = null;
+                        if(workOrder.getCurrentUsers() != null) {
+                            String[] currentUserIds = workOrder.getCurrentUsers().split(",");
+                            for (String currentUserId : currentUserIds) {
+                                if (currentUsersName == null) {
+                                    currentUsersName = userMap.get(Long.valueOf(currentUserId));
+                                } else {
+                                    currentUsersName = currentUsersName + "," + userMap.get(Long.valueOf(currentUserId));
+                                }
+                            }
+                        }
+                        workOrder.setCurrentTaskName(currentUsersName);
                         if (workOrder.getOrderTypeId() != null) {
                             workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
                         }

+ 3 - 0
operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderManage.java

@@ -95,6 +95,9 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "当前处理人")
     private String currentUsers;
 
+    @ApiModelProperty(value = "当前处理人名称")
+    private String currentUsersName;
+
     @ApiModelProperty(value = "当前名称")
     private String currentTaskName;
 

+ 1 - 1
operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -666,7 +666,7 @@
         </if>
       </if>
       <if test="order.startDate == null and order.endDate == null">
-         order by t1.date_create desc
+         order by t1.send_time desc
       </if>
     </where>
   </select>