From 13db271c8d35d8730c8daf6d359c1fa352f52cd8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 29 九月 2022 10:47:49 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 48357b8..7932979 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
@@ -1,11 +1,9 @@
package com.dg.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dg.core.db.gen.entity.GuideRepairOrder;
-import com.dg.core.db.gen.entity.GuideRepairOrderImage;
-import com.dg.core.db.gen.entity.Slideshow;
-import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.gen.entity.*;
import com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper;
import com.dg.core.db.gen.mapper.GuideRepairOrderMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
@@ -14,6 +12,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -42,6 +41,7 @@
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
guideRepairOrderImage.setUrl(image);
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
guideRepairOrderImage.setType(1);
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
}
@@ -50,6 +50,7 @@
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
guideRepairOrderImage.setType(2);
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
}
@@ -77,5 +78,15 @@
return baseMapper.selectBySubmitId(submitUserId);
}
+ @Override
+ public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName) {
+ return baseMapper.selectConfigList(page,state,matterName);
+ }
+
+ @Override
+ public int countConfigList(String matterName) {
+ return baseMapper.countConfigList(matterName);
+ }
+
}
--
Gitblit v1.7.1