From 0f28c38f1a978a47b8221dff56eeebf26a9e6fac Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期四, 20 十月 2022 14:39:36 +0800 Subject: [PATCH] 修改bug --- flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 2 +- flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 2 +- flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 4 ++-- flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 2 +- 4 files changed, 5 insertions(+), 5 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 2d70d6e..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 @@ -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); 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 7fd0d50..89be4c7 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 @@ -332,7 +332,7 @@ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity(); guideEvolveEntity.setCreateTime(LocalDateTime.now()); guideEvolveEntity.setUpdateTime(LocalDateTime.now()); - guideEvolveEntity.setState("3"); + guideEvolveEntity.setState("13"); guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId()); guideEvolveEntity.setFromUserId(sysUser.getUserId()+""); guideEvolveEntity.setGuideId(entity.getId().toString()); diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java index afb2058..98d8eae 100644 --- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java +++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java @@ -54,9 +54,9 @@ private String fromUserId; /** - * state", value = "状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配12默认好评) + * state", value = "状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价) */ - @ApiModelProperty(name = "state", value = "状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配 12默认好评)") + @ApiModelProperty(name = "state", value = "状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价)") private String state; diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml index 472aa0e..de1eabf 100644 --- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml +++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml @@ -105,7 +105,7 @@ </select> <select id="countConfigList" resultType="integer"> - select count(id) from automessage_guide_repair_order + select count(id) from automessage_guide_repair_order a <where> <if test="matterName != null and matterName != ''"> AND (matter_name like concat('%', #{matterName}, '%')) or -- Gitblit v1.7.1