From 39c20925e7a063873e71f528ceda5414a8cd205e Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期五, 30 九月 2022 16:32:06 +0800 Subject: [PATCH] 1.添加部门应用模块 2.修改BuG --- flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 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 285667d..30586e4 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 @@ -99,10 +99,6 @@ return ResultData.error("导办人员id不能为空"); } - if(StringUtils.isEmpty(order.getGuideUserPhone())) - { - return ResultData.error("导办人员电话不能为空"); - } //已分配 order.setState("2"); @@ -154,19 +150,21 @@ { 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()); iGuideEvolveService.insertConfig(entity); return toAjax(iGuideRepairOrderService.updateConfig(order)); } -- Gitblit v1.7.1