Sfoglia il codice sorgente

Merge branch 'refs/heads/develop_zqc' into develop_rayson

rayson 8 mesi fa
parent
commit
95efc43798
29 ha cambiato i file con 44 aggiunte e 129 eliminazioni
  1. 2 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/PraciceSubmitRecordServiceImpl.java
  2. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/AdvertisementMessageMapper.xml
  3. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/CommentAnalysisMapper.xml
  4. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/CommentMapper.xml
  5. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseHotspotsMapper.xml
  6. 2 2
      menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseMapper.xml
  7. 4 4
      menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseRecruitPlanMapper.xml
  8. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseRecruitTagMapper.xml
  9. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/FeedbackMapper.xml
  10. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/JobDictionaryMapper.xml
  11. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/MessageMapper.xml
  12. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolClassMapper.xml
  13. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolDepartmentMapper.xml
  14. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolEnterpriseChoiceActivityJoinMapper.xml
  15. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolEnterpriseVisitorMapper.xml
  16. 2 2
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolMapper.xml
  17. 4 4
      menduner/menduner-flames-biz/src/main/resources/mapper/SchoolStatisticsMapper.xml
  18. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentExperienceMapper.xml
  19. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentInternshipReportMapper.xml
  20. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentJobIntentionMapper.xml
  21. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentLanguageMapper.xml
  22. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentMapper.xml
  23. 0 0
      menduner/menduner-flames-biz/src/main/resources/mapper/StudentRecommendationMapper.xml
  24. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/StudnetAwardExperienceMapper.xml
  25. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/StudnetSampleMapper.xml
  26. 3 3
      menduner/menduner-flames-biz/src/main/resources/mapper/UserAuthRecordMapper.xml
  27. 0 29
      menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentInternshipReportMapper.xml
  28. 0 37
      menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentMapper.xml
  29. 0 19
      menduner/menduner-flames-biz/src/main/resources/mybatis/mybatis-config.xml

+ 2 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/PraciceSubmitRecordServiceImpl.java

@@ -100,8 +100,8 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
             BeanUtils.copyProperties(item, praciceSubmitRecordInfoVo);
             praciceSubmitRecordInfoVo.setStudentInfoVo(studentService.setStudentDetail(item.getStudentId()));
             praciceSubmitRecordInfoVo.setStudent(null != praciceSubmitRecordInfoVo.getStudentInfoVo() ? praciceSubmitRecordInfoVo.getStudentInfoVo().getStudent() : null);
-            praciceSubmitRecordInfoVo.setEnterprise(enterpriseService.getEnterpriseById(item.getEnterpriseId()));
-            praciceSubmitRecordInfoVo.setEnterpriseRecruit(enterpriseRecruitService.getEnterpriseRecruitById(item.getEnterpriseRecruitId()));
+//            praciceSubmitRecordInfoVo.setEnterprise(enterpriseService.getEnterpriseById(item.getEnterpriseId()));
+//            praciceSubmitRecordInfoVo.setEnterpriseRecruit(enterpriseRecruitService.getEnterpriseRecruitById(item.getEnterpriseRecruitId()));
             res.add(praciceSubmitRecordInfoVo);
         });
         page.setRecords(res);

+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/AdvertisementMessageMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/AdvertisementMessageMapper.xml


+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/CommentAnalysisMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/CommentAnalysisMapper.xml

@@ -1,10 +1,10 @@
 <?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.digitalparadigm.flames.mapper.CommentAnalysisMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.CommentAnalysisMapper">
 
-    <resultMap id="commentAnalysisInfoVoMap" type="com.citupro.flames.vo.CommentAnalysisInfoVo">
-        <association property="entity"  resultMap="com.digitalparadigm.flames.mapper.CommentAnalysisMapper.mybatis-plus_CommentAnalysis"></association>
+    <resultMap id="commentAnalysisInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.CommentAnalysisInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.CommentAnalysisMapper.mybatis-plus_CommentAnalysis"></association>
         </resultMap>
 
 

+ 0 - 0
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/CommentMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/CommentMapper.xml


+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/EnterpriseHotspotsMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseHotspotsMapper.xml


+ 2 - 2
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/EnterpriseMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseMapper.xml

@@ -1,7 +1,7 @@
 <?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.citupro.flames.mapper.EnterpriseMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.EnterpriseMapper">
 
 
     <select id="commentAvgeStatistics" resultType="java.util.Map">
@@ -35,7 +35,7 @@
 
 
     </select>
