From 0cb8527e35db76eb5ab663524e374f3c8f4b402c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:32:40 +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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 3c26140..4a06ce0 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
@@ -229,14 +229,15 @@
@Override
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
String matterName, List<String> ids, String status,
- String guideUserId) {
- return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime,
+ String createTimeTimeEndTime,String classifyId) {
+ return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
}
@Override
public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
- String guideUserId) {
- return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
+ return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
}
@Override
@@ -396,7 +397,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1