From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
index 70b3ae3..1470967 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -46,7 +46,7 @@
     @PostMapping
     public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
         comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
-        return comSanShuoExpertService.addExpert(comSanshuoExpertDTO);
+        return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
     }
 
     @GetMapping("/detail")
@@ -58,9 +58,8 @@
      * 小程序获取可选择专家
      * */
     @GetMapping("/appletsList")
-    public R appList(){
-        comSanShuoExpertService.selectExpertList();
-        return R.ok(comSanShuoExpertService.list(new QueryWrapper<ComSanshuoExpert>().eq("status",1).eq("del_flag",1)));
+    public R appList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){
+        return comSanShuoExpertService.selectExpertList(type, id,this.getLoginUserInfo().getCommunityId());
     }
 
     /**
@@ -68,11 +67,9 @@
      * */
     @PutMapping
     public R update(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
-        ComSanshuoExpert expert=new ComSanshuoExpert();
-        BeanUtil.copyProperties(comSanshuoExpertDTO,expert);
-        expert.setUpdateTime(new Date());
-        return R.ok(comSanShuoExpertService.updateById(expert));
+        return R.ok(comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO));
     }
+
 
     /**
      * 后台获取列表
@@ -90,7 +87,6 @@
      * */
     @DeleteMapping("/remove")
     public R remove(@RequestParam("id")Long id){
-        //TODO 是否有为解决事件
         List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, id).in(ComEvent::getEventProcessStatus, (1), (2), (5)));
         if (list.size()!=0){
             return R.fail("有未调解完成事件,无法删除!");
@@ -98,7 +94,12 @@
         ComSanshuoExpert expert = comSanShuoExpertService.getById(id);
         expert.setStatus(0);
         expert.setDelFlag(0);
-        return R.ok(comSanShuoExpertService.updateById(expert));
+        boolean b = comSanShuoExpertService.updateById(expert);
+        if (b){
+            //删除专家账号的权限
+            userService.removeExpertRole(expert.getPhone());
+        }
+        return R.ok();
     }
 
     /**
@@ -154,4 +155,7 @@
         return R.fail();
     }
 
+
+
+
 }

--
Gitblit v1.7.1