From 2e5ffea1fc7263fff8e3b6a87707233597c07c8f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 09:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 8a45c67..4f908e2 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -78,7 +78,7 @@
entity.setToUserId(guideRepairOrder.getGuideUserId()+"");
entity.setFromUserId(guideRepairOrder.getSubmitUserId());
entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
- entity.setGuideId(guideRepairOrder.getId().toString());
+ entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
guideEvolveMapper.insertConfig(entity);
}
}
@@ -162,5 +162,21 @@
return baseMapper.countConfigList(matterName,ids);
}
+ /**
+ * 1 今天 2昨天 3本月 4本年度 String time
+ * @param state
+ * @param ids
+ * @return
+ */
+ @Override
+ public int countStatisticsNum(String state,List<String> ids,String time) {
+ return baseMapper.countStatisticsNum(state,ids,time);
+ }
+
+ @Override
+ public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
+ return baseMapper.countListNum(state, ids,time);
+ }
+
}
--
Gitblit v1.7.1