diff --git a/src/main/java/com/zcloud/controller/bus/IdeRepositoryController.java b/src/main/java/com/zcloud/controller/bus/IdeRepositoryController.java index 6d39c54..1065508 100644 --- a/src/main/java/com/zcloud/controller/bus/IdeRepositoryController.java +++ b/src/main/java/com/zcloud/controller/bus/IdeRepositoryController.java @@ -522,7 +522,7 @@ public class IdeRepositoryController extends BaseController { */ @RequestMapping(value="/excelModel") public void exportExcelModel(HttpServletResponse response) throws Exception{ - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "ideRepositoryExcelTemplate.xls", "风险辨识资源库模板.xls"); + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "ideRepositoryExcelTemplate.xls", "风险辨识资源库模板.xls"); } /**导出到excel * @param diff --git a/src/main/java/com/zcloud/controller/eduBus/PaperQuestionController.java b/src/main/java/com/zcloud/controller/eduBus/PaperQuestionController.java index ad46178..b13ed22 100644 --- a/src/main/java/com/zcloud/controller/eduBus/PaperQuestionController.java +++ b/src/main/java/com/zcloud/controller/eduBus/PaperQuestionController.java @@ -282,7 +282,7 @@ public class PaperQuestionController extends BaseController { */ @RequestMapping(value="/downExcel") public void downExcel(HttpServletResponse response)throws Exception{ - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "paperQuestionExcelTemplate.xls", "习题导入模板.xls"); + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "paperQuestionExcelTemplate.xls", "习题导入模板.xls"); } /**列表(根据阶段考试所选课件范围获取习题数据) diff --git a/src/main/java/com/zcloud/controller/eduBus/QuestionController.java b/src/main/java/com/zcloud/controller/eduBus/QuestionController.java index ab22a80..6af3572 100644 --- a/src/main/java/com/zcloud/controller/eduBus/QuestionController.java +++ b/src/main/java/com/zcloud/controller/eduBus/QuestionController.java @@ -321,7 +321,7 @@ public class QuestionController extends BaseController { */ @RequestMapping(value = "/downExcel") public void downExcel(HttpServletResponse response) throws Exception { - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "questionExcelTemplate.xls", "习题导入模板.xls"); + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "questionExcelTemplate.xls", "习题导入模板.xls"); } /** diff --git a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java index 71af416..6bf9ac8 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java @@ -346,7 +346,7 @@ public class ClassController extends BaseController { WordToPdfUtil.docToPdf(PathUtil.getProjectpath() + Const.FILEPATHFILE + "安全生产教育培训动态评估报告-" + now + ".docx", PathUtil.getProjectpath() + Const.FILEPATHFILE + "安全生产教育培训动态评估报告-" + now + ".pdf"); - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "安全生产教育培训动态评估报告-" + now + ".pdf", "安全生产教育培训动态评估报告.pdf"); //删除本地word pdf File word = new File(PathUtil.getProjectpath() + Const.FILEPATHFILE + "安全生产教育培训动态评估报告-" + now + ".docx"); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java index 9fe951f..5727a92 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java @@ -192,7 +192,7 @@ public class CommonController extends BaseController { */ @RequestMapping(value="/excelModel") public void exportExcelModel(HttpServletResponse response) throws Exception{ - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "hiddenDangerCheckStandardTemplate.xls", "隐患排查标准模板.xls"); + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "hiddenDangerCheckStandardTemplate.xls", "隐患排查标准模板.xls"); } @RequestMapping("importExcel") diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 148c310..9af2dbf 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -626,7 +626,7 @@ public class UsersController extends BaseController { */ @RequestMapping(value="/downExcel") public void downExcel(HttpServletResponse response)throws Exception{ - FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "Users.xls", "Users.xls"); + FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATH_LOCAL + "Users.xls", "Users.xls"); } /**从EXCEL导入到数据库 diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index f5a5b58..c3aa289 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -27,6 +27,7 @@ public class Const { public static final String SYSSET = "config/sysSet.ini"; //系统设置配置文件路径 public static final String SYSNAME = "sysName"; //系统名称 public static final String SHOWCOUNT = "showCount"; //每页条数 + public static final String FILEPATH_LOCAL = "/uploadFiles/file/"; //本地文件模板 public static final String FILEPATHFILE = "/TrafficFile/uploadFiles/file/"; //文件上传路径 public static final String BIFILEPATHFILE = "/TrafficFile/uploadFiles/Bfile/"; //文件上传路径 diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index 8dd9203..a863a66 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -162,6 +162,7 @@ public class HttpRequestUtil { // connection.setRequestProperty("connection", "Keep-Alive"); // connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); + System.out.println(httpUrl); System.out.println(param); //拼装参数 if (null != param && !param.equals("")) { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 8afbcd9..98b5cb5 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,19 +1,19 @@ #\u6570\u636E\u6E901 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=Mysql@zcloud33071 #\u6570\u636E\u6E902(\u9ED8\u8BA4\u6CA1\u7528\uFF0C\u4FE9\u5730\u5740\u5199\u4E00\u6837\u5373\u53EF) datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=Mysql@zcloud33071 #\u6570\u636E\u6E903 datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no3.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no3.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no3.username=root -datasource.no3.password=root +datasource.no3.password=Mysql@zcloud33071 #druid\u8FDE\u63A5\u6C60 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource @@ -62,19 +62,6 @@ spring.main.banner-mode=off #web.front-path=h:/ #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} -#\u6B63\u5F0F -#customer.id=LAZ-20221129-3 -#customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 -customer.url=https://api.qhdsafety.com/sync/ -#customer.domain=yth.qhdsafety.com - - -#\u5F00\u53D1 -customer.id=LAZ-20221124-2 -customer.SECRET_KEY=2f703da369e342db9fe2fc9114c4967f -#customer.url=http://192.168.0.18:8997/sync/ -customer.domain=test.qhdsafety.com - # RocketMQ NameServer diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3f87af7..83b2599 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,13 @@ server.port=7080 #\u5F00\u53D1 spring.profiles.active=dev -#\u6D4B\u8BD5 +##\u6D4B\u8BD5 #spring.profiles.active=debug ##\u6B63\u5F0F #spring.profiles.active=master + +#\u6B63\u5F0F \u4EA4\u901A +customer.id=LAZ-20240614-31 +customer.SECRET_KEY=8847ac2c63d8499f98e3a7494ddff09a +customer.url=https://api.qhdsafety.com/sync/ +customer.domain=tszs.qhdsafety.com diff --git a/src/main/resources/mybatis/dsno3/eduBus/ChapterMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/ChapterMapper.xml index 5339c30..164878a 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/ChapterMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/ChapterMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CorpPeopleCountMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CorpPeopleCountMapper.xml index 0c1181b..8cfa34e 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CorpPeopleCountMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CorpPeopleCountMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -81,7 +81,7 @@ SELECT c.CLASS_ID,pt.POSTTYPE_ID,it.`NAME` INDUSTRYNAME,pt.`NAME` POSTTYPENAME,c.TRAINLEVEL,it.INDUSTRYTYPE_ID FROM bus_class c LEFT JOIN bus_post_type pt ON pt.POSTTYPE_ID = c.POSTTYPE AND pt.ISDELETE = '0' - LEFT JOIN bus_industry_type it ON it.INDUSTRYTYPE_ID = SUBSTRING_INDEX(c.INDUSTRY_ALL_TYPE,',',1) AND + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE it ON it.INDUSTRYTYPE_ID = SUBSTRING_INDEX(c.INDUSTRY_ALL_TYPE,',',1) AND it.ISDELETE = '0' WHERE CORPINFO_ID = #{pd.CORPINFO_ID} AND c.ISDELETE ='0' diff --git a/src/main/resources/mybatis/dsno3/eduBus/CourseExamMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CourseExamMapper.xml index c935de7..3e93318 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CourseExamMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CourseExamMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -125,7 +125,7 @@ ,p.QUESTIONNUM from f - LEFT JOIN sys_user u ON u.USER_ID = f.USER_ID + LEFT JOIN `qa-traffic-prevention`.SYS_USER u ON u.USER_ID = f.USER_ID LEFT JOIN BUS_COURSEPAPERS p ON p.COURSEPAPERS_ID = f.COURSEPAPERS_ID where f.COURSEEXAM_ID = #{COURSEEXAM_ID} diff --git a/src/main/resources/mybatis/dsno3/eduBus/CourseExamRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CourseExamRecordMapper.xml index b793db2..a742d08 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CourseExamRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CourseExamRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CourseStudentRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CourseStudentRelationMapper.xml index 9a9c20d..0082945 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CourseStudentRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CourseStudentRelationMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -137,7 +137,7 @@ WHERE c.CURRICULUM_ID = #{pd.CURRICULUM_ID} AND c.USER_ID = f.USER_ID AND c.ISDELETE='0' ORDER BY c.EXAMTIME DESC LIMIT 1) COURSEEXAM_ID from f - LEFT JOIN sys_user u ON u.USER_ID = f.USER_ID + LEFT JOIN `qa-traffic-prevention`.SYS_USER u ON u.USER_ID = f.USER_ID where f.ISDELETE = '0' and f.CURRICULUM_ID = #{pd.CURRICULUM_ID} and f.CORPINFO_ID = #{pd.CORPINFO_ID} and diff --git a/src/main/resources/mybatis/dsno3/eduBus/CourseStudyMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CourseStudyMapper.xml index 14e19b7..913901b 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CourseStudyMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CourseStudyMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CoursectkMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CoursectkMapper.xml index 89f2409..0ea5a3b 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CoursectkMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CoursectkMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CoursemiddleMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CoursemiddleMapper.xml index 5b36173..aca9742 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CoursemiddleMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CoursemiddleMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CoursepapersMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CoursepapersMapper.xml index 0ff06cf..6479612 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CoursepapersMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CoursepapersMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CourserecordMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CourserecordMapper.xml index 67128c6..b9bb92a 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CourserecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CourserecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CoursewareRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CoursewareRelationMapper.xml index 0a4ddf5..a316aee 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CoursewareRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CoursewareRelationMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/CurriculumMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/CurriculumMapper.xml index a5bb22a..80c4268 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/CurriculumMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/CurriculumMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -181,7 +181,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID where f.CURRICULUM_ID = #{CURRICULUM_ID} @@ -220,7 +220,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID where f.ISDELETE = '0' and ( f.VALID_DATE IS NULL or f.VALID_DATE = '' or f.VALID_DATE >= DATE_FORMAT(NOW(),'%Y-%m-%d') ) diff --git a/src/main/resources/mybatis/dsno3/eduBus/DataCoursewareMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/DataCoursewareMapper.xml index 2241ac2..11c29ff 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/DataCoursewareMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/DataCoursewareMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -132,8 +132,8 @@ ,dic2.name as train_type_name from f - LEFT JOIN sys_dictionaries dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE where f.DATACOURSEWARE_ID = #{DATACOURSEWARE_ID} @@ -150,8 +150,8 @@ f LEFT JOIN BUS_KCMIDDLEKJ g on g.CURRICULUMID = f.DATACOURSEWARE_ID AND g.COURSEWARETYPE = '2' AND g.ISDELETE = '0' LEFT JOIN BUS_STAGEEXAMPAPERCOURSEWARE h on h.COURSEWARE_ID = f.DATACOURSEWARE_ID AND h.COURSEWARETYPE = '2' AND h.ISDELETE = '0' - LEFT JOIN sys_dictionaries dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE LEFT JOIN BUS_TEACHER ts on f.SPEAKER = ts.TEACHER_ID where f.ISDELETE = '0' @@ -277,8 +277,8 @@ from f LEFT JOIN BUS_KCMIDDLEKJ k ON k.COURSEWAREID = f.DATACOURSEWARE_ID - LEFT JOIN sys_dictionaries dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE LEFT JOIN BUS_TEACHER ts on f.SPEAKER = ts.TEACHER_ID where f.ISDELETE = '0' and k.CURRICULUMID = #{CURRICULUMID} diff --git a/src/main/resources/mybatis/dsno3/eduBus/IndustryTypeMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/IndustryTypeMapper.xml index 05150bd..b21db14 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/IndustryTypeMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/IndustryTypeMapper.xml @@ -4,12 +4,12 @@ - BUS_INDUSTRY_TYPE + `qa-traffic-prevention`.BUS_INDUSTRY_TYPE - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionCacheMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionCacheMapper.xml index f5ae797..e21b481 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionCacheMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionCacheMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionMapper.xml index 8e576e1..4430664 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/PaperQuestionMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/PostTypeMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/PostTypeMapper.xml index 423e11e..04ee7bd 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/PostTypeMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/PostTypeMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/PrivateTrainingTypeMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/PrivateTrainingTypeMapper.xml index 55a8d5e..4b190de 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/PrivateTrainingTypeMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/PrivateTrainingTypeMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/QuestionMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/QuestionMapper.xml index 7dd7687..ef56907 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/QuestionMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/QuestionMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -198,7 +198,7 @@ f left join BUS_VIDEOCOURSEWARE v on f.COURSEWAREID = v.VIDEOCOURSEWARE_ID and v.ISDELETE = '0' - left join sys_dictionaries lt on lt.DICTIONARIES_ID = f.LABEL_TYPE + left join `qa-traffic-prevention`.SYS_DICTIONARIES lt on lt.DICTIONARIES_ID = f.LABEL_TYPE - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -132,7 +132,7 @@ ,p.QUESTIONNUM from f - LEFT JOIN sys_user u ON u.USER_ID = f.USER_ID + LEFT JOIN `qa-traffic-prevention`.SYS_USER u ON u.USER_ID = f.USER_ID LEFT JOIN BUS_STAGEEXAMPAPER p ON p.STAGEEXAMPAPER_ID = f.STAGEEXAMPAPER_ID where f.STAGEEXAM_ID = #{STAGEEXAM_ID} @@ -208,7 +208,7 @@ ,p.QUESTIONNUM from f - LEFT JOIN sys_user u ON u.USER_ID = f.USER_ID + LEFT JOIN `qa-traffic-prevention`.SYS_USER u ON u.USER_ID = f.USER_ID LEFT JOIN BUS_STAGEEXAMPAPER p ON p.STAGEEXAMPAPER_ID = f.STAGEEXAMPAPER_ID where f.STUDYTASK_ID = #{STUDYTASK_ID} AND f.STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID} AND f.USER_ID = #{USER_ID} diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperCoursewareMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperCoursewareMapper.xml index fae57d6..1f0a183 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperCoursewareMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperCoursewareMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperInputQuestionMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperInputQuestionMapper.xml index 6e4b7fa..cf99c0a 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperInputQuestionMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperInputQuestionMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperQuestionMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperQuestionMapper.xml index 00653d6..1fb012b 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperQuestionMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageExamPaperQuestionMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageExamRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageExamRecordMapper.xml index dd220b6..eba6ddc 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageExamRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageExamRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageStudentRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageStudentRelationMapper.xml index 6da03d1..2ee2860 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageStudentRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageStudentRelationMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -121,7 +121,7 @@ from f - LEFT JOIN SYS_USER u on f.USER_ID = u.USER_ID + LEFT JOIN `qa-traffic-prevention`.SYS_USER u on f.USER_ID = u.USER_ID LEFT JOIN d on d.DICTIONARIES_ID = u.LEARNERCATEGORY AND d.parent_id = '532282f9c48346b8b646531909c739df' where f.ISDELETE = '0' and f.STAGEEXAMPAPER_ID = #{pd.STAGEEXAMPAPER_ID} @@ -145,11 +145,11 @@ ,stu.SUM_CLASSHOUR as SUM_CLASSHOUR from f - left join SYS_USER u on u.USER_ID = f.USER_ID - left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID - left join SYS_USERINFO i on i.USER_ID = f.USER_ID - left join sys_dictionaries x on x.DICTIONARIES_ID = i.SEX - left join sys_post p on p.POST_ID = u.POST_ID and p.ISDELETE = '0' and p.STATUS = '0' + left join `qa-traffic-prevention`.SYS_USER u on u.USER_ID = f.USER_ID + left join `qa-traffic-prevention`.OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID + left join `qa-traffic-prevention`.SYS_USERINFO i on i.USER_ID = f.USER_ID + left join `qa-traffic-prevention`.SYS_DICTIONARIES x on x.DICTIONARIES_ID = i.SEX + left join `qa-traffic-prevention`.SYS_POST p on p.POST_ID = u.POST_ID and p.ISDELETE = '0' and p.STATUS = '0' left join bus_studytask stu on stu.STUDYTASK_ID = f.STUDYTASK_ID where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} @@ -343,8 +343,8 @@ f INNER JOIN BUS_STUDYTASK t ON t.STUDYTASK_ID = f.STUDYTASK_ID AND t.ISDELETE = '0' LEFT JOIN BUS_STAGEEXAMPAPER p ON p.STAGEEXAMPAPER_ID = f.STAGEEXAMPAPER_ID AND p.ISDELETE = '0' - LEFT JOIN sys_dictionaries dic1 ON dic1.DICTIONARIES_ID = t.POSTTYPE - LEFT JOIN sys_dictionaries dic2 ON dic2.DICTIONARIES_ID = t.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 ON dic1.DICTIONARIES_ID = t.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 ON dic2.DICTIONARIES_ID = t.TRAINTYPE where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND f.USER_ID = #{pd.USER_ID} diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageexammiddleMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageexammiddleMapper.xml index f2693fe..7d9f145 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageexammiddleMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageexammiddleMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperCacheMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperCacheMapper.xml index 067b352..b73e749 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperCacheMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperCacheMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperInputMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperInputMapper.xml index 6bf6517..78ead7d 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperInputMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperInputMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -226,9 +226,9 @@ f LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE - LEFT JOIN BUS_INDUSTRY_TYPE i1 on i1.INDUSTRYTYPE_ID = f.INDUSTRY1 - LEFT JOIN BUS_INDUSTRY_TYPE i2 on i2.INDUSTRYTYPE_ID = f.INDUSTRY2 - LEFT JOIN BUS_INDUSTRY_TYPE i3 on i3.INDUSTRYTYPE_ID = f.INDUSTRY3 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i1 on i1.INDUSTRYTYPE_ID = f.INDUSTRY1 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i2 on i2.INDUSTRYTYPE_ID = f.INDUSTRY2 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i3 on i3.INDUSTRYTYPE_ID = f.INDUSTRY3 LEFT JOIN BUS_TRAIN_LEVEL_TYPE tl on tl.TRAINLEVEL_ID = f.TRAINLEVEL where f.STAGEEXAMPAPERINPUT_ID = #{STAGEEXAMPAPERINPUT_ID} @@ -250,9 +250,9 @@ f LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE - LEFT JOIN BUS_INDUSTRY_TYPE i1 on i1.INDUSTRYTYPE_ID = f.INDUSTRY1 - LEFT JOIN BUS_INDUSTRY_TYPE i2 on i2.INDUSTRYTYPE_ID = f.INDUSTRY2 - LEFT JOIN BUS_INDUSTRY_TYPE i3 on i3.INDUSTRYTYPE_ID = f.INDUSTRY3 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i1 on i1.INDUSTRYTYPE_ID = f.INDUSTRY1 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i2 on i2.INDUSTRYTYPE_ID = f.INDUSTRY2 + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE i3 on i3.INDUSTRYTYPE_ID = f.INDUSTRY3 LEFT JOIN BUS_TRAIN_LEVEL_TYPE tl on tl.TRAINLEVEL_ID = f.TRAINLEVEL LEFT JOIN BUS_POST_PAPER pp on pp.STAGEEXAMPAPERINPUT_ID = f.STAGEEXAMPAPERINPUT_ID and pp.ISDELETE = '0' where f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperMapper.xml index 92249b8..c8608d0 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperPrivatizationMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperPrivatizationMapper.xml index b0e68ed..3bae373 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StageexampaperPrivatizationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StageexampaperPrivatizationMapper.xml @@ -127,7 +127,7 @@ f.* from f - LEFT JOIN BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID + LEFT JOIN `qa-traffic-prevention`.BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID where f.CORPINFO_ID = #{CORPINFO_ID} and f.STAGEEXAMPAPERINPUT_ID = #{STAGEEXAMPAPERINPUT_ID} and f.ISDELETE = 0 diff --git a/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamMapper.xml index 5664239..19a8ae4 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamRecordMapper.xml index 193d5f3..377a9ae 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StrengthenExamRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StrengthenPaperQuestionMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StrengthenPaperQuestionMapper.xml index b077922..e759df3 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StrengthenPaperQuestionMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StrengthenPaperQuestionMapper.xml @@ -7,7 +7,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StrengthenStageExamPaperInputMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StrengthenStageExamPaperInputMapper.xml index 9114de1..13a561b 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StrengthenStageExamPaperInputMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StrengthenStageExamPaperInputMapper.xml @@ -7,7 +7,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StudyTaskMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StudyTaskMapper.xml index dea4752..a6f20a9 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StudyTaskMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StudyTaskMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -140,8 +140,8 @@ ,dic2.name as train_type_name from f - LEFT JOIN sys_dictionaries dic1 ON dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 ON dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 ON dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 ON dic2.DICTIONARIES_ID = f.TRAINTYPE left join bus_stageexampaper p on p.STUDYTASK_ID=f.STUDYTASK_ID where f.STUDYTASK_ID = #{STUDYTASK_ID} @@ -158,8 +158,8 @@ (SELECT count(*) FROM bus_stagestudentrelation s3 WHERE s3.STUDYTASK_ID = f.STUDYTASK_ID and s3.STAGEEXAMSCORE > '-1') AS cj -- 参加考试人数 from f - LEFT JOIN sys_dictionaries dic1 ON dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 ON dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 ON dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 ON dic2.DICTIONARIES_ID = f.TRAINTYPE LEFT JOIN BUS_STAGEEXAMPAPER st on st.STUDYTASK_ID = f.STUDYTASK_ID where 1=1 @@ -313,8 +313,8 @@ FROM bus_stagestudentrelation f LEFT JOIN BUS_STUDYTASK s ON s.STUDYTASK_ID = f.STUDYTASK_ID - LEFT JOIN sys_dictionaries dic1 ON dic1.DICTIONARIES_ID = s.POSTTYPE - LEFT JOIN sys_dictionaries dic2 ON dic2.DICTIONARIES_ID = s.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 ON dic1.DICTIONARIES_ID = s.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 ON dic2.DICTIONARIES_ID = s.TRAINTYPE LEFT JOIN BUS_STAGEEXAMPAPER st ON st.STUDYTASK_ID = f.STUDYTASK_ID LEFT JOIN BUS_COURSESTUDYVIDEORECORD co ON co.STUDYTASK_ID = f.STUDYTASK_ID and co.USER_ID = f.USER_ID AND co.PLAYCOUNT = 0 WHERE diff --git a/src/main/resources/mybatis/dsno3/eduBus/StudytaskCurriculumMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StudytaskCurriculumMapper.xml index a60983a..20c309c 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StudytaskCurriculumMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StudytaskCurriculumMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/StudytaskSignMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/StudytaskSignMapper.xml index 7a9a714..892e99e 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/StudytaskSignMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/StudytaskSignMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -145,7 +145,7 @@ ,u.USER_SIGN_FILE_PATH from f - LEFT JOIN sys_userinfo u on u.USER_ID = f.user_id + LEFT JOIN `qa-traffic-prevention`.SYS_USERINFO u on u.USER_ID = f.user_id where 1=1 and f.STUDYTASK_ID = #{STUDYTASK_ID} diff --git a/src/main/resources/mybatis/dsno3/eduBus/TeacherCertificateMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/TeacherCertificateMapper.xml index 2da74ea..32a9c0b 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/TeacherCertificateMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/TeacherCertificateMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/TeacherMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/TeacherMapper.xml index 1f886a8..f4ad638 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/TeacherMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/TeacherMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/TrainLevelTypeMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/TrainLevelTypeMapper.xml index 854e355..e1ac01a 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/TrainLevelTypeMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/TrainLevelTypeMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/TrainingTypeMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/TrainingTypeMapper.xml index d23f497..8666c1f 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/TrainingTypeMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/TrainingTypeMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduBus/VideoCoursewareMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/VideoCoursewareMapper.xml index 844d3a8..3145ade 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/VideoCoursewareMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/VideoCoursewareMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -202,7 +202,7 @@ f LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID LEFT JOIN BUS_TEACHER ts on f.SPEAKER = ts.TEACHER_ID where f.VIDEOCOURSEWARE_ID = #{VIDEOCOURSEWARE_ID} @@ -267,7 +267,7 @@ f LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE - LEFT JOIN BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID LEFT JOIN BUS_TEACHER ts on f.SPEAKER = ts.TEACHER_ID LEFT JOIN (SELECT COURSEWAREID,count(1) QUESTIONCOUNT from BUS_QUESTION where ISDELETE = '0' GROUP BY COURSEWAREID) bq on bq.COURSEWAREID = f.VIDEOCOURSEWARE_ID @@ -482,8 +482,8 @@ from f LEFT JOIN BUS_KCMIDDLEKJ k ON k.COURSEWAREID = f.VIDEOCOURSEWARE_ID - LEFT JOIN sys_dictionaries dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE - LEFT JOIN sys_dictionaries dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic1 on dic1.DICTIONARIES_ID = f.POSTTYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES dic2 on dic2.DICTIONARIES_ID = f.TRAINTYPE LEFT JOIN BUS_TEACHER ts on f.SPEAKER = ts.TEACHER_ID where f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduBus/VideocoursewareRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduBus/VideocoursewareRecordMapper.xml index bd973fa..64698a7 100644 --- a/src/main/resources/mybatis/dsno3/eduBus/VideocoursewareRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduBus/VideocoursewareRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassAccountMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassAccountMapper.xml index db70abc..cb346ea 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassAccountMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassAccountMapper.xml @@ -11,7 +11,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -150,7 +150,7 @@ left join bus_class_account ca on cal.CLASS_ACCOUNT_ID = ca.CLASS_ACCOUNT_ID left join bus_class c on ca.CLASS_ID = c.CLASS_ID LEFT JOIN bus_enterprise be ON be.ENTERPRISE_ID = c.ENTERPRISE_ID - LEFT JOIN BUS_CORP_INFO ci ON ci.CORPINFO_ID = c.CORPINFO_ID + LEFT JOIN `qa-traffic-prevention`.BUS_CORP_INFO ci ON ci.CORPINFO_ID = c.CORPINFO_ID and ( ci.NAME LIKE CONCAT(CONCAT('%', #{pd.CORPINFO_NAME}),'%') ) diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml index 26e97cd..36493c8 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml @@ -114,7 +114,7 @@ LEFT JOIN bus_teacher t on t.TEACHER_ID = cv.SPEAKER LEFT JOIN BUS_POST_TYPE pt on pt.POSTTYPE_ID = cv.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE tt on tt.TRAININGTYPE_ID = cv.TRAINTYPE - LEFT JOIN BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = cv.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = cv.INDUSTRY_END_ID where f.ISDELETE = '0' and f.VIDEOCOURSEWARE_ID is not null and f.VIDEOCOURSEWARE_ID != '' diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumMapper.xml index fc7c4f5..924ab27 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumMapper.xml @@ -11,7 +11,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -60,8 +60,8 @@ ) cvv ON cvv.CURRICULUM_ID = f.CURRICULUM_ID LEFT JOIN BUS_CURRICULUM c on c.CURRICULUM_ID = f.CURRICULUM_ID lEFT JOIN BUS_CURRICULUM_POST cp on cp.ISDELETE = '0' AND cp.CURRICULUM_ID = f.CURRICULUM_ID AND cp.CLASS_ID = f.CLASS_ID - lEFT JOIN OA_DEPARTMENT d on d.DEPARTMENT_ID = cp.DEPARTMENT_ID - lEFT JOIN SYS_POST p on p.POST_ID = cp.POST_ID + lEFT JOIN `qa-traffic-prevention`.OA_DEPARTMENT d on d.DEPARTMENT_ID = cp.DEPARTMENT_ID + lEFT JOIN `qa-traffic-prevention`.SYS_POST p on p.POST_ID = cp.POST_ID left join ( SELECT c.CLASS_ID, diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml index fb615f3..3148c74 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml @@ -11,7 +11,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -134,12 +134,12 @@ f LEFT JOIN BUS_POST_TYPE p ON p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t ON t.TRAININGTYPE_ID = f.TRAINTYPE - LEFT JOIN sys_dictionaries sd1 ON sd1.BIANMA = f.PROVINCE - LEFT JOIN sys_dictionaries sd2 ON sd2.BIANMA = f.CITY - LEFT JOIN sys_dictionaries sd3 ON sd3.BIANMA = f.COUNTY - LEFT JOIN sys_dictionaries sd4 ON sd4.BIANMA = f.VILLAGE - LEFT JOIN sys_dictionaries sd5 ON sd5.BIANMA = f.STREET - LEFT JOIN bus_corp_info ci ON ci.CORPINFO_ID = f.CORPINFO_ID + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES sd1 ON sd1.BIANMA = f.PROVINCE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES sd2 ON sd2.BIANMA = f.CITY + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES sd3 ON sd3.BIANMA = f.COUNTY + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES sd4 ON sd4.BIANMA = f.VILLAGE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES sd5 ON sd5.BIANMA = f.STREET + LEFT JOIN `qa-traffic-prevention`.BUS_CORP_INFO ci ON ci.CORPINFO_ID = f.CORPINFO_ID LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt ON tlt.TRAINLEVEL_ID = f.TRAINLEVEL LEFT JOIN(SELECT COUNT(1) num,s.CLASS_ID FROM BUS_STUDENT s WHERE s.ISDELETE = '0' GROUP BY s.CLASS_ID ) students ON students.CLASS_ID = f.CLASS_ID @@ -246,10 +246,10 @@ f LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE - left join bus_corp_info bci on f.CORPINFO_ID = bci.CORPINFO_ID + left join `qa-traffic-prevention`.BUS_CORP_INFO bci on f.CORPINFO_ID = bci.CORPINFO_ID LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID WHERE f.CLASS_ID = #{CLASS_ID} @@ -270,7 +270,7 @@ FROM f LEFT JOIN BUS_POST_TYPE p ON p.POSTTYPE_ID = f.POSTTYPE - LEFT JOIN BUS_CORP_INFO c ON c.CORPINFO_ID = f.CORPINFO_ID + LEFT JOIN `qa-traffic-prevention`.BUS_CORP_INFO c ON c.CORPINFO_ID = f.CORPINFO_ID LEFT JOIN BUS_TRAINING_TYPE t ON t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt ON tlt.TRAINLEVEL_ID = f.TRAINLEVEL LEFT JOIN(SELECT COUNT(1) num,s.CLASS_ID FROM BUS_STUDENT s WHERE s.ISDELETE = '0' GROUP BY s.CLASS_ID ) students ON students.CLASS_ID = f.CLASS_ID @@ -318,7 +318,7 @@ LEFT JOIN BUS_STAGESTUDENTRELATION s ON s.STUDENT_ID = f.STUDENT_ID LEFT JOIN - SYS_USERINFO ui on ui.USER_ID = f.USER_ID + `qa-traffic-prevention`.SYS_USERINFO ui on ui.USER_ID = f.USER_ID LEFT JOIN (SELECT i.STUDENT_ID,GROUP_CONCAT(i.FILEPATH) FACES FROM bus_faceimglog i LEFT JOIN bus_student bs on bs.STUDENT_ID = i.STUDENT_ID diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassPostMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassPostMapper.xml index e43a7f4..39307a8 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassPostMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassPostMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyRecordMapper.xml index 0ea1bc9..bd41ffb 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyVideoRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyVideoRecordMapper.xml index aee032c..d65c084 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyVideoRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CourseStudyVideoRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumCacheMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumCacheMapper.xml index 032ddb2..47255bb 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumCacheMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumCacheMapper.xml @@ -9,7 +9,7 @@ - sys_dictionaries + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -181,7 +181,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID where f.CURRICULUM_ID = #{CURRICULUM_ID} @@ -221,7 +221,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID where f.ISDELETE = '0' and ( f.VALID_DATE IS NULL or f.VALID_DATE >= DATE_FORMAT(NOW(),'%Y-%m-%d') ) diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPostMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPostMapper.xml index 346fc79..458e715 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPostMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPostMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPrivateMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPrivateMapper.xml index 587bf26..8713f0a 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPrivateMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumPrivateMapper.xml @@ -117,7 +117,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID LEFT JOIN bus_private_curriculum pc on pc.CURRICULUM_ID = f.CURRICULUM_ID where f.ISDELETE = '0' and pc.ISDELETE = 0 and ( f.VALID_DATE IS NULL @@ -195,7 +195,7 @@ LEFT JOIN BUS_POST_TYPE p on p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t on t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = f.TRAINLEVEL - LEFT JOIN bus_industry_type lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID + LEFT JOIN `qa-traffic-prevention`.BUS_INDUSTRY_TYPE lei ON lei.INDUSTRYTYPE_ID = f.INDUSTRY_END_ID where f.ISDELETE = '0' and ( f.VALID_DATE IS NULL or f.VALID_DATE >= DATE_FORMAT(NOW(),'%Y-%m-%d') ) diff --git a/src/main/resources/mybatis/dsno3/eduStudy/DockingCurriculumMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/DockingCurriculumMapper.xml index 93e8ba7..66c446e 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/DockingCurriculumMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/DockingCurriculumMapper.xml @@ -8,10 +8,7 @@ - f - . - DOCKINGCOURSES_ID - , + f.DOCKINGCOURSES_ID, f.CURRICULUM_SALES_RECORDS_ID, f.CURRICULUM_ID, f.CURRICULUM_NAME, @@ -30,8 +27,7 @@ - DOCKINGCOURSES_ID - , + DOCKINGCOURSES_ID, CURRICULUM_SALES_RECORDS_ID, CURRICULUM_ID, CURRICULUM_NAME, @@ -50,8 +46,7 @@ - #{DOCKINGCOURSES_ID} - , + #{DOCKINGCOURSES_ID}, #{CURRICULUM_SALES_RECORDS_ID}, #{CURRICULUM_ID}, #{CURRICULUM_NAME}, diff --git a/src/main/resources/mybatis/dsno3/eduStudy/FaceImgLogMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/FaceImgLogMapper.xml index 9133dbf..dcdb708 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/FaceImgLogMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/FaceImgLogMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/PostPaperMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/PostPaperMapper.xml index f096cc2..bf4c9f3 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/PostPaperMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/PostPaperMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StageExamMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StageExamMapper.xml index e4f95fc..598279f 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StageExamMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StageExamMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StageExamRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StageExamRecordMapper.xml index c74941b..1fc2784 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StageExamRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StageExamRecordMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml index e5bc12c..27e87ec 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml @@ -50,7 +50,7 @@ BUS_STAGEEXAMRECORD f LEFT JOIN bus_paper_question q ON q.PAPER_QUESTION_ID = f.PAPER_QUESTION_ID LEFT JOIN bus_videocourseware v on v.VIDEOCOURSEWARE_ID = q.VIDEOCOURSEWARE_ID - LEFT JOIN SYS_DICTIONARIES d on d.DICTIONARIES_ID = q.LABEL_TYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES d on d.DICTIONARIES_ID = q.LABEL_TYPE where f.ISDELETE = '0' AND f.STAGEEXAM_ID = #{STAGEEXAM_ID} diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentCorpInfoMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentCorpInfoMapper.xml index e3e8a35..c1e5956 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentCorpInfoMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentCorpInfoMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -101,7 +101,7 @@ bus_studentcorpinfo f LEFT JOIN BUS_STAGESTUDENTRELATION ssr ON ssr.USER_ID = f.USER_ID AND ssr.ISDELETE = '0' - LEFT JOIN BUS_CORP_INFO ci ON ci.CORPINFO_ID = f.CORPINFO_ID + LEFT JOIN `qa-traffic-prevention`.BUS_CORP_INFO ci ON ci.CORPINFO_ID = f.CORPINFO_ID AND ci.ISDELETE = '0' WHERE f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentLogInfoMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentLogInfoMapper.xml index 93f7288..4c172af 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentLogInfoMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentLogInfoMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentLogMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentLogMapper.xml index b627d60..89271b0 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentLogMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentLogMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index 56a44be..ea0cc08 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -9,7 +9,7 @@ - SYS_DICTIONARIES + `qa-traffic-prevention`.SYS_DICTIONARIES @@ -229,7 +229,7 @@ s.NAME SEX_NAME, ct.NAME CERTIFICATETYPE_NAME, doe.NAME DEGREE_OF_EDUCATION_NAME, - (SELECT GROUP_CONCAT(pt.NAME) from sys_dictionaries pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) + (SELECT GROUP_CONCAT(pt.NAME) from `qa-traffic-prevention`.SYS_DICTIONARIES pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME, ci.CORP_NAME, d.NAME DEPARTMENT_NAME, @@ -237,12 +237,12 @@ from f - left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX - left join sys_dictionaries ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE - left join sys_dictionaries doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION - left join bus_corp_info ci on ci.CORPINFO_ID = f.CORPINFO_ID and ci.ISDELETE = '0' - left join oa_department d on d.DEPARTMENT_ID = f.DEPARTMENT_ID - left join sys_post p on p.POST_ID = f.POST_ID + left join `qa-traffic-prevention`.SYS_DICTIONARIES s on s.DICTIONARIES_ID = f.SEX + left join `qa-traffic-prevention`.SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE + left join `qa-traffic-prevention`.SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION + left join `qa-traffic-prevention`.BUS_CORP_INFO ci on ci.CORPINFO_ID = f.CORPINFO_ID and ci.ISDELETE = '0' + left join `qa-traffic-prevention`.OA_DEPARTMENT d on d.DEPARTMENT_ID = f.DEPARTMENT_ID + left join `qa-traffic-prevention`.SYS_POST p on p.POST_ID = f.POST_ID where f.STUDENT_ID = #{STUDENT_ID} @@ -280,12 +280,12 @@ from f - left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX - left join sys_dictionaries ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE - left join sys_dictionaries doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION - left join bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' + left join `qa-traffic-prevention`.SYS_DICTIONARIES s on s.DICTIONARIES_ID = f.SEX + left join `qa-traffic-prevention`.SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE + left join `qa-traffic-prevention`.SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION + left join `qa-traffic-prevention`.BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' left join bus_studentlog sl on sl.USER_ID = f.USER_ID and sl.ISDELETE = '0' - left join sys_user u on u.user_id = f.user_id + left join `qa-traffic-prevention`.SYS_USER u on u.user_id = f.user_id where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -346,11 +346,11 @@ from f - LEFT JOIN SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE - LEFT JOIN SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION - LEFT JOIN SYS_USERINFO ui on ui.user_id = f.user_id + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE + LEFT JOIN `qa-traffic-prevention`.SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION + LEFT JOIN `qa-traffic-prevention`.SYS_USERINFO ui on ui.user_id = f.user_id LEFT JOIN BUS_STAGESTUDENTRELATION ssr on ssr.STUDENT_ID = f.STUDENT_ID and ssr.ISDELETE = '0' - LEFT JOIN SYS_USER operator on operator.USER_ID = f.OPERATOR + LEFT JOIN `qa-traffic-prevention`.SYS_USER operator on operator.USER_ID = f.OPERATOR LEFT JOIN BUS_CLASS c on c.CLASS_ID = f.CLASS_ID LEFT JOIN bus_stageexam AS ex ON f.STUDENT_ID = ex.STUDENT_ID AND ex.ISDELETE = 0 LEFT JOIN bus_stageexampaper_input sei ON ex.STAGEEXAMPAPER_ID = sei.STAGEEXAMPAPERINPUT_ID @@ -417,7 +417,7 @@ s.NAME SEX_NAME, ct.NAME CERTIFICATETYPE_NAME, doe.NAME DEGREE_OF_EDUCATION_NAME, - (SELECT GROUP_CONCAT(pt.NAME) from sys_dictionaries pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) + (SELECT GROUP_CONCAT(pt.NAME) from `qa-traffic-prevention`.SYS_DICTIONARIES pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME, ( select @@ -445,12 +445,12 @@ from f - left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX - left join sys_dictionaries ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE - left join sys_dictionaries doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION - left join bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' + left join `qa-traffic-prevention`.SYS_DICTIONARIES s on s.DICTIONARIES_ID = f.SEX + left join `qa-traffic-prevention`.SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE + left join `qa-traffic-prevention`.SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION + left join `qa-traffic-prevention`.BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' left join bus_studentlog sl on sl.USER_ID = f.USER_ID and sl.ISDELETE = '0' - left join sys_user u on u.user_id = f.user_id + left join `qa-traffic-prevention`.SYS_USER u on u.user_id = f.user_id where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -558,12 +558,12 @@ s.NAME SEX_NAME, ct.NAME CERTIFICATETYPE_NAME, doe.NAME DEGREE_OF_EDUCATION_NAME, - (SELECT GROUP_CONCAT(pt.NAME) from sys_dictionaries pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME + (SELECT GROUP_CONCAT(pt.NAME) from `qa-traffic-prevention`.SYS_DICTIONARIES pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME from f - left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX - left join sys_dictionaries ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE - left join sys_dictionaries doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION + left join `qa-traffic-prevention`.SYS_DICTIONARIES s on s.DICTIONARIES_ID = f.SEX + left join `qa-traffic-prevention`.SYS_DICTIONARIES ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE + left join `qa-traffic-prevention`.SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION where @@ -584,7 +584,7 @@ s.NAME SEX_NAME, ct.NAME CERTIFICATETYPE_NAME, doe.NAME DEGREE_OF_EDUCATION_NAME, - (SELECT GROUP_CONCAT(pt.NAME) from sys_dictionaries pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME + (SELECT GROUP_CONCAT(pt.NAME) from `qa-traffic-prevention`.SYS_DICTIONARIES pt where FIND_IN_SET(pt.DICTIONARIES_ID , f.PERSONNEL_TYPE)) PERSONNEL_TYPE_NAME from f left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX @@ -633,10 +633,10 @@ left join sys_dictionaries s on s.DICTIONARIES_ID = f.SEX left join sys_dictionaries ct on ct.DICTIONARIES_ID = f.CERTIFICATETYPE left join sys_dictionaries doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION - left join bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' - left join sys_post sp on sp.POST_ID = f.POST_ID - left join sys_user u on u.user_id = f.user_id - left join oa_department o on o.DEPARTMENT_ID = f.DEPARTMENT_ID + left join `qa-traffic-prevention`.BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID and c.ISDELETE = '0' + left join `qa-traffic-prevention`.SYS_POST sp on sp.POST_ID = f.POST_ID + left join `qa-traffic-prevention`.SYS_USER u on u.user_id = f.user_id + left join `qa-traffic-prevention`.OA_DEPARTMENT o on o.DEPARTMENT_ID = f.DEPARTMENT_ID left join sys_dictionaries pt on pt.DICTIONARIES_ID = f.PERSONNEL_TYPE left join sys_dictionaries du on du.DICTIONARIES_ID = f.DUTIES left join sys_dictionaries ma on ma.DICTIONARIES_ID = f.MAJOR @@ -656,7 +656,7 @@ ,b.CORP_NAME as CORPINFO_NAME from f - left join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID + left join `qa-traffic-prevention`.BUS_CORP_INFO b on f.CORPINFO_ID = b.CORPINFO_ID where f.ISDELETE = '0' and f.USER_ID = #{pd.USER_ID} @@ -693,11 +693,11 @@ sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID from f - left join sys_user u on f.USER_ID = u.USER_ID + left join `qa-traffic-prevention`.SYS_USER u on f.USER_ID = u.USER_ID left join dic1 on f.DEGREE_OF_EDUCATION = dic1.DICTIONARIES_ID left join dic2 on f.PERSONNEL_TYPE = dic2.DICTIONARIES_ID - left join oa_department dep on f.DEPARTMENT_ID = dep.DEPARTMENT_ID - left join sys_post post on f.POST_ID = post.POST_ID + left join `qa-traffic-prevention`.OA_DEPARTMENT dep on f.DEPARTMENT_ID = dep.DEPARTMENT_ID + left join `qa-traffic-prevention`.SYS_POST post on f.POST_ID = post.POST_ID left join bus_class c on f.CLASS_ID = c.CLASS_ID left join (select * from bus_stagestudentrelation where STAGEEXAMSTATE = '3') bsr on bsr.STUDENT_ID = f.STUDENT_ID left join bus_strengthenstudentrelation sst on sst.STUDENT_ID = f.STUDENT_ID