Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,7 +76,7 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置：1-右侧显示，0-都显示
+     * 显示位置：0-都展示，1-推送展示，2-更多展示
      */
     private Integer position;
 

icss-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -9,8 +9,9 @@ import lombok.Setter;
  * @time: 2018/11/23 10:12
  */
 public enum IntroducePositionEnum implements KeyedNamed {
-    Right(1, "右侧"),
-    All(0, "右侧+全文");
+    All(0, "都展示"),
+    Push(1, "推送展示"),
+    More(2, "更多展示");
 
     @Setter
     private Integer key;

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -179,10 +179,12 @@ public class PushFacade {
                 if (questionDTO == null || (!questionDTO.getSubType().equals(0))) {
                     questionDTO = new QuestionDTO();
                     questionDTO.setTagName(entry.getKey());
+                    questionDTO.setName(entry.getKey());
                 }
 
             } else {
                 questionDTO.setTagName(entry.getKey());
+                questionDTO.setName(entry.getKey());
             }
             questionDTOList.add(questionDTO);
         }

icssman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -3,6 +3,8 @@ package com.diagbot.client;
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Token;
+import com.diagbot.entity.User;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +20,9 @@ public interface UserServiceClient {
 
     @PostMapping("/user/verifyToken")
     RespDTO<Boolean> verifyToken(@RequestBody Token token);
+    
+    @PostMapping(value = "/user/getUserAuthStatus")
+    RespDTO<User> getUserByUserId(@RequestBody Long userId);
 }
 
 

icssman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -23,4 +23,12 @@ public class UserServiceHystrix implements UserServiceClient {
         return null;
     }
 
+	@Override
+	public RespDTO<User> getUserByUserId(Long userId) {
+		log.error("【hystrix】调用{}异常", "getUserByUserId");
+        return null;
+	}
+
+    
+    
 }

icssman-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,7 +76,7 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置：1-右侧显示，0-都显示
+     * 显示位置：0-都展示，1-推送展示，2-更多展示
      */
     private Integer position;
 

icssman-service/src/main/java/com/diagbot/entity/User.java

@@ -51,16 +51,60 @@ public class User implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
     /**
      * 用户密码
      */
     private String password;
 
     /**
-     * 用户名
+     * 联系人
      */
-    private String username;
+    private String linkman;
+
+    /**
+     * 手机号(如果是客户，phone与username是一样的)
+     */
+    private String phone;
+
+    /**
+     * 所属岗位
+     */
+    private String position;
+
+    /**
+     * 所属部门
+     */
+    private String dept;
+
+    /**
+     * 邮箱
+     */
+    private String email;
 
