From 1c043480b7fb05c48e7f2aea0d9ac4957a4b032c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 08 十月 2022 14:54:03 +0800
Subject: [PATCH] 修改Bug
---
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 1 +
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 3 ++-
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 2 +-
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 1 +
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 24 ++++++++++++++----------
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
index 35912db..5559527 100644
--- a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -36,6 +36,7 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
+ @Authorization
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 20ce2dd..ed2193b 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -5,6 +5,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -86,7 +87,7 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
-
+ config.setUserId(Snowflake.getId());
return toAjax(IUserService.insertConfig(config));
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 36a12d9..940b9f7 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -311,7 +311,7 @@
* @param sysUser 当前登录人员信息
* @return
*/
- @ApiOperation("获取个人中心工单数据")
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
@GetMapping("/personalCenter")
@Authorization
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 7c379e1..b65c6b6 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -36,6 +36,7 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
+ @Authorization
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
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 c4b5058..dc96213 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
@@ -41,8 +41,9 @@
guideRepairOrder.setCreateTime(LocalDateTime.now());
guideRepairOrder.setUpdateTime(LocalDateTime.now());
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
- String[] images = guideRepairOrder.getImages().split(",");
- for (String image: images) {
+ if (guideRepairOrder.getImages()!=null){
+ String[] images = guideRepairOrder.getImages().split(",");
+ for (String image: images) {
GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
@@ -50,15 +51,18 @@
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);
+ if (guideRepairOrder.getVideo()!=null){
+ 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);
--
Gitblit v1.7.1