From f649287ccf7af57f1966982c0b8a1967cec01e34 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 20 十月 2022 14:39:52 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 0939382..3ae5998 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -193,8 +193,8 @@
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setDepartmentalId(order.getGuideDepartmentId());
- entity.setToUserId(order.getGuideUserId());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -277,7 +277,7 @@
GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
+ guideEvolveEntity.setState("13");
guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
int i = iGuideRepairOrderService.updateConfig(entity);
@@ -298,22 +298,5 @@
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
}
-
-
-
- /**
- * 删除工单
- * @param id
- * @return
- */
- @ApiOperation(value = "删除工单",response = GuideRepairOrder.class)
- @DeleteMapping("/delete/{id}")
- @Authorization
- public ResultData deleteConfigById(@PathVariable("id") String id)
- {
- return toAjax(iGuideRepairOrderService.deleteConfigById(id));
- }
-
-
}
--
Gitblit v1.7.1