From 19e9cac3bf76a376f3553f9463c02cac2ff54e8f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:29:26 +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 | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 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 2c72c98..c4b5058 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,19 +1,20 @@
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.SysUserMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.Snowflake;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
@Service
public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder> implements IGuideRepairOrderService {
@@ -23,6 +24,9 @@
@Resource
private GuideRepairOrderImageMapper guideRepairOrderImageMapper;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -34,6 +38,8 @@
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
guideRepairOrder.setState("1");
+ guideRepairOrder.setCreateTime(LocalDateTime.now());
+ guideRepairOrder.setUpdateTime(LocalDateTime.now());
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
String[] images = guideRepairOrder.getImages().split(",");
for (String image: images) {
@@ -41,7 +47,18 @@
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
guideRepairOrderImage.setUrl(image);
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(1);
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
+ if (guideRepairOrder.getOrderNum()!=null){
+ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
+ guideRepairOrderImage.setId(Snowflake.getId());
+ guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
+ guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(2);
+ guideRepairOrderImageMapper.insert(guideRepairOrderImage);
}
int ans= baseMapper.insert(guideRepairOrder);
int i = transactionEventMapper.updateById(transactionEvent);
@@ -59,6 +76,25 @@
@Override
public int updateConfig(GuideRepairOrder order) {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
return baseMapper.updateConfig(order);
}
+
+ @Override
+ public List<GuideRepairOrder> selectBySubmitId(String submitUserId) {
+ 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