-    <select id="studentInternshipEnterpriseDept" resultType="com.citupro.flames.vo.StudentInternshipEnterpriseDeptVo">
+    <select id="studentInternshipEnterpriseDept" resultType="com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipEnterpriseDeptVo">
    select a.* from (
         SELECT
             practice_submit_record.practice_submit_record_id AS practiceSubmitRecordId ,

+ 4 - 4
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/EnterpriseRecruitPlanMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseRecruitPlanMapper.xml

@@ -1,11 +1,11 @@
 <?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.citupro.flames.mapper.EnterpriseRecruitPlanMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.EnterpriseRecruitPlanMapper">
 
-    <resultMap id="enterpriseRecruitPlanInfoVoMap" type="com.citupro.flames.vo.EnterpriseRecruitPlanInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.EnterpriseRecruitPlanMapper.mybatis-plus_EnterpriseRecruitPlan"></association>
-            <association property="enterpriseRecruit"  resultMap="com.citupro.flames.mapper.EnterpriseRecruitMapper.mybatis-plus_EnterpriseRecruit"></association>
+    <resultMap id="enterpriseRecruitPlanInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitPlanInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.EnterpriseRecruitPlanMapper.mybatis-plus_EnterpriseRecruitPlan"></association>
+            <association property="enterpriseRecruit"  resultMap="com.citupro.module.menduner.flames.mapper.EnterpriseRecruitMapper.mybatis-plus_EnterpriseRecruit"></association>
         </resultMap>
 
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/EnterpriseRecruitTagMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/EnterpriseRecruitTagMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.EnterpriseRecruitTagMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.EnterpriseRecruitTagMapper">
 
-    <resultMap id="enterpriseRecruitTagInfoVoMap" type="com.citupro.flames.vo.EnterpriseRecruitTagInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.EnterpriseRecruitTagMapper.mybatis-plus_EnterpriseRecruitTag"></association>
+    <resultMap id="enterpriseRecruitTagInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitTagInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.EnterpriseRecruitTagMapper.mybatis-plus_EnterpriseRecruitTag"></association>
         </resultMap>
 
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/FeedbackMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/FeedbackMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.FeedbackMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.FeedbackMapper">
 
-    <resultMap id="feedbackInfoVoMap" type="com.citupro.flames.vo.FeedbackInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.FeedbackMapper.mybatis-plus_Feedback"></association>
+    <resultMap id="feedbackInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.FeedbackInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.FeedbackMapper.mybatis-plus_Feedback"></association>
         </resultMap>
 
 

+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/JobDictionaryMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/JobDictionaryMapper.xml


+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/MessageMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/MessageMapper.xml


+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/SchoolClassMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolClassMapper.xml


+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/SchoolDepartmentMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolDepartmentMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.SchoolDepartmentMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.SchoolDepartmentMapper">
 
-    <resultMap id="schoolDepartmentInfoVoMap" type="com.citupro.flames.vo.SchoolDepartmentInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.SchoolDepartmentMapper.mybatis-plus_SchoolDepartment"></association>
+    <resultMap id="schoolDepartmentInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.SchoolDepartmentInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.SchoolDepartmentMapper.mybatis-plus_SchoolDepartment"></association>
         </resultMap>
 
 

+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/SchoolEnterpriseChoiceActivityJoinMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolEnterpriseChoiceActivityJoinMapper.xml


+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/SchoolEnterpriseVisitorMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolEnterpriseVisitorMapper.xml


+ 2 - 2
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/SchoolMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolMapper.xml

@@ -1,7 +1,7 @@
 <?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.citupro.flames.mapper.SchoolMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.SchoolMapper">
 
     <select id="getSchoolOrganization" resultType="java.util.Map">
         SELECT
@@ -21,7 +21,7 @@
         student.school_department_name,
         student.school_class_id
     </select>
-    <select id="schoolStudentDetail" resultType="com.citupro.flames.resp.school.SchoolStudentDetailRespVo">
+    <select id="schoolStudentDetail" resultType="com.citupro.module.menduner.flames.controller.base.respvo.school.SchoolStudentDetailRespVo">
         SELECT
             if(record.`status` = 2,'实习中',if(record.`status` is null ,'未投递','待实习')) as status,
             student.student_name ,

+ 4 - 4
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/SchoolStatisticsMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/SchoolStatisticsMapper.xml

@@ -1,7 +1,7 @@
 <?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.citupro.flames.mapper.SchoolStatisticsMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.SchoolStatisticsMapper">
 
 
     <select id="schoolStudentInternshipDetail" resultType="java.util.Map">
@@ -40,7 +40,7 @@
             </if>
 
     </select>
-    <select id="schoolEnterpriseDetail" resultType="com.citupro.flames.vo.SchoolEnterpriseStatisticsDetail">
+    <select id="schoolEnterpriseDetail" resultType="com.citupro.module.menduner.flames.controller.base.vo.SchoolEnterpriseStatisticsDetail">
         select
             student.*,
             if( now()>practice_submit_record.internship_end_date,'实习结束', if( now() >= practice_submit_record.job_join_date,'实习中','等待实习' ) )as internship_status,
@@ -59,7 +59,7 @@
           and enterprise.enterprise_id=#{param.enterpriseId}
     </select>
     <select id="schoolInternshipStatusDetail"
-            resultType="com.citupro.flames.vo.SchoolEnterpriseStatisticsDetail">
+            resultType="com.citupro.module.menduner.flames.controller.base.vo.SchoolEnterpriseStatisticsDetail">
         select
             student.*,
             if( now()>practice_submit_record.internship_end_date,'实习结束', if( now() >= practice_submit_record.job_join_date,'实习中','等待实习' ) ) as internship_status,
@@ -82,7 +82,7 @@
 
     </select>
     <select id="schoolInternshipReportDetail"
-            resultType="com.citupro.flames.vo.SchoolInternshipReportDetailVo">
+            resultType="com.citupro.module.menduner.flames.controller.base.vo.SchoolInternshipReportDetailVo">
         select
              student.*,
              DATE_FORMAT(student_internship_report.create_date,'%Y-%m') as `month`,

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentExperienceMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentExperienceMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.StudentExperienceMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.StudentExperienceMapper">
 
-    <resultMap id="studentExperienceInfoVoMap" type="com.citupro.flames.vo.StudentExperienceInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudentExperienceMapper.mybatis-plus_StudentExperience"></association>
+    <resultMap id="studentExperienceInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.StudentExperienceInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.StudentExperienceMapper.mybatis-plus_StudentExperience"></association>
         </resultMap>
 
 

+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/StudentInternshipReportMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentInternshipReportMapper.xml


+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentJobIntentionMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentJobIntentionMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.StudentJobIntentionMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.StudentJobIntentionMapper">
 
-    <resultMap id="studentJobIntentionInfoVoMap" type="com.citupro.flames.vo.StudentJobIntentionInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudentJobIntentionMapper.mybatis-plus_StudentJobIntention"></association>
+    <resultMap id="studentJobIntentionInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.StudentJobIntentionInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.StudentJobIntentionMapper.mybatis-plus_StudentJobIntention"></association>
         </resultMap>
 
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentLanguageMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentLanguageMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.StudentLanguageMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.StudentLanguageMapper">
 
-    <resultMap id="studentLanguageInfoVoMap" type="com.citupro.flames.vo.StudentLanguageInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudentLanguageMapper.mybatis-plus_StudentLanguage"></association>
+    <resultMap id="studentLanguageInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.StudentLanguageInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.StudentLanguageMapper.mybatis-plus_StudentLanguage"></association>
         </resultMap>
 
 

+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/StudentMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentMapper.xml


+ 0 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/StudentRecommendationMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudentRecommendationMapper.xml


+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudnetAwardExperienceMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudnetAwardExperienceMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.StudnetAwardExperienceMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.StudnetAwardExperienceMapper">
 
-    <resultMap id="studnetAwardExperienceInfoVoMap" type="com.citupro.flames.vo.StudnetAwardExperienceInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudnetAwardExperienceMapper.mybatis-plus_StudnetAwardExperience"></association>
+    <resultMap id="studnetAwardExperienceInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.StudnetAwardExperienceInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.StudnetAwardExperienceMapper.mybatis-plus_StudnetAwardExperience"></association>
         </resultMap>
 
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudnetSampleMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/StudnetSampleMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.StudnetSampleMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.StudnetSampleMapper">
 
-    <resultMap id="studnetSampleInfoVoMap" type="com.citupro.flames.vo.StudnetSampleInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudnetSampleMapper.mybatis-plus_StudnetSample"></association>
+    <resultMap id="studnetSampleInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.StudnetSampleInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.StudnetSampleMapper.mybatis-plus_StudnetSample"></association>
         </resultMap>
 
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/UserAuthRecordMapper.xml → menduner/menduner-flames-biz/src/main/resources/mapper/UserAuthRecordMapper.xml

@@ -1,10 +1,10 @@
 <?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.citupro.flames.mapper.UserAuthRecordMapper">
+<mapper namespace="com.citupro.module.menduner.flames.mapper.UserAuthRecordMapper">
 
-    <resultMap id="userAuthRecordInfoVoMap" type="com.citupro.flames.vo.UserAuthRecordInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.UserAuthRecordMapper.mybatis-plus_UserAuthRecord"></association>
+    <resultMap id="userAuthRecordInfoVoMap" type="com.citupro.module.menduner.flames.controller.base.vo.UserAuthRecordInfoVo">
+        <association property="entity"  resultMap="com.citupro.module.menduner.flames.mapper.UserAuthRecordMapper.mybatis-plus_UserAuthRecord"></association>
         </resultMap>
 
 

+ 0 - 29
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentInternshipReportMapper.xml

@@ -1,29 +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.citupro.flames.mapper.StudentInternshipReportMapper">
-
-    <resultMap id="studentInternshipReportInfoVoMap" type="com.citupro.flames.vo.StudentInternshipReportInfoVo">
-        <association property="entity"  resultMap="com.citupro.flames.mapper.StudentInternshipReportMapper.mybatis-plus_StudentInternshipReport"></association>
-            <association property="student"  resultMap="com.citupro.flames.mapper.StudentMapper.mybatis-plus_Student"></association>
-            <association property="school"  resultMap="com.citupro.flames.mapper.SchoolMapper.mybatis-plus_School"></association>
-            <association property="enterprise"  resultMap="com.citupro.flames.mapper.EnterpriseMapper.mybatis-plus_Enterprise"></association>
-        </resultMap>
-
-
-        <select id="studentInternshipReportDetail" resultMap="studentInternshipReportInfoVoMap">
-            select * from
-                student_internship_report
-                            left join  student  on   student_internship_report.student_internship_report_id = student.student_id
-                            left join  school  on   student_internship_report.student_internship_report_id = school.school_id
-                            left join  enterprise  on   student_internship_report.student_internship_report_id = enterprise.enterprise_id
-                        <where>
-                student_internship_report.student_internship_report_id = #{studentInternshipReportId}
-
-            </where>
-
-        </select>
-
-
-
-</mapper>

+ 0 - 37
menduner/menduner-flames-biz/src/main/resources/mybatis/mapper/StudentMapper.xml

@@ -1,37 +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.citupro.flames.mapper.StudentMapper">
-<!--// mybatis-plus_SchoolCooperateEnterprise-->
-    <resultMap id="studentInfoVoMap" type="com.citupro.flames.vo.StudentInfoVo">
-        <association property="major" column="major_id" resultMap="com.citupro.flames.mapper.MajorMapper.mybatis-plus_Major"></association>
-        <association property="student" column="student_id" resultMap="com.citupro.flames.mapper.StudentMapper.mybatis-plus_Student"></association>
-        <association property="school" resultMap="com.citupro.flames.mapper.SchoolMapper.mybatis-plus_School"></association>
-        <association property="schoolClass"  resultMap="com.citupro.flames.mapper.SchoolClassMapper.mybatis-plus_SchoolClass"></association>
-        <association property="studentBiographicalNotes" resultMap="com.citupro.flames.mapper.StudentBiographicalNotesMapper.mybatis-plus_StudentBiographicalNotes"></association>
-        <association property="schoolDepartment" resultMap="com.citupro.flames.mapper.SchoolDepartmentMapper.mybatis-plus_SchoolDepartment"></association>
-
-        <!--        <result ty></result>-->
-    </resultMap>
-
-
-
-    <select id="selectStudentDetail"  resultMap="studentInfoVoMap">
-        SELECT
-            *
-        FROM
-            student
-                LEFT JOIN school ON student.school_id = school.school_id
-                LEFT JOIN major ON student.student_major_id = major.major_id
-                LEFT JOIN school_class ON student.school_class_id = school_class.school_class_id
-                LEFT JOIN student_biographical_notes ON student.student_id = student_biographical_notes.student_id
-                LEFT JOIN school_department ON student.school_department_name = school_department.department_title  and  student.school_id = school_department.school_id
-        where
-                  <if test="null!=studentIds">
-                      student.student_id  in
-                      <foreach collection="studentIds" item="item" separator="," open="(" close=")">
-                          #{item}
-                      </foreach>
-                  </if>
-    </select>
-</mapper>

+ 0 - 19
menduner/menduner-flames-biz/src/main/resources/mybatis/mybatis-config.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE configuration
-        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration >
-    <settings>
-        <!--开启二级缓存-->
-        <setting name="cacheEnabled" value="true"/>
-<!--        <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
-<!--        <setting name="logImpl" value="LOG4J" />-->
-
-
-        <!--        <setting name="logImpl" value="STDOUT_LOGGING"/>-->
-<!--        <setting name="returnInstanceForEmptyRow" value="true"/>-->
-    </settings>
-
-</configuration>
-