浏览代码

icssman删除无用代码

gaodm 6 年之前
父节点
当前提交
0e19268f06
共有 21 个文件被更改,包括 0 次插入1123 次删除
  1. 0 140
      icssman-service/src/main/java/com/diagbot/facade/IntroduceDetailFacade.java
  2. 0 342
      icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java
  3. 0 92
      icssman-service/src/main/java/com/diagbot/facade/IntroduceMapFacade.java
  4. 0 2
      icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java
  5. 0 188
      icssman-service/src/main/java/com/diagbot/facade/VitalOrderFacade.java
  6. 0 16
      icssman-service/src/main/java/com/diagbot/mapper/IntroduceDetailMapper.java
  7. 0 27
      icssman-service/src/main/java/com/diagbot/mapper/IntroduceInfoMapper.java
  8. 0 16
      icssman-service/src/main/java/com/diagbot/mapper/IntroduceMapMapper.java
  9. 0 16
      icssman-service/src/main/java/com/diagbot/mapper/VitalOrderMapper.java
  10. 0 16
      icssman-service/src/main/java/com/diagbot/service/IntroduceDetailService.java
  11. 0 25
      icssman-service/src/main/java/com/diagbot/service/IntroduceInfoService.java
  12. 0 16
      icssman-service/src/main/java/com/diagbot/service/IntroduceMapService.java
  13. 0 16
      icssman-service/src/main/java/com/diagbot/service/VitalOrderService.java
  14. 0 20
      icssman-service/src/main/java/com/diagbot/service/impl/IntroduceDetailServiceImpl.java
  15. 0 32
      icssman-service/src/main/java/com/diagbot/service/impl/IntroduceInfoServiceImpl.java
  16. 0 20
      icssman-service/src/main/java/com/diagbot/service/impl/IntroduceMapServiceImpl.java
  17. 0 20
      icssman-service/src/main/java/com/diagbot/service/impl/VitalOrderServiceImpl.java
  18. 0 22
      icssman-service/src/main/resources/mapper/IntroduceDetailMapper.xml
  19. 0 61
      icssman-service/src/main/resources/mapper/IntroduceInfoMapper.xml
  20. 0 19
      icssman-service/src/main/resources/mapper/IntroduceMapMapper.xml
  21. 0 17
      icssman-service/src/main/resources/mapper/VitalOrderMapper.xml

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

@@ -1,140 +0,0 @@
-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.entity.IntroduceInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.IntroduceDetailServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.IdVO;
-import com.diagbot.vo.IntroduceDetailSingleVO;
-import com.diagbot.vo.IntroduceDetailVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 14:31
- */
-@Component
-public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
-    @Autowired
-    private IntroduceInfoFacade introduceInfoFacade;
-
-    /**
-     * 获取提示信息明细
-     *
-     * @param introduceId
-     * @return
-     */
-    public List<IntroduceDetail> getByIntroduceId(Long introduceId) {
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceId);
-        return this.list(introduceDetailQueryWrapper);
-    }
-
-    /**
-     * 获取单条提示信息明细
-     *
-     * @param id
-     * @return
-     */
-    public IntroduceDetail getRecordById(Long id) {
-        IntroduceDetail detail = super.getById(id);
-        if (detail == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息明细不存在");
-        } else if (detail.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息明细已删除");
-        }
-        return detail;
-    }
-
-    /**
-     * 单条明细保存
-     *
-     * @param detailSingleVO
-     * @return
-     */
-    public Boolean saveRecord(IntroduceDetailSingleVO detailSingleVO) {
-        if (detailSingleVO.getIntroduceId() == null || detailSingleVO.getIntroduceId().equals(0L)) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "请输入提示信息id");
-        }
-        IntroduceInfo introduceInfo = introduceInfoFacade.getById(detailSingleVO.getIntroduceId());
-        if (introduceInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息不存在");
-        } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-        }
-
-        String userId = UserUtils.getCurrentPrincipleID();
-        Date now = DateUtil.now();
-        IntroduceDetail detail = super.getById(detailSingleVO.getId());
-        if (!(detail == null || detail.getIsDeleted().equals(IsDeleteEnum.Y.getKey()))) {
-            detail.setIsDeleted(IsDeleteEnum.Y.getKey());
-            detail.setModifier(userId);
-            detail.setGmtModified(now);
-            this.updateById(detail);
-        }
-        detail = new IntroduceDetail();
-        detail.setIsReason(detailSingleVO.getIsReason());
-        detail.setTitle(detailSingleVO.getTitle());
-        detail.setOrderNo(detailSingleVO.getOrderNo());
-        detail.setText(detailSingleVO.getText());
-        detail.setContent(detailSingleVO.getContent());
-        detail.setIntroduceId(detailSingleVO.getIntroduceId());
-        detail.setPosition(detailSingleVO.getPosition());
-        detail.setCreator(userId);
-        detail.setGmtCreate(now);
-        detail.setModifier(userId);
-        detail.setGmtModified(now);
-
-        this.saveOrUpdate(detail);
-
-        return true;
-    }
-
-    /**
-     * 单条删除提示信息明细 逻辑删除
-     *
-     * @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 idVOList
-     * @return
-     */
-    public Boolean deleteRecords(List<IdVO> idVOList) {
-        List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
-        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;
-    }
-}

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

