From 707e41025c53ed21b3cba0412b5f48ddf4155da0 Mon Sep 17 00:00:00 2001 From: wanghao Date: Sat, 13 Dec 2025 16:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/sql/20251213-xj_emergency新增字段.sql | 2 ++ .../java/com/renkang/emergency/entity/Resource.java | 7 +++++++ .../api/service/EmergencyOrderApiService.java | 2 +- .../service/impl/EmergencyOrderApiServiceImpl.java | 5 ++++- .../service/impl/LargeScreenDataServiceImpl.java | 2 ++ .../emergency/service/impl/OrderServiceImpl.java | 13 +++++++++---- .../service/impl/TblHelpCenterServiceImpl.java | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 db/sql/20251213-xj_emergency新增字段.sql diff --git a/db/sql/20251213-xj_emergency新增字段.sql b/db/sql/20251213-xj_emergency新增字段.sql new file mode 100644 index 0000000..8e8466e --- /dev/null +++ b/db/sql/20251213-xj_emergency新增字段.sql @@ -0,0 +1,2 @@ +ALTER TABLE `emergency_resource` + ADD COLUMN `geo_collect_type` tinyint NULL DEFAULT 0 COMMENT '位置数据维护方式(0-地图选点,1-手动维护)' AFTER `ay_id`; \ No newline at end of file diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java index 78da788..1446a88 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java @@ -190,4 +190,11 @@ public class Resource implements Serializable { */ @Schema(title = "安眼id") private String ayId; + + /** + * 位置数据维护方式 + */ + @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)") + @Dict(dicCode = "geo_collect_type") + private Integer geoCollectType; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java index 77ba1f8..362fa6e 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java @@ -70,7 +70,7 @@ public interface EmergencyOrderApiService { Order getOrderById(String id); - List getSicknessTypeStatistic(String sex, String depart); + List getSicknessTypeStatistic(String sex, String depart,String centerId); List getGroupMemberList(String sessionId); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java index 38198f9..f087d0c 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java @@ -551,7 +551,7 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { } @Override - public List getSicknessTypeStatistic(String sex, String depart) { + public List getSicknessTypeStatistic(String sex, String depart,String centerId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (StrUtil.isNotBlank(sex) && !"0".equals(sex)) { queryWrapper.eq(Order::getSalvageUserSex, sex); @@ -559,6 +559,9 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { if (StrUtil.isNotBlank(depart)) { queryWrapper.like(Order::getSalvageUserDepart, depart); } + if (StrUtil.isNotBlank(centerId)) { + queryWrapper.eq(Order::getCenterId, centerId); + } queryWrapper.eq(Order::getDelFlag, CommonConstant.DEL_FLAG_0); List orders = orderMapper.selectList(queryWrapper); // 统计 diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index 443a567..6ae324e 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -718,6 +718,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl implements @Override public IPage pageCustom(Page page, Order order, HttpServletRequest req) { String salvageUserName = order.getSalvageUserName(); + String initiatorUserName = order.getInitiatorUserName(); Order orderCopy = new Order(); handleOrder(order, orderCopy); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderCopy, req.getParameterMap()); - handleQueryWrapper(order, salvageUserName, queryWrapper); + handleQueryWrapper(order, salvageUserName,initiatorUserName, queryWrapper); // 处理应急中心 handleCenterAndManagerWrapper(queryWrapper, order.getCenterId(), order.getOrgCode()); Page result = page(page, queryWrapper); @@ -219,12 +220,12 @@ public class OrderServiceImpl extends ServiceImpl implements LoginUser loginUser = GlobalUtils.getLoginUser(); // 筛选条件: 员工姓名 状态 时间段 QueryWrapper queryWrapper = new QueryWrapper<>(); - handleQueryWrapper(order, order.getSalvageUserName(), queryWrapper); + handleQueryWrapper(order, order.getSalvageUserName(),order.getInitiatorUserName(), queryWrapper); //queryWrapper.lambda().eq(Order::getMajorUserId, loginUser.getId()); queryWrapper.lambda().and(orWrapper -> orWrapper.eq(Order::getMajorUserId, loginUser.getId()).or().eq(Order::getMajorUserTwoId, loginUser.getId())); - if (StrUtil.isBlank(order.getOrderStatus())) { + if (StrUtil.isNotEmpty(order.getOrderStatus())) { queryWrapper.lambda().in(Order::getOrderStatus, Arrays.asList(EmergencyConstants.ORDER_STATUS_5_NEW, EmergencyConstants.ORDER_STATUS_1_NEW)); } if (EmergencyConstants.ORDER_STATUS_5_NEW.equals(order.getOrderStatus())) { @@ -281,7 +282,7 @@ public class OrderServiceImpl extends ServiceImpl implements BeanUtil.copyProperties(order, copy); } - private void handleQueryWrapper(Order orderCopy, String salvageUserName, QueryWrapper queryWrapper) { + private void handleQueryWrapper(Order orderCopy, String salvageUserName,String initiatorUserName, QueryWrapper queryWrapper) { if (ObjectUtil.isNull(orderCopy)) { return; } @@ -302,6 +303,10 @@ public class OrderServiceImpl extends ServiceImpl implements if (StrUtil.isNotBlank(salvageUserName)) { queryWrapper.lambda().like(Order::getSalvageUserName, salvageUserName); } + // 发起人姓名模糊查找 + if (StrUtil.isNotBlank(initiatorUserName)) { + queryWrapper.lambda().like(Order::getInitiatorUserName, initiatorUserName); + } // 时间范围查询 if (ObjectUtil.isNotNull(orderCopy.getCreateTimeStart()) && ObjectUtil.isNotNull(orderCopy.getCreateTimeEnd())) { diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java index 7c04f1d..d73768d 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java @@ -44,7 +44,7 @@ public class TblHelpCenterServiceImpl extends ServiceImpl sicknessTypeStatistic(String sex, String depart,String centerId) { - List statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart); + List statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart,centerId); for (TblHelpCentorVo tblHelpCentorVo : statistic) { if (tblHelpCentorVo.getType().equals("0")) { tblHelpCentorVo.setName("120");