修改批量归档时，只更新 未完成的工单。 增加上处理人

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -605,30 +605,34 @@ public class BmsEventOrderService {
         List<Dict> pushRecords = Lists.newArrayList();
         for (Object orderId : orderIds) {
             CareEventOrder order = this.careEventOrderService.getById(NumberUtils.toLong(Objects.toString(orderId)));
-            UpdateWrapper<CareEventOrder> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().eq(CareEventOrder::getId, orderId)
-                    .set(CareEventOrder::getStatus, OrderStatusEnum.COMPLETE.getValue())
-                    .set(CareEventOrder::getModifyTime, DateUtil.date());
-            this.careEventOrderService.update(updateWrapper);
-            CareEventOrderHandleHis log = new CareEventOrderHandleHis();
-            log.setOrgId(order.getOrgId());
-            log.setStationId(order.getStationId());
-            log.setOrderId(order.getId());
-            log.setLogType(LogTypeEnum.CLOSE.getValue());
-            log.setLogObjectId(loginUser.getId());
-            log.setLogObjectName(loginUser.getName());
-            log.setLogResult("完成工单");
-            log.setOpUserRole(UserRoleEnum.SEAT.getValue());
-            log.setCreateTime(DateUtil.date());
-            log.setRelationTypeDesc(UserRoleEnum.getCodeToName(loginUser.getRole()));
-            boolean saved = this.careEventOrderHandleHisService.save(log);
-            if (!saved) {
-                throw new BDException("事件归档出现错误, 请稍后重试");
+            if (OrderStatusEnum.TODO.getValue().equals(order.getStatus()) || OrderStatusEnum.DOING.getValue().equals(order.getStatus())){
+                UpdateWrapper<CareEventOrder> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.lambda().eq(CareEventOrder::getId, orderId)
+                        .set(CareEventOrder::getStatus, OrderStatusEnum.COMPLETE.getValue())
+                        .set(CareEventOrder::getSeatId,loginUser.getId())
+                        .set(CareEventOrder::getSeatName,loginUser.getName())
+                        .set(CareEventOrder::getModifyTime, DateUtil.date());
+                this.careEventOrderService.update(updateWrapper);
+                CareEventOrderHandleHis log = new CareEventOrderHandleHis();
+                log.setOrgId(order.getOrgId());
+                log.setStationId(order.getStationId());
+                log.setOrderId(order.getId());
+                log.setLogType(LogTypeEnum.CLOSE.getValue());
+                log.setLogObjectId(loginUser.getId());
+                log.setLogObjectName(loginUser.getName());
+                log.setLogResult("完成工单");
+                log.setOpUserRole(UserRoleEnum.SEAT.getValue());
+                log.setCreateTime(DateUtil.date());
+                log.setRelationTypeDesc(UserRoleEnum.getCodeToName(loginUser.getRole()));
+                boolean saved = this.careEventOrderHandleHisService.save(log);
+                if (!saved) {
+                    throw new BDException("事件归档出现错误, 请稍后重试");
+                }
+                pushRecords.add(Dict.create()
+                        .set("orgId", order.getOrgId())
+                        .set("stationId", order.getStationId())
+                        .set("orderId", orderId));
             }
-            pushRecords.add(Dict.create()
-                    .set("orgId", order.getOrgId())
-                    .set("stationId", order.getStationId())
-                    .set("orderId", orderId));
         }
         for (Dict dict : pushRecords) {
             this.bigScreenService.pushRtEventFlag(dict.getLong("orgId"), dict.getLong("stationId"), dict.getStr("orderId"), "bigscreenRefresh");