@@ -1,342 +0,0 @@
-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.client.UserServiceClient;
-import com.diagbot.dto.IntroducePageDTO;
-import com.diagbot.dto.QuestionShortDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.IntroduceDetailService;
-import com.diagbot.service.IntroduceMapService;
-import com.diagbot.service.impl.IntroduceInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.IdVO;
-import com.diagbot.vo.IntroduceDetailVO;
-import com.diagbot.vo.IntroduceMapVO;
-import com.diagbot.vo.IntroducePageVO;
-import com.diagbot.vo.IntroduceVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 14:30
- */
-@Component
-public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
-    @Autowired
-    IntroduceMapFacade introduceMapFacade;
-    @Autowired
-    IntroduceDetailFacade introduceDetailFacade;
-    @Autowired
-    @Qualifier("introduceDetailServiceImpl")
-    IntroduceDetailService introduceDetailService;
-    @Autowired
-    @Qualifier("introduceMapServiceImpl")
-    IntroduceMapService introduceMapService;
-    @Autowired
-    UserServiceClient userServiceClient;
-    @Autowired
-    QuestionFacade questionFacade;
-
-    /**
-     * 保存提示信息(新增or修改)
-     *
-     * @param introduceVO
-     * @return
-     */
-    public Boolean saveIntroduce(IntroduceVO introduceVO) {
-        IntroduceInfo introduceInfo = new IntroduceInfo();
-        Date now = DateUtil.now();
-        String userId = UserUtils.getCurrentPrincipleID();
-        if (!(introduceVO.getId() == null || introduceVO.getId().equals(0L))) {
-            introduceInfo = this.getById(introduceVO.getId());
-            if (introduceInfo == null) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息不存在");
-            } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-            }
-        } else {
-            introduceInfo.setCreator(userId);
-            introduceInfo.setGmtCreate(now);
-        }
-
-        introduceInfo.setModifier(userId);
-        introduceInfo.setGmtModified(now);
-        introduceInfo.setName(introduceVO.getName());
-        introduceInfo.setRemark(introduceVO.getRemark());
-
-        //更新提示信息
-        this.saveOrUpdate(introduceInfo);
-
-        //明细信息不更新,每次都删除重新插入
-        //删除已有明细,逻辑删除
-        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", userId).
-                set("gmt_modified", 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(userId);
-            detail.setGmtCreate(now);
-            detail.setModifier(userId);
-            detail.setGmtModified(now);
-            detail.setContent(detailVO.getContent());
-            detail.setText(detailVO.getText());
-            detail.setTitle(detailVO.getTitle());
-            detail.setOrderNo(detailVO.getOrderNo());
-            detail.setPosition(detailVO.getPosition());
-            detail.setIsReason(detailVO.getIsReason());
-            introduceDetailList.add(detail);
-        }
-        //插入新的明细记录
-        introduceDetailService.saveBatch(introduceDetailList);
-
-        //更新映射关系
-        //删除已有映射关系
-        List<Long> questionIds = introduceVO.getMapVOList().stream().map(introduceMapVO -> introduceMapVO.getQuestionId()).collect(Collectors.toList());
-        Long introudceId = introduceInfo.getId();
-        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
-        if (ListUtil.isNotEmpty(questionIds)) {
-            introduceMapUpdateWrapper.and(i -> i.eq("introduce_id", introudceId).or().in("question_id", questionIds));
-        } else {
-            introduceMapUpdateWrapper.eq("introduce_id", introudceId);
-        }
-        introduceMapUpdateWrapper.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()) {
-            IntroduceMap introduceMap = new IntroduceMap();
-            BeanUtil.copyProperties(introduceMapVO, introduceMap);
-            introduceMap.setIntroduceId(introduceInfo.getId());
-            introduceMap.setQuestionId(introduceMapVO.getQuestionId());
-            introduceMap.setCreator(userId);
-            introduceMap.setGmtCreate(now);
-            introduceMap.setModifier(userId);
-            introduceMap.setGmtModified(now);
-            introduceMapList.add(introduceMap);
-        }
-        introduceMapService.saveBatch(introduceMapList);
-        return true;
-    }
-
-    /**
-     * 单条删除提示信息 逻辑删除
-     *
-     * @param id
-     * @return
-     */
-    public Boolean deleteRecord(Long id) {
-        IntroduceInfo introduceInfo = this.getById(id);
-        if (introduceInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息不存在");
-        } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-        }
-        //删除已有映射关系
-        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);
-        //删除明细
-        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);
-        //删除提示信息
-        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 idVOList
-     * @return
-     */
-    public Boolean deleteRecords(List<IdVO> idVOList) {
-        List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
-        if (ListUtil.isEmpty(ids)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入提示信息id");
-        }
-        //删除已有映射关系
-        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);
-        //删除明细
-        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);
-        //删除提示信息
-        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;
-    }
-
-    /**
-     * 获取提示信息分页信息,带条件
-     *
-     * @param introducePageVO
-     * @return
-     */
-    public IPage<IntroducePageDTO> getIntroducePageByMap(IntroducePageVO introducePageVO) {
-        IPage<IntroducePageDTO> introducePageDTOIPage = this.getIntroducePage(introducePageVO);
-        List<IntroducePageDTO> records = introducePageDTOIPage.getRecords();
-        for (IntroducePageDTO introducePageDTO : records) {
-            introducePageDTO.setOperator(introducePageDTO.getModifier());
-            introducePageDTO.setGmtOperate(introducePageDTO.getGmtModified());
-        }
-        List<String> userIds = records.stream().map(introduceList -> introduceList.getOperator()).collect(Collectors.toList());
-        RespDTO<Map<String, String>> userInfos = userServiceClient.getUserInfoByIds(userIds);
-        if (userInfos != null) {
-            Map<String, String> userInfoMap = userInfos.data;
-            for (IntroducePageDTO introducePageDTO : records) {
-                if (userInfoMap.containsKey(introducePageDTO.getOperator())) {
-                    introducePageDTO.setOperatorName(userInfoMap.get(introducePageDTO.getOperator()));
-                }
-            }
-        }
-        introducePageDTOIPage.setRecords(records);
-        return introducePageDTOIPage;
-    }
-
-    /**
-     * 带条件查询
-     *
-     * @param map
-     * @return
-     */
-    public List<IntroduceInfo> getByMap(Map<String, Object> map) {
-        QueryWrapper<IntroduceInfo> introduceInfoQueryWrapper = new QueryWrapper<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            introduceInfoQueryWrapper.eq(entry.getKey(), entry.getValue());
-        }
-        return this.list(introduceInfoQueryWrapper);
-    }
-
-    /**
-     * 根据id获取提示信息
-     *
-     * @param id
-     * @return
-     */
-    public IntroducePageDTO getIntroduceById(Long id) {
-        IntroducePageDTO introducePageDTO = new IntroducePageDTO();
-        IntroduceInfo introduceInfo = this.getById(id);
-        BeanUtil.copyProperties(introduceInfo, introducePageDTO);
-
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("introduce_id", id).eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<IntroduceMap> introduceMapList = introduceMapFacade.list(introduceMapQueryWrapper);
-
-        List<Long> questionIds = introduceMapList.stream().map(introduceMap -> introduceMap.getQuestionId()).collect(Collectors.toList());
-        if (ListUtil.isNotEmpty(questionIds)) {
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
-            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-
-            List<QuestionShortDTO> questionShortDTOList = Lists.newLinkedList();
-            String tagName = "";
-            for (QuestionInfo questionInfo : questionInfoList) {
-                QuestionShortDTO questionShortDTO = new QuestionShortDTO();
-                BeanUtil.copyProperties(questionInfo, questionShortDTO);
-                questionShortDTOList.add(questionShortDTO);
-                tagName += questionInfo.getTagName() + ",";
-            }
-            if (tagName.endsWith(",")) {
-                tagName = tagName.substring(0, tagName.length() - 1);
-            }
-            introducePageDTO.setTagName(tagName);
-            introducePageDTO.setQuestionList(questionShortDTOList);
-        }
-
-        //未关联的标签
-        /*QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
-        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("sub_type", 0)
-                .notIn("id", questionIds);
-        List<QuestionInfo> unRelatedQuestionList = questionFacade.list(unRelatedQuestionWrapper);
-
-        List<QuestionShortDTO> unRelatedQuestionDTOList
-                = BeanUtil.listCopyTo(unRelatedQuestionList, QuestionShortDTO.class);
-        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);*/
-
-        //提示信息明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N).eq("introduce_id", id).orderByAsc("order_no");
-        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        introducePageDTO.setDetails(introduceDetailList);
-
-        return introducePageDTO;
-    }
-
-    /**
-     * 获取未关联标签列表
-     *
-     * @return
-     */
-    public List<QuestionShortDTO> getAllQuestionList() {
-        QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
-        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("sub_type", 0);
-        List<QuestionInfo> unRelatedQuestionList = questionFacade.list(unRelatedQuestionWrapper);
-
-        List<QuestionShortDTO> unRelatedQuestionDTOList
-                = BeanUtil.listCopyTo(unRelatedQuestionList, QuestionShortDTO.class);
-        return unRelatedQuestionDTOList;
-    }
-}

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

