From 41dc0ffbb2b66fd6da78603adfadd5b574d0aab6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 14:20:19 +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 | 24 ++++++++++++++++++++----
1 files changed, 20 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 e7b4263..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,13 +1,12 @@
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;
@@ -26,6 +25,9 @@
@Resource
private GuideRepairOrderImageMapper guideRepairOrderImageMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
+
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -36,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) {
@@ -72,6 +76,8 @@
@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);
}
@@ -80,5 +86,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