From ef4438673cc3345aa64deae03279a99302bdeb8d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 18 Jun 2020 19:13:26 +0800
Subject: [PATCH] 修改数据需求的状态修改接口bug

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java         |    7 +++++++
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java |   19 +++++++++++++++++++
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java |   10 +++++++++-
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml                                   |    1 -
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java                   |    2 --
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
index c8410a7..c468401 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
@@ -1,6 +1,5 @@
 package com.kidgrow.oprationcenter.model;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -90,7 +89,6 @@
     /**
      * 是否删除,1删除(已下载),0未删除(未下载)
      */
-    @TableLogic
     private Boolean isDel;
     /**
      * 文件路径
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java
index 7eeb0fe..3f3fa94 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java
@@ -45,6 +45,13 @@
      *更新状态和文件地址
      */
     ResultBody updateEnabled(Map<String, Object> map);
+
+    /**
+     * 用户点击下载后,下载成功需要调用这个接口更新状态
+     * @param id
+     * @return
+     */
+    ResultBody updateDelete(Long id, SysUser sysUser);
     /**
      *获取某个医院的所有需求数据
      */
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
index e21723f..e079c83 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
@@ -15,6 +15,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +84,24 @@
             return ResultBody.ok();
         }
     }
+    @Override
+    public ResultBody updateDelete(Long id,SysUser sysUser) {
+        if(id==null){
+            return ResultBody.failed("请选择一条数据");
+        }else {
+            DataNeed dataNeed = baseMapper.selectById(id);
+            if (dataNeed != null) {
+                dataNeed.setIsDel(true);
+                dataNeed.setUpdateTime(new Date());
+                dataNeed.setUpdateUserId(sysUser.getId());
+                dataNeed.setUpdateUserName(sysUser.getUsername());
+                int u=baseMapper.updateById(dataNeed);
+                return ResultBody.ok().data(u>0);
+            }else {
+                return ResultBody.failed("查找数据失败");
+            }
+        }
+    }
 
     @Override
     public ResultBody FindAllByHId(Map<String, Object> map, SysUser sysUser) {
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
index d2ef40a..59a3051 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
@@ -11,7 +11,6 @@
     <sql id="where">
         <where>
             <!--查询条件自行添加-->
-            is_del=0
             <if test="p.id != null and p.id !=''">
                 and id = #{p.id}
             </if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index b5dc5dd..ecc3eec 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -77,11 +77,19 @@
     /**
      *更新状态和文件地址
      */
-    @ApiOperation(value = "查询")
+    @ApiOperation(value = "更新状态和文件地址")
     @GetMapping("updateEnabled")
     public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
         return dataNeedService.updateEnabled(map);
     }
+    /**
+     *更新使用状态
+     */
+    @ApiOperation(value = "更新使用状态")
+    @GetMapping("updateDelete")
+    public ResultBody updateDelete(@RequestParam Long id,@LoginUser(isFull = true) SysUser sysUser) {
+        return dataNeedService.updateDelete(id,sysUser);
+    }
 
     /**
      * 根据DataNeed当做查询条件进行查询

--
Gitblit v1.8.0