@@ -1,92 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.entity.IntroduceMap;
-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;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 14:31
- */
-@Component
-public class IntroduceMapFacade extends IntroduceMapServiceImpl {
-
-    @Autowired
-    IntroduceInfoFacade introduceInfoFacade;
-
-    /**
-     * 保存标签提示信息映射关系
-     *
-     * @param introduceMapVO
-     * @return
-     */
-    public Boolean saveIntroduceMap(IntroduceMapVO introduceMapVO) {
-        IntroduceInfo introduceInfo = introduceInfoFacade.getById(introduceMapVO.getIntroduceId());
-        if (introduceInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未添加");
-        } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-        }
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("question_id", introduceMapVO.getQuestionId()).
-                eq("type", introduceMapVO.getType()).
-                eq("introduce_id", introduceMapVO.getIntroduceId());
-        IntroduceMap introduceMap = this.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            //删除该标签关联的别的提示信息,插入新的提示信息
-            UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
-            introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                    eq("question_id", introduceMapVO.getQuestionId()).
-                    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();
-            introduceMap.setQuestionId(introduceMapVO.getQuestionId());
-            introduceMap.setIntroduceId(introduceMapVO.getIntroduceId());
-            introduceMap.setType(introduceMapVO.getType());
-            introduceMap.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceMap.setGmtCreate(DateUtil.now());
-        }
-        //已有关系更新时间
-        introduceMap.setGmtModified(DateUtil.now());
-        introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
-
-        this.saveOrUpdate(introduceMap);
-        return true;
-    }
-
-    /**
-     * 删除标签提示信息映射关系
-     *
-     * @param introduceMapVO
-     * @return
-     */
-    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("modifier", UserUtils.getCurrentPrincipleID()).
-                set("gmt_modified", DateUtil.now());
-        this.update(new IntroduceMap(), introduceMapUpdateWrapper);
-        return true;
-    }
-}

