From a8a1467cf49be6b7c9be682033e0996b376b63ce Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 29 九月 2022 16:26:29 +0800
Subject: [PATCH] 修改bug 取消导办电话判断
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
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 f5e725b..624f69f 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
@@ -1,21 +1,25 @@
package com.dg.core.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
-import com.dg.core.db.gen.entity.GuideEvolveEntity;
-import com.dg.core.db.gen.entity.GuideRepairOrder;
-import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 工单管理
@@ -94,10 +98,7 @@
return ResultData.error("导办人员id不能为空");
}
- if(StringUtils.isEmpty(order.getGuideUserPhone()))
- {
- return ResultData.error("导办人员电话不能为空");
- }
+
//已分配
order.setState("2");
@@ -141,11 +142,6 @@
if(StringUtils.isEmpty(order.getGuideUserId()))
{
return ResultData.error("导办人员id不能为空");
- }
-
- if(StringUtils.isEmpty(order.getGuideUserPhone()))
- {
- return ResultData.error("导办人员电话不能为空");
}
//已分配
@@ -304,6 +300,39 @@
return toAjax(iGuideRepairOrderService.updateConfig(entity));
}
+ /**
+ * 获取个人中心工单数据
+ * @param sysUser 当前登录人员信息
+ * @return
+ */
+ @ApiOperation("获取个人中心工单数据")
+ @GetMapping("/personalCenter")
+ @Authorization
+ public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
+ return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
+ }
+
+
+ /**
+ * 获取工单列表(分页)
+ * @param matterName
+ * @return
+ */
+ @ApiOperation(value = "获取工单列表(分页)",response = GuideRepairOrder.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "matterName",required = false) String matterName)
+ {
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
+ int num=iGuideRepairOrderService.countConfigList(matterName);
+ return getDataTable(list,num);
+ }
+
}
--
Gitblit v1.7.1