From 99c990b862429e4d3ce97c271a911831d06f815e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期日, 09 十月 2022 15:35:53 +0800
Subject: [PATCH] 修改Bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 e99b097..fdf7c33 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
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,9 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 提交导办订单
@@ -196,17 +200,18 @@
{
return ResultData.error("该工单已办结!");
}
-
- if(!StringUtils.equals(order.getState(),"2"))
- {
- return ResultData.error("该工单非是待办状态！");
+ if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
+ order.setState("2");
+ entity.setState("8");
}
- //待评价
- order.setState("4");
+ else if(StringUtils.equals(entity.getState(),"4")){
+ //待评价
+ order.setState("4");
+ entity.setState("9");
+ }
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("4");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
@@ -300,9 +305,11 @@
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
- iGuideEvolveService.insertConfig(guideEvolveEntity);
-
- return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
@@ -310,7 +317,7 @@
* @param sysUser 当前登录人员信息
* @return
*/
- @ApiOperation("获取个人中心工单数据")
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
@GetMapping("/personalCenter")
@Authorization
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
@@ -328,13 +335,16 @@
@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)
+ @RequestParam(value = "matterName",required = false) String matterName,
+ @CurrentUser SysUser sysUser)
{
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);
+
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName,ids);
+ int num=iGuideRepairOrderService.countConfigList(matterName,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1