+ 0 - 2
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -92,8 +92,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
     @Autowired
-    VitalOrderFacade vitalOrderFacade;
-    @Autowired
     DeptVitalFacade deptVitalFacade;
     @Autowired
     RetrievalMappingFacade retrievalMappingFacade;

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

@@ -1,188 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.QuestionShortDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.VitalInfoDTO;
-import com.diagbot.dto.VitalOrderDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.entity.VitalOrder;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.service.VitalOrderService;
-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.VitalIdVO;
-import com.diagbot.vo.VitalOrderVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/22 11:45
- */
-@Component
-public class VitalOrderFacade extends VitalOrderServiceImpl {
-
-    @Autowired
-    @Qualifier("vitalOrderServiceImpl")
-    VitalOrderService vitalOrderService;
-    @Autowired
-    QuestionFacade questionFacade;
-    @Autowired
-    UserServiceClient userServiceClient;
-
-    public Boolean saveAll(List<VitalOrderVO> vitalOrderVOList) {
-        //先删除现有排序
-        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);
-        //插入新排序
-        String userId = UserUtils.getCurrentPrincipleID();
-        Date now = DateUtil.now();
-        List<VitalOrder> vitalOrderList = Lists.newArrayList();
-        for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
-            VitalOrder vitalOrder = new VitalOrder();
-            vitalOrder.setQuestionId(vitalOrderVO.getVitalId());
-            vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
-            vitalOrder.setCreator(userId);
-            vitalOrder.setGmtCreate(now);
-            vitalOrder.setModifier(userId);
-            vitalOrder.setGmtModified(now);
-            vitalOrderList.add(vitalOrder);
-        }
-        vitalOrderService.saveBatch(vitalOrderList);
-        return true;
-    }
-
-    /**
-     * 获取所有查体排序关系
-     *
-     * @return
-     */
-    public VitalOrderDTO getVitalOrderList() {
-        VitalOrderDTO vitalOrderDTO = new VitalOrderDTO();
-
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.orderByAsc("order_no")
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<VitalOrder> vitalOrderList = this.list(vitalOrderQueryWrapper);
-        List<Long> vitalIds = vitalOrderList.stream().map(vitalOrder -> vitalOrder.getQuestionId()).collect(Collectors.toList());
-
-        //操作人
-        if (vitalOrderList.size() > 0) {
-            String userId = vitalOrderList.get(0).getModifier();
-            vitalOrderDTO.setGmtOperate(vitalOrderList.get(0).getGmtModified());
-            vitalOrderDTO.setOperator(userId);
-            List<String> userIds = Lists.newArrayList();
-            userIds.add(userId);
-            RespDTO<Map<String, String>> userInfoMap = userServiceClient.getUserInfoByIds(userIds);
-            vitalOrderDTO.setOperatorName(userInfoMap.data.get(userId));
-        }
-
-        //已排序查体标签
-        List<QuestionInfo> vitals = Lists.newArrayList(questionFacade.listByIds(vitalIds));
-        Map<Long, QuestionInfo> vitalMap = EntityUtil.makeEntityMap(vitals, "id");
-
-        List<VitalInfoDTO> vitalInfoDTOList = Lists.newLinkedList();
-        for (VitalOrder vitalOrder : vitalOrderList) {
-            VitalInfoDTO vitalInfoDTO = new VitalInfoDTO();
-            QuestionInfo questionInfo = vitalMap.get(vitalOrder.getQuestionId());
-            if (questionInfo != null) {
-                BeanUtil.copyProperties(questionInfo, vitalInfoDTO);
-            }
-            vitalInfoDTO.setOrderNo(vitalOrder.getOrderNo());
-            vitalInfoDTOList.add(vitalInfoDTO);
-        }
-        vitalOrderDTO.setVitals(vitalInfoDTOList);
-
-        //未排序查体标签
-        QueryWrapper<QuestionInfo> unOrderedVitalQueryWrapper = new QueryWrapper<>();
-        unOrderedVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", QuestionTypeEnum.Vital.getKey())
-                .eq("sub_type", 0)
-                .notIn("id", vitalIds);
-        List<QuestionInfo> unOrderVitals = questionFacade.list(unOrderedVitalQueryWrapper);
-        List<QuestionShortDTO> unOrderedVitalList
-                = BeanUtil.listCopyTo(unOrderVitals, QuestionShortDTO.class);
-        vitalOrderDTO.setUnOrderedVitals(unOrderedVitalList);
-
-        return vitalOrderDTO;
-    }
-
-    /**
-     * 获取未排序查体标签
-     *
-     * @return
-     */
-    public List<QuestionShortDTO> getUnOrderedVitalList() {
-        //已排序查体标签
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<VitalOrder> vitalOrderList = this.list(vitalOrderQueryWrapper);
-        List<Long> vitalIds = vitalOrderList.stream().map(vitalOrder -> vitalOrder.getQuestionId()).collect(Collectors.toList());
-
-        //未排序查体标签
-        QueryWrapper<QuestionInfo> unOrderedVitalQueryWrapper = new QueryWrapper<>();
-        unOrderedVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", QuestionTypeEnum.Vital.getKey())
-                .eq("sub_type", 0)
-                .notIn("id", vitalIds);
-        List<QuestionInfo> vitals = questionFacade.list(unOrderedVitalQueryWrapper);
-
-        List<QuestionShortDTO> questionShortDTOList
-                = BeanUtil.listCopyTo(vitals, QuestionShortDTO.class);
-        return questionShortDTOList;
-    }
-
-    /**
-     * 删除排序
-     *
-     * @param vitalId
-     * @return
-     */
-    public Boolean deleteVitalOrder(Long vitalId) {
-        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;
-    }
-
-    /**
-     * 删除排序-批量
-     *
-     * @param vitalIdVOList
-     * @return
-     */
-    public Boolean deleteVitalOrders(List<VitalIdVO> vitalIdVOList) {
-        List<Long> vitalIds = vitalIdVOList.stream().map(vitalIdVO -> vitalIdVO.getVitalId()).collect(Collectors.toList());
-        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;
-    }
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/mapper/IntroduceDetailMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 提示信息明细 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceDetailMapper extends BaseMapper<IntroduceDetail> {
-
-}

