diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/CommonConstants.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/CommonConstants.java index 37af8e6..7f8b04b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/CommonConstants.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/CommonConstants.java @@ -10,4 +10,8 @@ public interface CommonConstants { public static final String DEFAULT_COUNT = "0"; + public static final String QUERY_TYPE_ORDER_TYPE = "order_type"; + + public static final String QUERY_TYPE_SOURCE_ID = "source_id"; + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java index af7aab5..279c0fc 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java @@ -195,8 +195,8 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { if(null == companyId || companyId == 0L || companyId == 100L){ companyId = null; } - if ("order_type".equals(req.getQueryType())) { - //工单类型 Q:快速工单,C:普通工单, A:ai工单,W:网格工单,O:12345工单 + if (CommonConstants.QUERY_TYPE_ORDER_TYPE.equals(req.getQueryType())) { + //工单类型 Q:快速工单,C:普通工单 // 1. 定义工单类型数组(便于后续扩展,新增类型只需在数组中添加) List dictDataList = dictDataApi.getDictDataList(DictTypeConstants.WORKORDER_TYPE); List orderTypes = dictDataList.stream().map(DictDataRespDTO::getValue).collect(Collectors.toList()); @@ -218,32 +218,8 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { } } } - //合并C和Q - // 1. 获取respMap中C和Q的原始值 - Object cObj = respMap.get("C"); - Object qObj = respMap.get("Q"); - - // 2. 初始化C和Q的数值为0(避免空值或转换失败导致异常) - long cNum = 0; - long qNum = 0; - - // 3. 转换C值为数字(兼容String/Integer/Long类型,处理格式异常) - if (ObjectUtil.isNotEmpty(cObj)) { - cNum = Long.parseLong(cObj.toString().trim()); - } - // 4. 转换Q值为数字(同C值,兼容多类型并处理异常) - if (ObjectUtil.isNotEmpty(qObj)) { - qNum = Long.parseLong(qObj.toString().trim()); - } - // 5. 求和后赋值给C键,覆盖原有C值 - long totalCQ = cNum + qNum; - respMap.put("C", totalCQ); - - // 6. 删除Q键,确保最终返回的Map中无Q键 - respMap.remove("Q"); - return respMap; - } else if ("source_id".equals(req.getQueryType())){ + } else if (CommonConstants.QUERY_TYPE_SOURCE_ID.equals(req.getQueryType())){ //来源 事件来源 1、巡查,2、游客居民,3、12345,4、网格 5、大区经理 6、ai // 1. 定义工单类型数组(便于后续扩展,新增类型只需在数组中添加) List dictDataList = dictDataApi.getDictDataList(DictTypeConstants.WORKORDER_SOURCE_TYPE);