常用标签维护——删除

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.entity.wrapper.QuestionUsualWapper;
 import com.diagbot.enums.IsDeleteEnum;
@@ -11,9 +12,8 @@ import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.QuestionUsualVO;
-import com.diagbot.vo.UpdateQuetionUsualVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -75,24 +75,18 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         return true;
     }
 
-
     /**
      * 删除常用标签
-     * @param updateQuetionUsualVO
+     * @param deleteQuestionUsualVO
      * @return
      */
-    public Boolean deleteQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
-        QuestionUsual questionUsual = new QuestionUsual();
-        BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
-        questionUsual.setIsDeleted(IsDeleteEnum.Y.getKey());
-        questionUsual.setGmtModified(DateUtil.now());
-        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
-        Boolean flag = this.updateById(questionUsual);
-        if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
-                    "常用症状删除失败");
-        }
-        return flag;
+    public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO){
+        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        UpdateWrapper<QuestionUsual> queryWrapper = new UpdateWrapper<>();
+        queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId()).set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", userId)
+                .set("gmt_modified", DateUtil.now());
+        this.update(new QuestionUsual(),queryWrapper);
+        return true;
     }
-
 }

icssman-service/src/main/java/com/diagbot/vo/DeleteQuestionUsualVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/13 17:17
+ */
+@Setter
+@Getter
+public class DeleteQuestionUsualVO {
+    private Long deptId;
+}

icssman-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -8,10 +8,10 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.facade.QuestionInfoFacade;
 import com.diagbot.facade.QuestionUsualFacade;
+import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionUsualVO;
-import com.diagbot.vo.UpdateQuetionUsualVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,8 +62,8 @@ public class QuestionUsualController {
     @PostMapping("/deleteQuestionUsual")
     @SysLogger("deleteQuestionUsual")
     @Transactional
-    public RespDTO<Boolean> deleteQuestionUsual(@Valid @RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
-        Boolean data = questionUsualFacade.deleteQuestionUsual(updateQuetionUsualVO);
+    public RespDTO<Boolean> deleteQuestionUsual(@Valid @RequestBody DeleteQuestionUsualVO deleteQuestionUsualVO) {
+        Boolean data = questionUsualFacade.deleteQuestionUsualByDeptId(deleteQuestionUsualVO);
         return RespDTO.onSuc(data);
     }