yangdamao 3 年之前
父节点
当前提交
4f4bdf5f50

+ 0 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/ProfileTpMapper.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.base.bo.ProfileTpQueryBo;
 import com.zhongzheng.modules.base.domain.ProfileTp;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
-import com.zhongzheng.modules.course.vo.CourseVo;
 
 import java.util.List;
 

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IProfileTpService.java

@@ -30,6 +30,7 @@ public interface IProfileTpService extends IService<ProfileTp> {
 
 	List<ProfileTpVo> selectListByBo(ProfileTpQueryBo bo);
 
+
 	List<String> selectAllUseGoods(ProfileTpQueryBo bo);
 
 	/**

+ 10 - 16
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -3,26 +3,23 @@ package com.zhongzheng.modules.base.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.base.bo.*;
+import com.zhongzheng.modules.base.bo.ProfileTpAddBo;
+import com.zhongzheng.modules.base.bo.ProfileTpEditBo;
+import com.zhongzheng.modules.base.bo.ProfileTpQueryBo;
 import com.zhongzheng.modules.base.domain.ProfileTp;
 import com.zhongzheng.modules.base.domain.ProfileTpBusiness;
 import com.zhongzheng.modules.base.mapper.ProfileTpMapper;
 import com.zhongzheng.modules.base.service.IProfileTpBusinessService;
 import com.zhongzheng.modules.base.service.IProfileTpService;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
-import com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
-import com.zhongzheng.modules.course.domain.CourseChapter;
-import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
-import com.zhongzheng.modules.course.domain.CourseChapterSection;
-import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -41,9 +38,6 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
     @Autowired
     private IProfileTpBusinessService iProfileTpBusinessService;
 
-    @Autowired
-    private ProfileTpMapper profileTpMapper;
-
 
     @Override
     public ProfileTpVo queryById(Long profileTpId){
@@ -62,12 +56,12 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
 
     @Override
     public List<ProfileTpVo> selectListByBo(ProfileTpQueryBo bo) {
-        return profileTpMapper.selectListByBo(bo);
+        return baseMapper.selectListByBo(bo);
     }
 
     @Override
     public List<String> selectAllUseGoods(ProfileTpQueryBo bo) {
-        List<ProfileTpVo> list = profileTpMapper.selectListByBo(bo);
+        List<ProfileTpVo> list = baseMapper.selectListByBo(bo);
         List<String> strList = new ArrayList<>();
         for(int i=0;i<list.size();i++){
             if(Validator.isNotEmpty(list.get(i).getGoodsIds())){
@@ -163,7 +157,7 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
         ProfileTpQueryBo profileTpQueryBo = new ProfileTpQueryBo();
         profileTpQueryBo.setGoodsId(goodsId);
         profileTpQueryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
-        List<ProfileTpVo> profileTpVos = profileTpMapper.selectListByBo(profileTpQueryBo);
+        List<ProfileTpVo> profileTpVos = baseMapper.selectListByBo(profileTpQueryBo);
         if (!CollectionUtils.isEmpty(profileTpVos)){
             return profileTpVos.get(0);
         }else {

+ 0 - 28
zhongzheng-system/src/main/resources/mapper/modules/base/ProfileTpMapper.xml

@@ -46,34 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName" column="nick_name"/>
     </resultMap>
 
-    <select id="findUserList" resultMap="ProfileTpSysUser">
-        SELECT
-            u.nick_name,
-            u.user_id
-        FROM
-            sys_user u
-        WHERE
-            FIND_IN_SET( u.user_id, #{user_ids})
-    </select>
-
-    <select id="findBusinessList" resultMap="ProfileTpBusiness">
-        SELECT
-            b.education_type_id,
-            b.id,
-            b.business_id,
-            b.project_id,
-            cet.education_name,
-            cpt.project_name,
-            cb.business_name
-        FROM
-            profile_tp_business b
-                LEFT JOIN course_education_type cet ON b.education_type_id = cet.id
-                LEFT JOIN course_project_type cpt ON b.project_id = cpt.id
-                LEFT JOIN course_business cb ON b.business_id = cb.id
-        WHERE
-            b.profile_tp_id=#{profile_tp_id}
-    </select>
-
     <select id="selectListByBo" parameterType="com.zhongzheng.modules.base.bo.ProfileTpQueryBo" resultMap="ProfileTpVoResult">
         SELECT
             *