+    /**
+     * 认证状态: 0 未认证，1 已认证，2 认证中
+     */
+    private Integer authStatus;
+
+    /**
+     * 认证通过时间
+     */
+    private Date passauthTime;
+
+    /**
+     * 1内部用户，0外部用户（默认0）
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
 
     public Long getId() {
         return id;
@@ -69,7 +113,6 @@ public class User implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
-
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -77,7 +120,6 @@ public class User implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -85,7 +127,6 @@ public class User implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -93,7 +134,6 @@ public class User implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
-
     public String getCreator() {
         return creator;
     }
@@ -101,7 +141,6 @@ public class User implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
-
     public String getModifier() {
         return modifier;
     }
@@ -109,7 +148,13 @@ public class User implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+    public String getUsername() {
+        return username;
+    }
 
+    public void setUsername(String username) {
+        this.username = username;
+    }
     public String getPassword() {
         return password;
     }
@@ -117,26 +162,90 @@ public class User implements Serializable {
     public void setPassword(String password) {
         this.password = password;
     }
+    public String getLinkman() {
+        return linkman;
+    }
 
-    public String getUsername() {
-        return username;
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+    public String getPhone() {
+        return phone;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+    public String getDept() {
+        return dept;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public Integer getAuthStatus() {
+        return authStatus;
+    }
+
+    public void setAuthStatus(Integer authStatus) {
+        this.authStatus = authStatus;
+    }
+    public Date getPassauthTime() {
+        return passauthTime;
+    }
+
+    public void setPassauthTime(Date passauthTime) {
+        this.passauthTime = passauthTime;
+    }
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     @Override
     public String toString() {
         return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", password=" + password +
-                ", username=" + username +
-                "}";
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", username=" + username +
+        ", password=" + password +
+        ", linkman=" + linkman +
+        ", phone=" + phone +
+        ", position=" + position +
+        ", dept=" + dept +
+        ", email=" + email +
+        ", authStatus=" + authStatus +
+        ", passauthTime=" + passauthTime +
+        ", type=" + type +
+        ", remark=" + remark +
+        "}";
     }
 }

icssman-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -9,8 +9,9 @@ import lombok.Setter;
  * @time: 2018/11/23 10:12
  */
 public enum IntroducePositionEnum implements KeyedNamed {
-    Right(1, "右侧"),
-    All(0, "右侧+全文");
+    All(0, "都展示"),
+    Push(1, "推送展示"),
+    More(2, "更多展示");
 
     @Setter
     private Integer key;

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

@@ -15,6 +15,8 @@ import com.diagbot.vo.GetDeptInfoVO;
 import com.diagbot.vo.UpdateDeptInfoVO;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -31,8 +33,12 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
     public Boolean addDeptInfo(AddDeptInfoVO addDeptInfoVO) {
         DeptInfo deptInfo =new DeptInfo();
         BeanUtil.copyProperties(addDeptInfoVO,deptInfo);
-        deptInfo.setCreator(UserUtils.getCurrentPrincipleID());
-        deptInfo.setGmtCreate(DateUtil.now());
+        Date now = DateUtil.now();
+        String userId = UserUtils.getCurrentPrincipleID();
+        deptInfo.setCreator(userId);
+        deptInfo.setGmtCreate(now);
+        deptInfo.setModifier(userId);
+        deptInfo.setGmtModified(now);
         Boolean flag = this.save(deptInfo);
         if(!flag){
             throw new CommonException(CommonErrorCode.FAIL,

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -9,11 +10,11 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.DeptVitalService;
 import com.diagbot.service.impl.DeptVitalServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
-import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -43,9 +44,13 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      */
     public Boolean saveDeptVitals(DeptVitalVO deptVitalVO) {
         //先删除该科室原有模板
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId());
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                eq("is_deleted",IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(),deptVitalUpdateWrapper);
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
@@ -63,12 +68,16 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
 
         //插入新模板
         List<DeptVital> deptVitalList = Lists.newArrayList();
+        Date now = DateUtil.now();
+        String userId = UserUtils.getCurrentPrincipleID();
         for (Long vital : deptVitalVO.getVitalIds()) {
             DeptVital deptVital = new DeptVital();
             deptVital.setDeptId(deptVitalVO.getDeptId());
             deptVital.setVitalId(vital);
-            deptVital.setCreator(UserUtils.getCurrentPrincipleID());
-            deptVital.setGmtCreate(new Date());
+            deptVital.setCreator(userId);
+            deptVital.setGmtCreate(now);
+            deptVital.setModifier(userId);
+            deptVital.setGmtModified(now);
             deptVitalList.add(deptVital);
         }
 
@@ -83,10 +92,14 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      * @return
      */
     public Boolean delDeptVitalList(DeptVitalVO deptVitalVO) {
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                in("vital_id", deptVitalVO.getVitalIds());
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                in("vital_id", deptVitalVO.getVitalIds()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
         return true;
     }
 
@@ -96,9 +109,13 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      * @return
      */
     public Boolean delAllDeptVitalList(Long deptId) {
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptId);
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptId).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
         return true;
     }
 

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

@@ -1,9 +1,12 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -18,6 +21,7 @@ public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
 
     /**
      * 获取提示信息明细
+     *
      * @param introduceId
      * @return
      */
@@ -27,4 +31,38 @@ public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
                 eq("introduce_id", introduceId);
         return this.list(introduceDetailQueryWrapper);
     }
-}
+
+    /**
+     * 单条删除提示信息明细 逻辑删除
+     *
+     * @param id
+     * @return
+     */
+    public Boolean deleteRecord(Long id) {
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.eq("id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
+        return true;
+    }
+
+    /**
+     * 批量删除提示信息明细 逻辑删除
+     *
+     * @param ids
+     * @return
+     */
+    public Boolean deleteRecords(Long[] ids) {
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.in("id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
+        return true;
+    }
+}

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

@@ -1,14 +1,17 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.service.impl.IntroduceMapServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroduceDetailVO;
 import com.diagbot.vo.IntroduceMapVO;
@@ -18,8 +21,6 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,10 +51,10 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         if (!(introduceVO.getId() == null)) {
             introduceInfo = this.getById(introduceVO.getId());
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtModified(new Date());
+            introduceInfo.setGmtModified(DateUtil.now());
         } else {
             introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtCreate(new Date());
+            introduceInfo.setGmtCreate(DateUtil.now());
         }
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
@@ -62,18 +63,22 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         this.saveOrUpdate(introduceInfo);
 
         //明细信息不更新，每次都删除重新插入
-        //删除已有明细，物理删除
+        //删除已有明细，逻辑删除
         if (!(introduceInfo.getId() == null)) {
-            QueryWrapper<IntroduceDetail> detailQueryWrapper = new QueryWrapper<>();
-            detailQueryWrapper.eq("introduce_id", introduceInfo.getId());
-            introduceDetailFacade.remove(detailQueryWrapper);
+            UpdateWrapper<IntroduceDetail> detailUpdateWrapper = new UpdateWrapper<>();
+            detailUpdateWrapper.eq("introduce_id", introduceInfo.getId()).
+                    eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    set("is_deleted", IsDeleteEnum.Y.getKey()).
+                    set("modifier", UserUtils.getCurrentPrincipleID()).
+                    set("gmt_modified", DateUtil.now());
+            introduceDetailFacade.update(new IntroduceDetail(), detailUpdateWrapper);
         }
         List<IntroduceDetail> introduceDetailList = Lists.newArrayList();
         for (IntroduceDetailVO detailVO : introduceVO.getDetailVOList()) {
             IntroduceDetail detail = new IntroduceDetail();
             detail.setIntroduceId(introduceInfo.getId());
             detail.setCreator(UserUtils.getCurrentPrincipleID());
-            detail.setGmtCreate(new Date());
+            detail.setGmtCreate(DateUtil.now());
             detail.setContent(detailVO.getContent());
             detail.setText(detailVO.getText());
             detail.setTitle(detailVO.getTitle());
@@ -87,9 +92,13 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         //更新映射关系
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("introduce_id", introduceInfo.getId());
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.eq("introduce_id", introduceInfo.getId()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //插入新的映射关系
         List<IntroduceMap> introduceMapList = Lists.newLinkedList();
         for (IntroduceMapVO introduceMapVO : introduceVO.getMapVOList()) {
@@ -103,42 +112,70 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     }
 
     /**
-     * 单条删除提示信息 物理删除
+     * 单条删除提示信息 逻辑删除
      *
      * @param id
      * @return
      */
     public Boolean deleteRecord(Long id) {
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("introduce_id", id);
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.eq("introduce_id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //删除明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("introduce_id", id);
-        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.eq("introduce_id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
         //删除提示信息
-        this.removeById(id);
+        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
+        introduceInfoUpdateWrapper.eq("id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
         return true;
     }
 
     /**
-     * 批量删除提示信息 物理删除
+     * 批量删除提示信息 逻辑删除
      *
      * @param ids
      * @return
      */
     public Boolean deleteRecords(Long[] ids) {
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.in("introduce_id", ids);
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.in("introduce_id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //删除明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.in("introduce_id", ids);
-        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.in("introduce_id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
         //删除提示信息
-        this.removeByIds(Arrays.asList(ids));
+        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
+        introduceInfoUpdateWrapper.in("id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
         return true;
     }
 

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

@@ -8,13 +8,12 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.IntroduceMapServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroduceMapVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -50,8 +49,11 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
             introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     eq("question_id", introduceMapVO.getQuestionId()).
-                    eq("type", introduceMapVO.getType());
-            this.remove(introduceMapUpdateWrapper);
+                    eq("type", introduceMapVO.getType()).
+                    set("is_deleted", IsDeleteEnum.Y.getKey()).
+                    set("modifier", UserUtils.getCurrentPrincipleID()).
+                    set("gmt_modified", DateUtil.now());
+            this.update(new IntroduceMap(), introduceMapUpdateWrapper);
 
             //插入新的关系
             introduceMap = new IntroduceMap();
@@ -59,10 +61,10 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             introduceMap.setIntroduceId(introduceMapVO.getIntroduceId());
             introduceMap.setType(introduceMapVO.getType());
             introduceMap.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceMap.setGmtCreate(new Date());
+            introduceMap.setGmtCreate(DateUtil.now());
         } else {
             //已有关系更新时间
-            introduceMap.setGmtModified(new Date());
+            introduceMap.setGmtModified(DateUtil.now());
             introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
         }
         this.saveOrUpdate(introduceMap);
@@ -78,10 +80,13 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
     public Boolean delIntroduceMap(IntroduceMapVO introduceMapVO) {
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                eq("introduce_id", introduceMapVO.getIntroduceId()).
                 eq("question_id", introduceMapVO.getQuestionId()).
                 eq("type", introduceMapVO.getType()).
-                set("is_deleted", IsDeleteEnum.Y.getKey());
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
         this.update(new IntroduceMap(), introduceMapUpdateWrapper);
         return true;
     }
-}
+}

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

@@ -1,20 +1,20 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.VitalInfoDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
-import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,8 +33,12 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     public Boolean saveAll(List<VitalOrderVO> vitalOrderVOList) {
         //先删除现有排序
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         //插入新排序
         List<VitalOrder> vitalOrderList = Lists.newArrayList();
         for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
@@ -42,7 +46,7 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
             vitalOrder.setQuestionId(vitalOrderVO.getVitalId());
             vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
             vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
-            vitalOrder.setGmtCreate(new Date());
+            vitalOrder.setGmtCreate(DateUtil.now());
             vitalOrderList.add(vitalOrder);
         }
         vitalOrderServiceImpl.saveBatch(vitalOrderList);
@@ -81,9 +85,13 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
      * @return
      */
     public Boolean deleteVitalOrder(Long vitalId) {
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.eq("vital_id", vitalId);
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.eq("vital_id", vitalId).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         return true;
     }
 
@@ -94,9 +102,13 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
      * @return
      */
     public Boolean deleteVitalOrders(Long[] vitalIds) {
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.in("vital_id", vitalIds);
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.in("vital_id", vitalIds).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         return true;
     }
-}
+}

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -48,7 +47,7 @@ public class IntroduceDetailController {
     @SysLogger("deleteRecord")
     @Transactional
     public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
-        Boolean data = introduceDetailFacade.removeById(id);
+        Boolean data = introduceDetailFacade.deleteRecord(id);
         return RespDTO.onSuc(data);
     }
 
@@ -58,7 +57,7 @@ public class IntroduceDetailController {
     @SysLogger("deleteRecords")
     @Transactional
     public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
-        Boolean data = introduceDetailFacade.removeByIds(Arrays.asList(ids));
+        Boolean data = introduceDetailFacade.deleteRecords(ids);
         return RespDTO.onSuc(data);
     }
 }