+ 0 - 27
icssman-service/src/main/java/com/diagbot/mapper/IntroduceInfoMapper.java

@@ -1,27 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.IntroducePageDTO;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.vo.IntroducePageVO;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * <p>
- * 提示信息 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceInfoMapper extends BaseMapper<IntroduceInfo> {
-    /**
-     * 获取提示信息分页信息
-     *
-     * @param introducePageVO
-     * @return
-     */
-    IPage<IntroducePageDTO> getIntroducePage(@Param("introducePageVO")IntroducePageVO introducePageVO) ;
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/mapper/IntroduceMapMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 标签与提示信息映射表 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceMapMapper extends BaseMapper<IntroduceMap> {
-
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/mapper/VitalOrderMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.VitalOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 查体全局排序 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-22
- */
-public interface VitalOrderMapper extends BaseMapper<VitalOrder> {
-
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/service/IntroduceDetailService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceDetail;
-
-/**
- * <p>
- * 提示信息明细 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceDetailService extends IService<IntroduceDetail> {
-
-}

+ 0 - 25
icssman-service/src/main/java/com/diagbot/service/IntroduceInfoService.java

@@ -1,25 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.IntroducePageDTO;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.vo.IntroducePageVO;
-
-/**
- * <p>
- * 提示信息 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceInfoService extends IService<IntroduceInfo> {
-    /**
-     * 获取提示信息分页信息
-     *
-     * @param introducePageVO
-     * @return
-     */
-    IPage<IntroducePageDTO> getIntroducePage(IntroducePageVO introducePageVO);
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/service/IntroduceMapService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceMap;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-public interface IntroduceMapService extends IService<IntroduceMap> {
-
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/service/VitalOrderService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.VitalOrder;
-
-/**
- * <p>
- * 查体全局排序 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-22
- */
-public interface VitalOrderService extends IService<VitalOrder> {
-
-}

+ 0 - 20
icssman-service/src/main/java/com/diagbot/service/impl/IntroduceDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.mapper.IntroduceDetailMapper;
-import com.diagbot.service.IntroduceDetailService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息明细 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@Service
-public class IntroduceDetailServiceImpl extends ServiceImpl<IntroduceDetailMapper, IntroduceDetail> implements IntroduceDetailService {
-
-}

+ 0 - 32
icssman-service/src/main/java/com/diagbot/service/impl/IntroduceInfoServiceImpl.java

@@ -1,32 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.IntroducePageDTO;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.mapper.IntroduceInfoMapper;
-import com.diagbot.service.IntroduceInfoService;
-import com.diagbot.vo.IntroducePageVO;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@Service
-public class IntroduceInfoServiceImpl extends ServiceImpl<IntroduceInfoMapper, IntroduceInfo> implements IntroduceInfoService {
-
-    /**
-     * 获取提示信息分页信息
-     *
-     * @param introducePageVO
-     * @return
-     */
-    public IPage<IntroducePageDTO> getIntroducePage(IntroducePageVO introducePageVO) {
-        return this.baseMapper.getIntroducePage(introducePageVO);
-    }
-}

+ 0 - 20
icssman-service/src/main/java/com/diagbot/service/impl/IntroduceMapServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.mapper.IntroduceMapMapper;
-import com.diagbot.service.IntroduceMapService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@Service
-public class IntroduceMapServiceImpl extends ServiceImpl<IntroduceMapMapper, IntroduceMap> implements IntroduceMapService {
-
-}

+ 0 - 20
icssman-service/src/main/java/com/diagbot/service/impl/VitalOrderServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.VitalOrder;
-import com.diagbot.mapper.VitalOrderMapper;
-import com.diagbot.service.VitalOrderService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 查体全局排序 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-22
- */
-@Service
-public class VitalOrderServiceImpl extends ServiceImpl<VitalOrderMapper, VitalOrder> implements VitalOrderService {
-
-}

+ 0 - 22
icssman-service/src/main/resources/mapper/IntroduceDetailMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceDetail">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="introduce_id" property="introduceId" />
-        <result column="title" property="title" />
-        <result column="content" property="content" />
-        <result column="text" property="text" />
-        <result column="order_no" property="orderNo" />
-        <result column="position" property="position" />
-        <result column="is_reason" property="isReason" />
-    </resultMap>
-
-</mapper>

+ 0 - 61
icssman-service/src/main/resources/mapper/IntroduceInfoMapper.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceInfo">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMapDTO" type="com.diagbot.dto.IntroducePageDTO">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="remark" property="remark" />
-        <result column="tag_name" property="tagName" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getIntroducePage" resultMap="BaseResultMapDTO">
-    SELECT info.*, t.tag_name FROM icss_introduce_info info left join
-	    (SELECT tt.introduce_id,GROUP_CONCAT(tt.tag_name) AS tag_name
-		    FROM
-			(
-				SELECT
-					a.introduce_id,
-					b.tag_name,
-					b.id
-				FROM
-					icss_introduce_map a,
-					icss_question_info b
-				WHERE
-					a.question_id = b.id
-				AND a.type = b.type
-                and a.is_deleted='N'
-                and b.is_deleted='N'
-			) tt
-		    GROUP BY tt.introduce_id
-	    ) t
-    on info.id = t.introduce_id
-    where info.is_deleted='N'
-	<if test="introducePageVO.name != null and introducePageVO.name != '' ">
-	    and info.name like concat('%',#{introducePageVO.name},'%')
-    </if>
-    <if test="introducePageVO.tagName != null and introducePageVO.tagName != '' ">
-        and t.tag_name like concat('%',#{introducePageVO.tagName},'%')
-    </if>
-    order by info.gmt_modified desc
-    </select>
-</mapper>

+ 0 - 19
icssman-service/src/main/resources/mapper/IntroduceMapMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceMapMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceMap">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="question_id" property="questionId" />
-        <result column="introduce_id" property="introduceId" />
-        <result column="type" property="type" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

+ 0 - 17
icssman-service/src/main/resources/mapper/VitalOrderMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.VitalOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.VitalOrder">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="question_id" property="questionId" />
-        <result column="order_no" property="orderNo" />
-    </resultMap>
-
-</mapper>