From 82e441dde30b220041a86c796f7c48ef3da14442 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 20 Oct 2022 11:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=85=B3=E8=81=94=E5=BA=94?=
=?UTF-8?q?=E7=94=A8;=20=E5=BC=80=E8=AF=BE=E5=85=B3=E8=81=94=E5=BA=94?=
=?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data_base_design/天泽数据大平台.pdb | 100 ++--
data_base_design/天泽数据大平台.pdm | 96 ++--
doc/sql/mysql/tianze-pro.sql | 114 +++--
.../ApplicationMergeTeacherOpenCourseDao.java | 16 +-
.../ApplicationMergeTeacherOpenCourse.java | 83 ++--
.../jlw/entity/TeacherMergeApplication.java | 62 +--
...licationMergeTeacherOpenCourseService.java | 13 +-
...ationMergeTeacherOpenCourseController.java | 34 +-
...pplicationMergeTeacherOpenCourseQuery.java | 68 +--
.../query/TeacherMergeApplicationQuery.java | 54 +--
.../jlw/applicationMergeTeacherOpenCourse.md | 427 ++++++++++--------
.../sql/jlw/teacherMergeApplication.md | 116 ++---
.../applicationMergeTeacherOpenCourseApi.js | 2 +-
.../applicationMergeTeacherOpenCourse/del.js | 4 +-
.../applicationMergeTeacherOpenCourse/edit.js | 2 +-
.../index.js | 33 +-
.../js/jlw/teacherMergeApplication/index.js | 22 +-
.../add.html | 18 +-
.../edit.html | 18 +-
.../index.html | 8 +-
.../jlw/teacherMergeApplication/add.html | 18 +-
.../jlw/teacherMergeApplication/edit.html | 18 +-
22 files changed, 697 insertions(+), 629 deletions(-)
diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb
index 6c2bc4cb..d62bf4bc 100644
--- a/data_base_design/天泽数据大平台.pdb
+++ b/data_base_design/天泽数据大平台.pdb
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666191778" Name="cjks" Objects="1119" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666237010" Name="cjks" Objects="1108" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4265,9 +4265,9 @@ Shadow=0</a:DisplayPreferences>
</o:ExtendedDependencySymbol>
<o:ExtendedDependencySymbol Id="o16">
<a:CreationDate>1661955362</a:CreationDate>
-<a:ModificationDate>1665583780</a:ModificationDate>
-<a:Rect>((257615,7320), (262115,11182))</a:Rect>
-<a:ListOfPoints>((262115,7320),(259865,7320),(259865,10882),(257615,10882))</a:ListOfPoints>
+<a:ModificationDate>1666236804</a:ModificationDate>
+<a:Rect>((257615,7296), (262115,11182))</a:Rect>
+<a:ListOfPoints>((262115,7296),(259865,7296),(259865,10882),(257615,10882))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5751,9 +5751,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o17">
<a:CreationDate>1661954272</a:CreationDate>
-<a:ModificationDate>1665583780</a:ModificationDate>
+<a:ModificationDate>1666236804</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((255091,-912), (269139,7794))</a:Rect>
+<a:Rect>((255091,-1350), (269139,7794))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -13740,8 +13740,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>application_merge_teacher_open_course</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957518</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666236873</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用-关联-课程开课</a:Comment>
<a:PhysicalOptions>auto_increment = 1
ENGINE = InnoDB
@@ -13763,27 +13763,38 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o727">
<a:ObjectID>8B4781AD-1C56-4EAF-B87B-96616E614557</a:ObjectID>
-<a:Name>application_id</a:Name>
-<a:Code>application_id</a:Code>
+<a:Name>resources_application_id</a:Name>
+<a:Code>resources_application_id</a:Code>
<a:CreationDate>1661952562</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954224</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666237010</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o728">
<a:ObjectID>ECFE6701-B33B-495B-9A39-76D948538571</a:ObjectID>
-<a:Name>open_course_id</a:Name>
-<a:Code>open_course_id</a:Code>
+<a:Name>teacher_open_course_id</a:Name>
+<a:Code>teacher_open_course_id</a:Code>
<a:CreationDate>1661852621</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954438</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666237010</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>教师开课ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o729">
+<a:ObjectID>849A0316-E7DE-4865-900B-397446B53FEA</a:ObjectID>
+<a:Name>application_merge_teacher_open_course_add_time</a:Name>
+<a:Code>application_merge_teacher_open_course_add_time</a:Code>
+<a:CreationDate>1661957411</a:CreationDate>
+<a:Creator>lx</a:Creator>
+<a:ModificationDate>1666236873</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
+<a:Comment>创建时间</a:Comment>
+<a:DataType>datetime</a:DataType>
+</o:Column>
+<o:Column Id="o730">
<a:ObjectID>D1622BA3-8F97-47B6-B66D-C0D5846BA82A</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@@ -13794,7 +13805,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o730">
+<o:Column Id="o731">
<a:ObjectID>E9B394A3-A4CB-4E5D-93B2-CE4E06A604DC</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@@ -13805,17 +13816,6 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o731">
-<a:ObjectID>849A0316-E7DE-4865-900B-397446B53FEA</a:ObjectID>
-<a:Name>create_time</a:Name>
-<a:Code>create_time</a:Code>
-<a:CreationDate>1661957411</a:CreationDate>
-<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957518</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
-<a:Comment>创建时间</a:Comment>
-<a:DataType>datetime</a:DataType>
-</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o732">
@@ -13841,7 +13841,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>teacher_merge_application</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1662449601</a:ModificationDate>
+<a:ModificationDate>1666236799</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>教师-关联-我的应用</a:Comment>
<a:PhysicalOptions>auto_increment = 1
@@ -13875,28 +13875,39 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o735">
<a:ObjectID>22993B49-BDC1-4984-BCA4-8D0C2163DC8F</a:ObjectID>
-<a:Name>application_id</a:Name>
-<a:Code>application_id</a:Code>
+<a:Name>resources_application_id</a:Name>
+<a:Code>resources_application_id</a:Code>
<a:CreationDate>1661952562</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954272</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666236997</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o736">
<a:ObjectID>B51DEA23-319E-4889-A33B-C391127D2E91</a:ObjectID>
-<a:Name>order_index</a:Name>
-<a:Code>order_index</a:Code>
+<a:Name>teacher_merge_application_order_index</a:Name>
+<a:Code>teacher_merge_application_order_index</a:Code>
<a:CreationDate>1662449574</a:CreationDate>
<a:Creator>87966</a:Creator>
-<a:ModificationDate>1662449601</a:ModificationDate>
+<a:ModificationDate>1666236799</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>排序</a:Comment>
<a:DataType>int(2)</a:DataType>
<a:Length>2</a:Length>
</o:Column>
<o:Column Id="o737">
+<a:ObjectID>39E3CCB8-1F2E-480C-BC34-E1D5723259D6</a:ObjectID>
+<a:Name>teacher_merge_application_add_time</a:Name>
+<a:Code>teacher_merge_application_add_time</a:Code>
+<a:CreationDate>1661957411</a:CreationDate>
+<a:Creator>lx</a:Creator>
+<a:ModificationDate>1666236799</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
+<a:Comment>创建时间</a:Comment>
+<a:DataType>datetime</a:DataType>
+</o:Column>
+<o:Column Id="o738">
<a:ObjectID>B56C59D5-A21C-4832-866F-FD9E67461758</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@@ -13907,7 +13918,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o738">
+<o:Column Id="o739">
<a:ObjectID>90141AF2-C0D4-45F0-867B-36EC93D3CD8B</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@@ -13918,17 +13929,6 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o739">
-<a:ObjectID>39E3CCB8-1F2E-480C-BC34-E1D5723259D6</a:ObjectID>
-<a:Name>create_time</a:Name>
-<a:Code>create_time</a:Code>
-<a:CreationDate>1661957411</a:CreationDate>
-<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957508</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
-<a:Comment>创建时间</a:Comment>
-<a:DataType>datetime</a:DataType>
-</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o740">
@@ -13992,9 +13992,9 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>teacher_open_course_school_class_merge_student_join_type</a:Code>
<a:CreationDate>1666191638</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1666191768</a:ModificationDate>
+<a:ModificationDate>1666191805</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
-<a:Comment>加入类型 （枚举 openCourseMergeJoinTypeEnum）</a:Comment>
+<a:Comment>加入类型 （枚举 OpenCourseMergeJoinTypeEnum）</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm
index af4ac7e0..d62bf4bc 100644
--- a/data_base_design/天泽数据大平台.pdm
+++ b/data_base_design/天泽数据大平台.pdm
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666191805" Name="cjks" Objects="1119" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666237010" Name="cjks" Objects="1108" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4265,9 +4265,9 @@ Shadow=0</a:DisplayPreferences>
</o:ExtendedDependencySymbol>
<o:ExtendedDependencySymbol Id="o16">
<a:CreationDate>1661955362</a:CreationDate>
-<a:ModificationDate>1665583780</a:ModificationDate>
-<a:Rect>((257615,7320), (262115,11182))</a:Rect>
-<a:ListOfPoints>((262115,7320),(259865,7320),(259865,10882),(257615,10882))</a:ListOfPoints>
+<a:ModificationDate>1666236804</a:ModificationDate>
+<a:Rect>((257615,7296), (262115,11182))</a:Rect>
+<a:ListOfPoints>((262115,7296),(259865,7296),(259865,10882),(257615,10882))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5751,9 +5751,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o17">
<a:CreationDate>1661954272</a:CreationDate>
-<a:ModificationDate>1665583780</a:ModificationDate>
+<a:ModificationDate>1666236804</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((255091,-912), (269139,7794))</a:Rect>
+<a:Rect>((255091,-1350), (269139,7794))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -13740,8 +13740,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>application_merge_teacher_open_course</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957518</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666236873</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用-关联-课程开课</a:Comment>
<a:PhysicalOptions>auto_increment = 1
ENGINE = InnoDB
@@ -13763,27 +13763,38 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o727">
<a:ObjectID>8B4781AD-1C56-4EAF-B87B-96616E614557</a:ObjectID>
-<a:Name>application_id</a:Name>
-<a:Code>application_id</a:Code>
+<a:Name>resources_application_id</a:Name>
+<a:Code>resources_application_id</a:Code>
<a:CreationDate>1661952562</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954224</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666237010</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o728">
<a:ObjectID>ECFE6701-B33B-495B-9A39-76D948538571</a:ObjectID>
-<a:Name>open_course_id</a:Name>
-<a:Code>open_course_id</a:Code>
+<a:Name>teacher_open_course_id</a:Name>
+<a:Code>teacher_open_course_id</a:Code>
<a:CreationDate>1661852621</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954438</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666237010</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>教师开课ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o729">
+<a:ObjectID>849A0316-E7DE-4865-900B-397446B53FEA</a:ObjectID>
+<a:Name>application_merge_teacher_open_course_add_time</a:Name>
+<a:Code>application_merge_teacher_open_course_add_time</a:Code>
+<a:CreationDate>1661957411</a:CreationDate>
+<a:Creator>lx</a:Creator>
+<a:ModificationDate>1666236873</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
+<a:Comment>创建时间</a:Comment>
+<a:DataType>datetime</a:DataType>
+</o:Column>
+<o:Column Id="o730">
<a:ObjectID>D1622BA3-8F97-47B6-B66D-C0D5846BA82A</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@@ -13794,7 +13805,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o730">
+<o:Column Id="o731">
<a:ObjectID>E9B394A3-A4CB-4E5D-93B2-CE4E06A604DC</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@@ -13805,17 +13816,6 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o731">
-<a:ObjectID>849A0316-E7DE-4865-900B-397446B53FEA</a:ObjectID>
-<a:Name>create_time</a:Name>
-<a:Code>create_time</a:Code>
-<a:CreationDate>1661957411</a:CreationDate>
-<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957518</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
-<a:Comment>创建时间</a:Comment>
-<a:DataType>datetime</a:DataType>
-</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o732">
@@ -13841,7 +13841,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>teacher_merge_application</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1662449601</a:ModificationDate>
+<a:ModificationDate>1666236799</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>教师-关联-我的应用</a:Comment>
<a:PhysicalOptions>auto_increment = 1
@@ -13875,28 +13875,39 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o735">
<a:ObjectID>22993B49-BDC1-4984-BCA4-8D0C2163DC8F</a:ObjectID>
-<a:Name>application_id</a:Name>
-<a:Code>application_id</a:Code>
+<a:Name>resources_application_id</a:Name>
+<a:Code>resources_application_id</a:Code>
<a:CreationDate>1661952562</a:CreationDate>
<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661954272</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:ModificationDate>1666236997</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
<a:Comment>应用ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o736">
<a:ObjectID>B51DEA23-319E-4889-A33B-C391127D2E91</a:ObjectID>
-<a:Name>order_index</a:Name>
-<a:Code>order_index</a:Code>
+<a:Name>teacher_merge_application_order_index</a:Name>
+<a:Code>teacher_merge_application_order_index</a:Code>
<a:CreationDate>1662449574</a:CreationDate>
<a:Creator>87966</a:Creator>
-<a:ModificationDate>1662449601</a:ModificationDate>
+<a:ModificationDate>1666236799</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>排序</a:Comment>
<a:DataType>int(2)</a:DataType>
<a:Length>2</a:Length>
</o:Column>
<o:Column Id="o737">
+<a:ObjectID>39E3CCB8-1F2E-480C-BC34-E1D5723259D6</a:ObjectID>
+<a:Name>teacher_merge_application_add_time</a:Name>
+<a:Code>teacher_merge_application_add_time</a:Code>
+<a:CreationDate>1661957411</a:CreationDate>
+<a:Creator>lx</a:Creator>
+<a:ModificationDate>1666236799</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
+<a:Comment>创建时间</a:Comment>
+<a:DataType>datetime</a:DataType>
+</o:Column>
+<o:Column Id="o738">
<a:ObjectID>B56C59D5-A21C-4832-866F-FD9E67461758</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@@ -13907,7 +13918,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o738">
+<o:Column Id="o739">
<a:ObjectID>90141AF2-C0D4-45F0-867B-36EC93D3CD8B</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@@ -13918,17 +13929,6 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
-<o:Column Id="o739">
-<a:ObjectID>39E3CCB8-1F2E-480C-BC34-E1D5723259D6</a:ObjectID>
-<a:Name>create_time</a:Name>
-<a:Code>create_time</a:Code>
-<a:CreationDate>1661957411</a:CreationDate>
-<a:Creator>lx</a:Creator>
-<a:ModificationDate>1661957508</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
-<a:Comment>创建时间</a:Comment>
-<a:DataType>datetime</a:DataType>
-</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o740">
diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql
index 8fca5d45..f9408cdb 100644
--- a/doc/sql/mysql/tianze-pro.sql
+++ b/doc/sql/mysql/tianze-pro.sql
@@ -17,25 +17,28 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
--- ----------------------------
--- Table structure for application_merge_teacher_open_course
--- ----------------------------
-DROP TABLE IF EXISTS `application_merge_teacher_open_course`;
-CREATE TABLE `application_merge_teacher_open_course` (
- `application_merge_teacher_open_course_id` bigint(20) NOT NULL COMMENT '应用-开课关联ID',
- `application_id` bigint(20) NULL DEFAULT NULL COMMENT '应用ID',
- `open_course_id` bigint(20) NULL DEFAULT NULL COMMENT '教师开课ID',
- `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID',
- `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
- `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
- PRIMARY KEY (`application_merge_teacher_open_course_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '应用-关联-课程开课' ROW_FORMAT = DYNAMIC;
+drop table if exists application_merge_teacher_open_course;
+
+/*==============================================================*/
+/* Table: application_merge_teacher_open_course */
+/*==============================================================*/
+create table application_merge_teacher_open_course
+(
+ application_merge_teacher_open_course_id bigint not null comment '应用-开课关联ID',
+ resources_application_id bigint comment '应用ID',
+ teacher_open_course_id bigint comment '教师开课ID',
+ application_merge_teacher_open_course_add_time datetime comment '创建时间',
+ org_id bigint comment '组织ID',
+ user_id bigint comment '用户ID',
+ primary key (application_merge_teacher_open_course_id)
+)
+auto_increment = 1
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_general_ci;
+
+alter table application_merge_teacher_open_course comment '应用-关联-课程开课';
--- ----------------------------
--- Records of application_merge_teacher_open_course
--- ----------------------------
-INSERT INTO `application_merge_teacher_open_course` VALUES (1565978928894615552, 3, 4, 1, 1, '2022-09-03 00:00:00');
-INSERT INTO `application_merge_teacher_open_course` VALUES (1565979221061443584, 3, 4, 1, 1, '2022-09-03 00:00:00');
-- ----------------------------
-- Table structure for attribute
@@ -28523,25 +28526,29 @@ INSERT INTO `teacher` VALUES (21, 1, '测试单点登录该', NULL, '测试单
INSERT INTO `teacher` VALUES (22, 1, 'tzt001', NULL, 'tzt001', '', '', 1, '123qwe', '2021-09-27 12:27:37.414', 26, 315);
INSERT INTO `teacher` VALUES (23, 1, '马老师', NULL, '马老师', '', '', 1, '123qwe', '2021-09-27 12:27:37.414', 26, 102);
--- ----------------------------
--- Table structure for teacher_merge_application
--- ----------------------------
-DROP TABLE IF EXISTS `teacher_merge_application`;
-CREATE TABLE `teacher_merge_application` (
- `teacher_merge_application_id` bigint(20) NOT NULL COMMENT '教师-应用关联ID',
- `teacher_id` bigint(20) NULL DEFAULT NULL COMMENT '教师ID',
- `application_id` bigint(20) NULL DEFAULT NULL COMMENT '应用ID',
- `order_index` int(11) NULL DEFAULT NULL COMMENT '排序',
- `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID',
- `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
- `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
- PRIMARY KEY (`teacher_merge_application_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '教师-关联-我的应用' ROW_FORMAT = DYNAMIC;
+drop table if exists teacher_merge_application;
+
+/*==============================================================*/
+/* Table: teacher_merge_application */
+/*==============================================================*/
+create table teacher_merge_application
+(
+ teacher_merge_application_id bigint not null comment '教师-应用关联ID',
+ teacher_id bigint comment '教师ID',
+ resources_application_id bigint comment '应用ID',
+ teacher_merge_application_order_index int(2) comment '排序',
+ teacher_merge_application_add_time datetime comment '创建时间',
+ org_id bigint comment '组织ID',
+ user_id bigint comment '用户ID',
+ primary key (teacher_merge_application_id)
+)
+auto_increment = 1
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_general_ci;
+
+alter table teacher_merge_application comment '教师-关联-我的应用';
--- ----------------------------
--- Records of teacher_merge_application
--- ----------------------------
-INSERT INTO `teacher_merge_application` VALUES (1566088348525830144, 1, 1, NULL, 1, 1, '2022-09-03 00:00:00');
-- ----------------------------
-- Table structure for teacher_open_course
@@ -28775,19 +28782,28 @@ CREATE TABLE `teacher_open_course_merge_school_class` (
-- ----------------------------
INSERT INTO `teacher_open_course_merge_school_class` VALUES (1571882799332499456, 1569699665614643200, 1, NULL, NULL, 1, 1);
--- ----------------------------
--- Table structure for teacher_open_course_merge_student
--- ----------------------------
-DROP TABLE IF EXISTS `teacher_open_course_merge_student`;
-CREATE TABLE `teacher_open_course_merge_student` (
- `teacher_open_course_school_class_merge_student_id` bigint(20) NOT NULL COMMENT '课程开课-班级-学生-关联ID',
- `teacher_open_course_id` bigint(20) NULL DEFAULT NULL COMMENT '课程开课ID',
- `student_id` bigint(20) NULL DEFAULT NULL COMMENT '学生ID',
- `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID',
- `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
- `teacher_open_course_school_class_merge_student_add_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
- PRIMARY KEY (`teacher_open_course_school_class_merge_student_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '课程开课-关联-学生' ROW_FORMAT = DYNAMIC;
+/*==============================================================*/
+/* Table: teacher_open_course_merge_student */
+/*==============================================================*/
+create table teacher_open_course_merge_student
+(
+ teacher_open_course_school_class_merge_student_id bigint not null comment '课程开课-班级-学生-关联ID',
+ teacher_open_course_id bigint comment '课程开课ID',
+ teacher_open_course_school_class_merge_student_join_type varchar(50) comment '加入类型 （枚举 OpenCourseMergeJoinTypeEnum）',
+ teacher_open_course_school_class_merge_student_add_time datetime comment '创建时间',
+ teacher_open_course_school_class_merge_student_status int(2) comment '状态 1正常 2删除',
+ student_id bigint comment '学生ID',
+ org_id bigint comment '组织ID',
+ user_id bigint comment '用户ID',
+ primary key (teacher_open_course_school_class_merge_student_id)
+)
+auto_increment = 1
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_merge_student comment '课程开课-关联-学生';
+
-- ----------------------------
-- Records of teacher_open_course_merge_student
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java
index 025df304..c080c82a 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java
@@ -9,18 +9,18 @@ import org.beetl.sql.mapper.annotation.Update;
import java.util.List;
-
/**
- * ApplicationMergeTeacherOpenCourse Dao
+ * 开课关联应用 Dao
*/
@SqlResource("jlw.applicationMergeTeacherOpenCourse")
public interface ApplicationMergeTeacherOpenCourseDao extends BaseMapper<ApplicationMergeTeacherOpenCourse>{
- public PageQuery<ApplicationMergeTeacherOpenCourse> queryByCondition(PageQuery query);
- public PageQuery<ApplicationMergeTeacherOpenCourse> queryByConditionQuery(PageQuery query);
+ PageQuery<ApplicationMergeTeacherOpenCourse> queryByCondition(PageQuery query);
+ PageQuery<ApplicationMergeTeacherOpenCourse> queryByConditionQuery(PageQuery query);
@Update
- public void deleteApplicationMergeTeacherOpenCourseByIds(String ids);
+ void deleteApplicationMergeTeacherOpenCourseByIds(String ids);
@Update
- public int updateGivenByIds(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery);
- public List<ApplicationMergeTeacherOpenCourse> getByIds(String ids);
- public List<ApplicationMergeTeacherOpenCourse> getValuesByQuery(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery);
+ int updateGivenByIds(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery);
+ List<ApplicationMergeTeacherOpenCourse> getByIds(String ids);
+ List<ApplicationMergeTeacherOpenCourse> getValuesByQuery(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery);
+ List<ApplicationMergeTeacherOpenCourse> getValuesByQueryNotWithPermission(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery);
}
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java
index 9f9b7756..d122f3a1 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java
@@ -1,5 +1,6 @@
package com.ibeetl.jlw.entity;
+import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AssignID;
@@ -7,9 +8,9 @@ import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull;
import java.util.Date;
-/*
+/*
* 应用-关联-课程开课
-* gen by Spring Boot2 Admin 2022-09-04
+* gen by Spring Boot2 Admin 2022-10-20
*/
public class ApplicationMergeTeacherOpenCourse extends BaseEntity{
@@ -19,32 +20,34 @@ public class ApplicationMergeTeacherOpenCourse extends BaseEntity{
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse")
private Long applicationMergeTeacherOpenCourseId ;
-
+
//应用ID
+ @Dict(type="resources_application.application_name.1=1")
- private Long applicationId ;
-
+ private Long resourcesApplicationId ;
+
//教师开课ID
+ @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
- private Long openCourseId ;
+ private Long teacherOpenCourseId ;
+
+ //创建时间
+ private Date applicationMergeTeacherOpenCourseAddTime ;
+
//组织ID
private Long orgId ;
-
+
//用户ID
private Long userId ;
-
- //创建时间
-
- private Date createTime ;
-
+
public ApplicationMergeTeacherOpenCourse(){
}
/**应用-开课关联ID
- *@return
+ *@return
*/
public Long getApplicationMergeTeacherOpenCourseId(){
return applicationMergeTeacherOpenCourseId;
@@ -57,33 +60,46 @@ public class ApplicationMergeTeacherOpenCourse extends BaseEntity{
}
/**应用ID
- *@return
+ *@return
*/
- public Long getApplicationId(){
- return applicationId;
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
}
/**应用ID
- *@param applicationId
+ *@param resourcesApplicationId
*/
- public void setApplicationId(Long applicationId){
- this.applicationId = applicationId;
+ public void setResourcesApplicationId(Long resourcesApplicationId){
+ this.resourcesApplicationId = resourcesApplicationId;
}
/**教师开课ID
- *@return
+ *@return
*/
- public Long getOpenCourseId(){
- return openCourseId;
+ public Long getTeacherOpenCourseId(){
+ return teacherOpenCourseId;
}
/**教师开课ID
- *@param openCourseId
+ *@param teacherOpenCourseId
+ */
+ public void setTeacherOpenCourseId(Long teacherOpenCourseId){
+ this.teacherOpenCourseId = teacherOpenCourseId;
+ }
+
+ /**创建时间
+ *@return
+ */
+ public Date getApplicationMergeTeacherOpenCourseAddTime(){
+ return applicationMergeTeacherOpenCourseAddTime;
+ }
+ /**创建时间
+ *@param applicationMergeTeacherOpenCourseAddTime
*/
- public void setOpenCourseId(Long openCourseId){
- this.openCourseId = openCourseId;
+ public void setApplicationMergeTeacherOpenCourseAddTime(Date applicationMergeTeacherOpenCourseAddTime){
+ this.applicationMergeTeacherOpenCourseAddTime = applicationMergeTeacherOpenCourseAddTime;
}
/**组织ID
- *@return
+ *@return
*/
public Long getOrgId(){
return orgId;
@@ -96,7 +112,7 @@ public class ApplicationMergeTeacherOpenCourse extends BaseEntity{
}
/**用户ID
- *@return
+ *@return
*/
public Long getUserId(){
return userId;
@@ -108,18 +124,5 @@ public class ApplicationMergeTeacherOpenCourse extends BaseEntity{
this.userId = userId;
}
- /**创建时间
- *@return
- */
- public Date getCreateTime(){
- return createTime;
- }
- /**创建时间
- *@param createTime
- */
- public void setCreateTime(Date createTime){
- this.createTime = createTime;
- }
-
}
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java
index 4faa266e..b31cb4c4 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java
@@ -30,16 +30,20 @@ public class TeacherMergeApplication extends BaseEntity{
private Long teacherId ;
//应用ID
- @Dict(type="resources_application.resources_application_name.1=1")
+ @Dict(type="resources_application.application_name.1=1")
- private Long applicationId ;
+ private Long resourcesApplicationId ;
- @FetchOne("applicationId")
+ @FetchOne("resourcesApplicationId")
private ResourcesApplication resourcesApplication;
//排序
- private Integer orderIndex ;
+ private Integer teacherMergeApplicationOrderIndex ;
+
+ //创建时间
+
+ private Date teacherMergeApplicationAddTime ;
//组织ID
@@ -49,10 +53,6 @@ public class TeacherMergeApplication extends BaseEntity{
private Long userId ;
- //创建时间
-
- private Date createTime ;
-
public TeacherMergeApplication(){
}
@@ -85,27 +85,40 @@ public class TeacherMergeApplication extends BaseEntity{
/**应用ID
*@return
*/
- public Long getApplicationId(){
- return applicationId;
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
}
/**应用ID
- *@param applicationId
+ *@param resourcesApplicationId
*/
- public void setApplicationId(Long applicationId){
- this.applicationId = applicationId;
+ public void setResourcesApplicationId(Long resourcesApplicationId){
+ this.resourcesApplicationId = resourcesApplicationId;
}
/**排序
*@return
*/
- public Integer getOrderIndex(){
- return orderIndex;
+ public Integer getTeacherMergeApplicationOrderIndex(){
+ return teacherMergeApplicationOrderIndex;
}
/**排序
- *@param orderIndex
+ *@param teacherMergeApplicationOrderIndex
+ */
+ public void setTeacherMergeApplicationOrderIndex(Integer teacherMergeApplicationOrderIndex){
+ this.teacherMergeApplicationOrderIndex = teacherMergeApplicationOrderIndex;
+ }
+
+ /**创建时间
+ *@return
*/
- public void setOrderIndex(Integer orderIndex){
- this.orderIndex = orderIndex;
+ public Date getTeacherMergeApplicationAddTime(){
+ return teacherMergeApplicationAddTime;
+ }
+ /**创建时间
+ *@param teacherMergeApplicationAddTime
+ */
+ public void setTeacherMergeApplicationAddTime(Date teacherMergeApplicationAddTime){
+ this.teacherMergeApplicationAddTime = teacherMergeApplicationAddTime;
}
/**组织ID
@@ -134,19 +147,6 @@ public class TeacherMergeApplication extends BaseEntity{
this.userId = userId;
}
- /**创建时间
- *@return
- */
- public Date getCreateTime(){
- return createTime;
- }
- /**创建时间
- *@param createTime
- */
- public void setCreateTime(Date createTime){
- this.createTime = createTime;
- }
-
public ResourcesApplication getResourcesApplication() {
return resourcesApplication;
diff --git a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java
index 37d74ae6..dd361598 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java
@@ -15,19 +15,20 @@ import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-
/**
- * ApplicationMergeTeacherOpenCourse Service
+ * 开课关联应用 Service
* 当分布式ID开启后请勿使用insert(*,true)
*/
@Service
@Transactional
+@Validated
public class ApplicationMergeTeacherOpenCourseService extends CoreBaseService<ApplicationMergeTeacherOpenCourse>{
@Resource private ApplicationMergeTeacherOpenCourseDao applicationMergeTeacherOpenCourseDao;
@@ -59,7 +60,7 @@ public class ApplicationMergeTeacherOpenCourseService extends CoreBaseService<Ap
try {
applicationMergeTeacherOpenCourseDao.deleteApplicationMergeTeacherOpenCourseByIds(ids);
} catch (Exception e) {
- throw new PlatformException("批量删除ApplicationMergeTeacherOpenCourse失败", e);
+ throw new PlatformException("批量删除开课关联应用失败", e);
}
}
@@ -118,13 +119,17 @@ public class ApplicationMergeTeacherOpenCourseService extends CoreBaseService<Ap
}
public List<ApplicationMergeTeacherOpenCourse> getValues (Object paras){
- return sqlManager.select(SqlId.of("jlw.applicationMergeTeacherOpenCourse.getApplicationMergeTeacherOpenCourseValues"),ApplicationMergeTeacherOpenCourse.class,paras);
+ return sqlManager.select(SqlId.of("jlw.applicationMergeTeacherOpenCourse.getApplicationMergeTeacherOpenCourseValues"), ApplicationMergeTeacherOpenCourse.class, paras);
}
public List<ApplicationMergeTeacherOpenCourse> getValuesByQuery (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){
return applicationMergeTeacherOpenCourseDao.getValuesByQuery(applicationMergeTeacherOpenCourseQuery);
}
+ public List<ApplicationMergeTeacherOpenCourse> getValuesByQueryNotWithPermission (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){
+ return applicationMergeTeacherOpenCourseDao.getValuesByQueryNotWithPermission(applicationMergeTeacherOpenCourseQuery);
+ }
+
public ApplicationMergeTeacherOpenCourse getInfo (Long applicationMergeTeacherOpenCourseId){
ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery = new ApplicationMergeTeacherOpenCourseQuery();
applicationMergeTeacherOpenCourseQuery.setApplicationMergeTeacherOpenCourseId(applicationMergeTeacherOpenCourseId);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java
index 85c087f2..f2c7df2f 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java
@@ -13,23 +13,24 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
-import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.util.List;
/**
- * ApplicationMergeTeacherOpenCourse 应用-关联-课程开课 接口
+ * 开课关联应用 应用-关联-课程开课 接口
* 切记不要对非线程安全的静态变量进行写操作
*/
-@Controller
+@RestController
+@Validated
public class ApplicationMergeTeacherOpenCourseController{
private final Log log = LogFactory.getLog(this.getClass());
@@ -39,13 +40,11 @@ public class ApplicationMergeTeacherOpenCourseController{
@Resource private ApplicationMergeTeacherOpenCourseService applicationMergeTeacherOpenCourseService;
- @Resource
- FileService fileService;
+ @Resource FileService fileService;
/* 前端接口 */
@PostMapping(API + "/getPageList.do")
- @ResponseBody
public JsonResult<PageQuery> getPageList(ApplicationMergeTeacherOpenCourseQuery condition,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
@@ -58,7 +57,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(API + "/getInfo.do")
- @ResponseBody
public JsonResult<ApplicationMergeTeacherOpenCourse>getInfo(ApplicationMergeTeacherOpenCourseQuery param,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
@@ -70,7 +68,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(API + "/getList.do")
- @ResponseBody
public JsonResult<List<ApplicationMergeTeacherOpenCourse>>getList(ApplicationMergeTeacherOpenCourseQuery param,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
@@ -85,7 +82,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(MODEL + "/index.do")
@Function("applicationMergeTeacherOpenCourse.query")
- @ResponseBody
public ModelAndView index() {
ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/index.html") ;
view.addObject("search", ApplicationMergeTeacherOpenCourseQuery.class.getName());
@@ -94,7 +90,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(MODEL + "/edit.do")
@Function("applicationMergeTeacherOpenCourse.edit")
- @ResponseBody
public ModelAndView edit(Long applicationMergeTeacherOpenCourseId) {
ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/edit.html");
ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.queryById(applicationMergeTeacherOpenCourseId);
@@ -104,7 +99,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(MODEL + "/add.do")
@Function("applicationMergeTeacherOpenCourse.add")
- @ResponseBody
public ModelAndView add(Long applicationMergeTeacherOpenCourseId) {
ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/add.html");
if(null != applicationMergeTeacherOpenCourseId){
@@ -120,7 +114,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@PostMapping(MODEL + "/list.json")
@Function("applicationMergeTeacherOpenCourse.query")
- @ResponseBody
public JsonResult<PageQuery> list(ApplicationMergeTeacherOpenCourseQuery condition){
PageQuery page = condition.getPageQuery();
applicationMergeTeacherOpenCourseService.queryByCondition(page);
@@ -129,13 +122,12 @@ public class ApplicationMergeTeacherOpenCourseController{
@PostMapping(MODEL + "/addAll.json")
@Function("applicationMergeTeacherOpenCourse.add")
- @ResponseBody
public JsonResult addAll(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
- applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId());
- applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId());
+ applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId());
+ applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId());
String msg = applicationMergeTeacherOpenCourseService.addAll(applicationMergeTeacherOpenCourseQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
@@ -147,26 +139,24 @@ public class ApplicationMergeTeacherOpenCourseController{
@PostMapping(MODEL + "/add.json")
@Function("applicationMergeTeacherOpenCourse.add")
- @ResponseBody
public JsonResult add(@Validated(ValidateConfig.ADD.class) ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery, BindingResult result,@SCoreUser CoreUser coreUser){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
- applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId());
- applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId());
+ applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId());
+ applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId());
return applicationMergeTeacherOpenCourseService.add(applicationMergeTeacherOpenCourseQuery);
}
}
@PostMapping(MODEL + "/edit.json")
@Function("applicationMergeTeacherOpenCourse.edit")
- @ResponseBody
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- applicationMergeTeacherOpenCourseQuery.setUserId(null);
- applicationMergeTeacherOpenCourseQuery.setOrgId(null);
+ applicationMergeTeacherOpenCourseQuery.setUserId(null);
+ applicationMergeTeacherOpenCourseQuery.setOrgId(null);
String msg = applicationMergeTeacherOpenCourseService.edit(applicationMergeTeacherOpenCourseQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
@@ -179,7 +169,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(MODEL + "/view.json")
@Function("applicationMergeTeacherOpenCourse.query")
- @ResponseBody
public JsonResult<ApplicationMergeTeacherOpenCourse>queryInfo(Long applicationMergeTeacherOpenCourseId) {
ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.queryById( applicationMergeTeacherOpenCourseId);
return JsonResult.success(applicationMergeTeacherOpenCourse);
@@ -187,7 +176,6 @@ public class ApplicationMergeTeacherOpenCourseController{
@GetMapping(MODEL + "/getValues.json")
@Function("applicationMergeTeacherOpenCourse.query")
- @ResponseBody
public JsonResult<List<ApplicationMergeTeacherOpenCourse>>getValues(ApplicationMergeTeacherOpenCourseQuery param) {
List<ApplicationMergeTeacherOpenCourse>list = applicationMergeTeacherOpenCourseService.getValuesByQuery(param);
return JsonResult.success(list);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java
index 25d244a9..83e27d79 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java
@@ -9,26 +9,26 @@ import javax.validation.constraints.NotNull;
import java.util.Date;
/**
- *ApplicationMergeTeacherOpenCourse查询
+ *开课关联应用查询
*/
public class ApplicationMergeTeacherOpenCourseQuery extends PageParam {
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@Query(name = "应用-开课关联ID", display = false)
private Long applicationMergeTeacherOpenCourseId;
- @Query(name = "应用ID", display = true)
- private Long applicationId;
- @Query(name = "教师开课ID", display = true)
- private Long openCourseId;
+ @Query(name = "应用ID", display = true,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1")
+ private Long resourcesApplicationId;
+ @Query(name = "教师开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+ private Long teacherOpenCourseId;
+ @Query(name = "创建时间", display = false)
+ private Date applicationMergeTeacherOpenCourseAddTime;
@Query(name = "组织ID", display = false)
private Long orgId;
@Query(name = "用户ID", display = false)
private Long userId;
- @Query(name = "创建时间", display = false)
- private Date createTime;
private String applicationMergeTeacherOpenCourseIdPlural;
- private String applicationIdPlural;
- private String openCourseIdPlural;
+ private String resourcesApplicationIdPlural;
+ private String teacherOpenCourseIdPlural;
private String orgIdPlural;
private String userIdPlural;
@@ -42,17 +42,23 @@ public class ApplicationMergeTeacherOpenCourseQuery extends PageParam {
public void setApplicationMergeTeacherOpenCourseId(Long applicationMergeTeacherOpenCourseId ){
this.applicationMergeTeacherOpenCourseId = applicationMergeTeacherOpenCourseId;
}
- public Long getApplicationId(){
- return applicationId;
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
+ }
+ public void setResourcesApplicationId(Long resourcesApplicationId ){
+ this.resourcesApplicationId = resourcesApplicationId;
}
- public void setApplicationId(Long applicationId ){
- this.applicationId = applicationId;
+ public Long getTeacherOpenCourseId(){
+ return teacherOpenCourseId;
}
- public Long getOpenCourseId(){
- return openCourseId;
+ public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+ this.teacherOpenCourseId = teacherOpenCourseId;
}
- public void setOpenCourseId(Long openCourseId ){
- this.openCourseId = openCourseId;
+ public Date getApplicationMergeTeacherOpenCourseAddTime(){
+ return applicationMergeTeacherOpenCourseAddTime;
+ }
+ public void setApplicationMergeTeacherOpenCourseAddTime(Date applicationMergeTeacherOpenCourseAddTime ){
+ this.applicationMergeTeacherOpenCourseAddTime = applicationMergeTeacherOpenCourseAddTime;
}
public Long getOrgId(){
return orgId;
@@ -66,21 +72,15 @@ public class ApplicationMergeTeacherOpenCourseQuery extends PageParam {
public void setUserId(Long userId ){
this.userId = userId;
}
- public Date getCreateTime(){
- return createTime;
- }
- public void setCreateTime(Date createTime ){
- this.createTime = createTime;
- }
public ApplicationMergeTeacherOpenCourse pojo(){
ApplicationMergeTeacherOpenCourse pojo = new ApplicationMergeTeacherOpenCourse();
pojo.setApplicationMergeTeacherOpenCourseId(this.getApplicationMergeTeacherOpenCourseId());
- pojo.setApplicationId(this.getApplicationId());
- pojo.setOpenCourseId(this.getOpenCourseId());
+ pojo.setResourcesApplicationId(this.getResourcesApplicationId());
+ pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
+ pojo.setApplicationMergeTeacherOpenCourseAddTime(this.getApplicationMergeTeacherOpenCourseAddTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
- pojo.setCreateTime(this.getCreateTime());
return pojo;
}
@@ -90,17 +90,17 @@ public class ApplicationMergeTeacherOpenCourseQuery extends PageParam {
public void setApplicationMergeTeacherOpenCourseIdPlural(String applicationMergeTeacherOpenCourseIdPlural){
this.applicationMergeTeacherOpenCourseIdPlural = applicationMergeTeacherOpenCourseIdPlural;
}
- public String getApplicationIdPlural(){
- return applicationIdPlural;
+ public String getResourcesApplicationIdPlural(){
+ return resourcesApplicationIdPlural;
}
- public void setApplicationIdPlural(String applicationIdPlural){
- this.applicationIdPlural = applicationIdPlural;
+ public void setResourcesApplicationIdPlural(String resourcesApplicationIdPlural){
+ this.resourcesApplicationIdPlural = resourcesApplicationIdPlural;
}
- public String getOpenCourseIdPlural(){
- return openCourseIdPlural;
+ public String getTeacherOpenCourseIdPlural(){
+ return teacherOpenCourseIdPlural;
}
- public void setOpenCourseIdPlural(String openCourseIdPlural){
- this.openCourseIdPlural = openCourseIdPlural;
+ public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+ this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
}
public String getOrgIdPlural(){
return orgIdPlural;
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherMergeApplicationQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherMergeApplicationQuery.java
index 36127d02..404fd4d9 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherMergeApplicationQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherMergeApplicationQuery.java
@@ -17,20 +17,20 @@ public class TeacherMergeApplicationQuery extends PageParam {
private Long teacherMergeApplicationId;
@Query(name = "教师ID", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.1=1")
private Long teacherId;
- @Query(name = "应用ID", display = true,type=Query.TYPE_DICT,dict="resources_application.resources_application_name.1=1")
- private Long applicationId;
+ @Query(name = "应用ID", display = true,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1")
+ private Long resourcesApplicationId;
@Query(name = "排序", display = false)
- private Integer orderIndex;
+ private Integer teacherMergeApplicationOrderIndex;
+ @Query(name = "创建时间", display = false)
+ private Date teacherMergeApplicationAddTime;
@Query(name = "组织ID", display = false)
private Long orgId;
@Query(name = "用户ID", display = false)
private Long userId;
- @Query(name = "创建时间", display = false)
- private Date createTime;
private String teacherMergeApplicationIdPlural;
private String teacherIdPlural;
- private String applicationIdPlural;
+ private String resourcesApplicationIdPlural;
private String orgIdPlural;
private String userIdPlural;
@@ -50,17 +50,23 @@ public class TeacherMergeApplicationQuery extends PageParam {
public void setTeacherId(Long teacherId ){
this.teacherId = teacherId;
}
- public Long getApplicationId(){
- return applicationId;
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
+ }
+ public void setResourcesApplicationId(Long resourcesApplicationId ){
+ this.resourcesApplicationId = resourcesApplicationId;
}
- public void setApplicationId(Long applicationId ){
- this.applicationId = applicationId;
+ public Integer getTeacherMergeApplicationOrderIndex(){
+ return teacherMergeApplicationOrderIndex;
}
- public Integer getOrderIndex(){
- return orderIndex;
+ public void setTeacherMergeApplicationOrderIndex(Integer teacherMergeApplicationOrderIndex ){
+ this.teacherMergeApplicationOrderIndex = teacherMergeApplicationOrderIndex;
}
- public void setOrderIndex(Integer orderIndex ){
- this.orderIndex = orderIndex;
+ public Date getTeacherMergeApplicationAddTime(){
+ return teacherMergeApplicationAddTime;
+ }
+ public void setTeacherMergeApplicationAddTime(Date teacherMergeApplicationAddTime ){
+ this.teacherMergeApplicationAddTime = teacherMergeApplicationAddTime;
}
public Long getOrgId(){
return orgId;
@@ -74,22 +80,16 @@ public class TeacherMergeApplicationQuery extends PageParam {
public void setUserId(Long userId ){
this.userId = userId;
}
- public Date getCreateTime(){
- return createTime;
- }
- public void setCreateTime(Date createTime ){
- this.createTime = createTime;
- }
public TeacherMergeApplication pojo(){
TeacherMergeApplication pojo = new TeacherMergeApplication();
pojo.setTeacherMergeApplicationId(this.getTeacherMergeApplicationId());
pojo.setTeacherId(this.getTeacherId());
- pojo.setApplicationId(this.getApplicationId());
- pojo.setOrderIndex(this.getOrderIndex());
+ pojo.setResourcesApplicationId(this.getResourcesApplicationId());
+ pojo.setTeacherMergeApplicationOrderIndex(this.getTeacherMergeApplicationOrderIndex());
+ pojo.setTeacherMergeApplicationAddTime(this.getTeacherMergeApplicationAddTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
- pojo.setCreateTime(this.getCreateTime());
return pojo;
}
@@ -105,11 +105,11 @@ public class TeacherMergeApplicationQuery extends PageParam {
public void setTeacherIdPlural(String teacherIdPlural){
this.teacherIdPlural = teacherIdPlural;
}
- public String getApplicationIdPlural(){
- return applicationIdPlural;
+ public String getResourcesApplicationIdPlural(){
+ return resourcesApplicationIdPlural;
}
- public void setApplicationIdPlural(String applicationIdPlural){
- this.applicationIdPlural = applicationIdPlural;
+ public void setResourcesApplicationIdPlural(String resourcesApplicationIdPlural){
+ this.resourcesApplicationIdPlural = resourcesApplicationIdPlural;
}
public String getOrgIdPlural(){
return orgIdPlural;
diff --git a/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md b/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md
index 572fdaa9..481b87d4 100644
--- a/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md
+++ b/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md
@@ -2,109 +2,109 @@ queryByCondition
===
* 根据不为空的参数进行分页查询
- select
- @pageTag(){
- t.*
- @}
- from application_merge_teacher_open_course t
- where 1=1
- @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
- and #function("applicationMergeTeacherOpenCourse.query")#
- @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
- and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
- @}
- @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
- and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
- @}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
- @}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
- @}
- @if(!isEmpty(openCourseId)){
- and t.open_course_id =#openCourseId#
- @}
- @if(!isEmpty(openCourseIdPlural)){
- and find_in_set(t.open_course_id,#openCourseIdPlural#)
- @}
- @if(!isEmpty(orgId)){
- and t.org_id =#orgId#
- @}
- @if(!isEmpty(orgIdPlural)){
- and find_in_set(t.org_id,#orgIdPlural#)
- @}
- @if(!isEmpty(userId)){
- and t.user_id =#userId#
- @}
- @if(!isEmpty(userIdPlural)){
- and find_in_set(t.user_id,#userIdPlural#)
- @}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
-
-
+ select
+ @pageTag(){
+ t.*
+ @}
+ from application_merge_teacher_open_course t
+ where 1=1
+ @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
+ and #function("applicationMergeTeacherOpenCourse.query")#
+ @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
+ and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
+ and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(teacherOpenCourseId)){
+ and t.teacher_open_course_id =#teacherOpenCourseId#
+ @}
+ @if(!isEmpty(teacherOpenCourseIdPlural)){
+ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
queryByConditionQuery
===
* 根据不为空的参数进行分页查询(无权限)
- select
- @pageTag(){
- t.*
- @}
- from application_merge_teacher_open_course t
- where 1=1
- @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
- and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
- @}
- @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
- and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
- @}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
- @}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
- @}
- @if(!isEmpty(openCourseId)){
- and t.open_course_id =#openCourseId#
- @}
- @if(!isEmpty(openCourseIdPlural)){
- and find_in_set(t.open_course_id,#openCourseIdPlural#)
- @}
- @if(!isEmpty(orgId)){
- and t.org_id =#orgId#
- @}
- @if(!isEmpty(orgIdPlural)){
- and find_in_set(t.org_id,#orgIdPlural#)
- @}
- @if(!isEmpty(userId)){
- and t.user_id =#userId#
- @}
- @if(!isEmpty(userIdPlural)){
- and find_in_set(t.user_id,#userIdPlural#)
- @}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
-
-
-
+ select
+ @pageTag(){
+ t.*
+ @}
+ from application_merge_teacher_open_course t
+ where 1=1
+ @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
+ and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
+ and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(teacherOpenCourseId)){
+ and t.teacher_open_course_id =#teacherOpenCourseId#
+ @}
+ @if(!isEmpty(teacherOpenCourseIdPlural)){
+ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+
deleteApplicationMergeTeacherOpenCourseByIds
===
* 批量删除
- delete from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#)
-
+ delete from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#)
+
getByIds
===
- select * from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#)
+select * from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#)
updateGivenByIds
@@ -112,117 +112,160 @@ updateGivenByIds
* 批量更新指定字段，无论此字段是否有值
- update application_merge_teacher_open_course
- set
- @if(contain("applicationId",_given)){
- @if(isEmpty(applicationId)){
- application_id = null ,
- @}else{
- application_id = #applicationId# ,
- @}
- @}
- @if(contain("openCourseId",_given)){
- @if(isEmpty(openCourseId)){
- open_course_id = null ,
- @}else{
- open_course_id = #openCourseId# ,
- @}
- @}
- @if(contain("orgId",_given)){
- @if(isEmpty(orgId)){
- org_id = null ,
- @}else{
- org_id = #orgId# ,
- @}
- @}
- @if(contain("userId",_given)){
- @if(isEmpty(userId)){
- user_id = null ,
- @}else{
- user_id = #userId# ,
- @}
- @}
- @if(contain("createTime",_given)){
- @if(isEmpty(createTime)){
- create_time = null ,
- @}else{
- create_time = #createTime# ,
- @}
- @}
- application_merge_teacher_open_course_id = application_merge_teacher_open_course_id
- where find_in_set(application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
-
-
-
+ update application_merge_teacher_open_course
+ set
+ @if(contain("resourcesApplicationId",_given)){
+ @if(isEmpty(resourcesApplicationId)){
+ resources_application_id = null ,
+ @}else{
+ resources_application_id = #resourcesApplicationId# ,
+ @}
+ @}
+ @if(contain("teacherOpenCourseId",_given)){
+ @if(isEmpty(teacherOpenCourseId)){
+ teacher_open_course_id = null ,
+ @}else{
+ teacher_open_course_id = #teacherOpenCourseId# ,
+ @}
+ @}
+ @if(contain("applicationMergeTeacherOpenCourseAddTime",_given)){
+ @if(isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ application_merge_teacher_open_course_add_time = null ,
+ @}else{
+ application_merge_teacher_open_course_add_time = #applicationMergeTeacherOpenCourseAddTime# ,
+ @}
+ @}
+ @if(contain("orgId",_given)){
+ @if(isEmpty(orgId)){
+ org_id = null ,
+ @}else{
+ org_id = #orgId# ,
+ @}
+ @}
+ @if(contain("userId",_given)){
+ @if(isEmpty(userId)){
+ user_id = null ,
+ @}else{
+ user_id = #userId# ,
+ @}
+ @}
+ application_merge_teacher_open_course_id = application_merge_teacher_open_course_id
+ where find_in_set(application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
+
+
+
getApplicationMergeTeacherOpenCourseValues
===
* 根据不为空的参数进行查询
- select t.*
- from application_merge_teacher_open_course t
- where 1=1
- @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
- and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
- @}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
- @}
- @if(!isEmpty(openCourseId)){
- and t.open_course_id =#openCourseId#
- @}
- @if(!isEmpty(orgId)){
- and t.org_id =#orgId#
- @}
- @if(!isEmpty(userId)){
- and t.user_id =#userId#
- @}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
-
-
+ select t.*
+ from application_merge_teacher_open_course t
+ where 1=1
+ @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
+ and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(teacherOpenCourseId)){
+ and t.teacher_open_course_id =#teacherOpenCourseId#
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+
+
getValuesByQuery
===
* 根据不为空的参数进行查询
- select t.*
- from application_merge_teacher_open_course t
- where 1=1 and #function("applicationMergeTeacherOpenCourse.query")#
- @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
- and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
- @}
- @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
- and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
- @}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
- @}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
- @}
- @if(!isEmpty(openCourseId)){
- and t.open_course_id =#openCourseId#
- @}
- @if(!isEmpty(openCourseIdPlural)){
- and find_in_set(t.open_course_id,#openCourseIdPlural#)
- @}
- @if(!isEmpty(orgId)){
- and t.org_id =#orgId#
- @}
- @if(!isEmpty(orgIdPlural)){
- and find_in_set(t.org_id,#orgIdPlural#)
- @}
- @if(!isEmpty(userId)){
- and t.user_id =#userId#
- @}
- @if(!isEmpty(userIdPlural)){
- and find_in_set(t.user_id,#userIdPlural#)
- @}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
-
-
-
+ select t.*
+ from application_merge_teacher_open_course t
+ where 1=1 and #function("applicationMergeTeacherOpenCourse.query")#
+ @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
+ and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
+ and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(teacherOpenCourseId)){
+ and t.teacher_open_course_id =#teacherOpenCourseId#
+ @}
+ @if(!isEmpty(teacherOpenCourseIdPlural)){
+ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+ select t.*
+ from application_merge_teacher_open_course t
+ where 1=1
+ @if(!isEmpty(applicationMergeTeacherOpenCourseId)){
+ and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId#
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){
+ and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(teacherOpenCourseId)){
+ and t.teacher_open_course_id =#teacherOpenCourseId#
+ @}
+ @if(!isEmpty(teacherOpenCourseIdPlural)){
+ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+ @}
+ @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){
+ and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+
diff --git a/web/src/main/resources/sql/jlw/teacherMergeApplication.md b/web/src/main/resources/sql/jlw/teacherMergeApplication.md
index ec04d65c..a9600fbd 100644
--- a/web/src/main/resources/sql/jlw/teacherMergeApplication.md
+++ b/web/src/main/resources/sql/jlw/teacherMergeApplication.md
@@ -22,14 +22,17 @@ queryByCondition
@if(!isEmpty(teacherIdPlural)){
and find_in_set(t.teacher_id,#teacherIdPlural#)
@}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
@}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
@}
- @if(!isEmpty(orderIndex)){
- and t.order_index =#orderIndex#
+ @if(!isEmpty(teacherMergeApplicationOrderIndex)){
+ and t.teacher_merge_application_order_index =#teacherMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(teacherMergeApplicationAddTime)){
+ and t.teacher_merge_application_add_time =#teacherMergeApplicationAddTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@@ -43,9 +46,6 @@ queryByCondition
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
queryByConditionQuery
@@ -70,14 +70,17 @@ queryByConditionQuery
@if(!isEmpty(teacherIdPlural)){
and find_in_set(t.teacher_id,#teacherIdPlural#)
@}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
@}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
@}
- @if(!isEmpty(orderIndex)){
- and t.order_index =#orderIndex#
+ @if(!isEmpty(teacherMergeApplicationOrderIndex)){
+ and t.teacher_merge_application_order_index =#teacherMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(teacherMergeApplicationAddTime)){
+ and t.teacher_merge_application_add_time =#teacherMergeApplicationAddTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@@ -91,9 +94,6 @@ queryByConditionQuery
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
@@ -127,18 +127,25 @@ updateGivenByIds
teacher_id = #teacherId# ,
@}
@}
- @if(contain("applicationId",_given)){
- @if(isEmpty(applicationId)){
- application_id = null ,
+ @if(contain("resourcesApplicationId",_given)){
+ @if(isEmpty(resourcesApplicationId)){
+ resources_application_id = null ,
@}else{
- application_id = #applicationId# ,
+ resources_application_id = #resourcesApplicationId# ,
@}
@}
- @if(contain("orderIndex",_given)){
- @if(isEmpty(orderIndex)){
- order_index = null ,
+ @if(contain("teacherMergeApplicationOrderIndex",_given)){
+ @if(isEmpty(teacherMergeApplicationOrderIndex)){
+ teacher_merge_application_order_index = null ,
@}else{
- order_index = #orderIndex# ,
+ teacher_merge_application_order_index = #teacherMergeApplicationOrderIndex# ,
+ @}
+ @}
+ @if(contain("teacherMergeApplicationAddTime",_given)){
+ @if(isEmpty(teacherMergeApplicationAddTime)){
+ teacher_merge_application_add_time = null ,
+ @}else{
+ teacher_merge_application_add_time = #teacherMergeApplicationAddTime# ,
@}
@}
@if(contain("orgId",_given)){
@@ -155,13 +162,6 @@ updateGivenByIds
user_id = #userId# ,
@}
@}
- @if(contain("createTime",_given)){
- @if(isEmpty(createTime)){
- create_time = null ,
- @}else{
- create_time = #createTime# ,
- @}
- @}
teacher_merge_application_id = teacher_merge_application_id
where find_in_set(teacher_merge_application_id,#teacherMergeApplicationIdPlural#)
@@ -181,11 +181,14 @@ getTeacherMergeApplicationValues
@if(!isEmpty(teacherId)){
and t.teacher_id =#teacherId#
@}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
@}
- @if(!isEmpty(orderIndex)){
- and t.order_index =#orderIndex#
+ @if(!isEmpty(teacherMergeApplicationOrderIndex)){
+ and t.teacher_merge_application_order_index =#teacherMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(teacherMergeApplicationAddTime)){
+ and t.teacher_merge_application_add_time =#teacherMergeApplicationAddTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@@ -193,9 +196,6 @@ getTeacherMergeApplicationValues
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
getValuesByQuery
@@ -218,14 +218,17 @@ getValuesByQuery
@if(!isEmpty(teacherIdPlural)){
and find_in_set(t.teacher_id,#teacherIdPlural#)
@}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
@}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
@}
- @if(!isEmpty(orderIndex)){
- and t.order_index =#orderIndex#
+ @if(!isEmpty(teacherMergeApplicationOrderIndex)){
+ and t.teacher_merge_application_order_index =#teacherMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(teacherMergeApplicationAddTime)){
+ and t.teacher_merge_application_add_time =#teacherMergeApplicationAddTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@@ -239,9 +242,6 @@ getValuesByQuery
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
getValuesByQueryNotWithPermission
@@ -264,14 +264,17 @@ getValuesByQueryNotWithPermission
@if(!isEmpty(teacherIdPlural)){
and find_in_set(t.teacher_id,#teacherIdPlural#)
@}
- @if(!isEmpty(applicationId)){
- and t.application_id =#applicationId#
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
@}
- @if(!isEmpty(applicationIdPlural)){
- and find_in_set(t.application_id,#applicationIdPlural#)
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
@}
- @if(!isEmpty(orderIndex)){
- and t.order_index =#orderIndex#
+ @if(!isEmpty(teacherMergeApplicationOrderIndex)){
+ and t.teacher_merge_application_order_index =#teacherMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(teacherMergeApplicationAddTime)){
+ and t.teacher_merge_application_add_time =#teacherMergeApplicationAddTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@@ -285,9 +288,6 @@ getValuesByQueryNotWithPermission
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
- @if(!isEmpty(createTime)){
- and t.create_time =#createTime#
- @}
diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js
index 0d956602..1a85ed52 100644
--- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js
+++ b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js
@@ -15,4 +15,4 @@ layui.define([], function(exports) {
};
exports('applicationMergeTeacherOpenCourseApi',api);
-});
+});
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js
index 37d5d7a8..c76b6aca 100644
--- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js
+++ b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js
@@ -9,7 +9,7 @@ layui.define(['table', 'applicationMergeTeacherOpenCourseApi'], function(exports
if(data==null){
return ;
}
- Common.openConfirm("确认要删除这些ApplicationMergeTeacherOpenCourse?",function(){
+ Common.openConfirm("确认要删除这些开课关联应用?",function(){
var ids =Common.concatBatchId(data,"applicationMergeTeacherOpenCourseId");
applicationMergeTeacherOpenCourseApi.del(ids,function(){
Common.info("删除成功");
@@ -20,4 +20,4 @@ layui.define(['table', 'applicationMergeTeacherOpenCourseApi'], function(exports
}
exports('del',view);
-});
+});
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js
index 9a9d2ef0..1826fda6 100644
--- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js
+++ b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js
@@ -25,4 +25,4 @@ layui.define([ 'form', 'laydate', 'table','applicationMergeTeacherOpenCourseApi'
}
exports('edit',view);
-});
+});
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js
index 2431234f..7bd216b9 100644
--- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js
+++ b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js
@@ -5,11 +5,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var applicationMergeTeacherOpenCourseTable = null;
var view ={
init:function(){
+ var that = this
this.initTable();
this.initSearchForm();
this.initToolBar();
window.dataReload = function(){
Lib.doSearchForm($("#searchForm"),applicationMergeTeacherOpenCourseTable)
+ that.initToolBar();
}
},
initTable:function(){
@@ -40,18 +42,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
width : 60,
},
{
- field : 'applicationId',
+ field : 'resourcesApplicationIdText', //数据字典类型为 resources_application.application_name.1=1
title : '应用ID',
align:"center",
hideField :false,
- hide:$.isEmpty(sx_['applicationId'])?false:sx_['applicationId'],
+ hide:$.isEmpty(sx_['resourcesApplicationIdText'])?false:sx_['resourcesApplicationIdText'],
},
{
- field : 'openCourseId',
+ field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
title : '教师开课ID',
align:"center",
hideField :false,
- hide:$.isEmpty(sx_['openCourseId'])?false:sx_['openCourseId'],
+ hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
+ },
+ {
+ field : 'applicationMergeTeacherOpenCourseAddTime',
+ title : '创建时间',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['applicationMergeTeacherOpenCourseAddTime'])?false:sx_['applicationMergeTeacherOpenCourseAddTime'],
},
{
field : 'orgId',
@@ -66,13 +75,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
align:"center",
hideField :false,
hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
- },
- {
- field : 'createTime',
- title : '创建时间',
- align:"center",
- hideField :false,
- hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
}
,{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
@@ -104,7 +106,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
toolbar = {
add: function () {
var url = "/jlw/applicationMergeTeacherOpenCourse/add.do";
- Common.openDlg(url,"ApplicationMergeTeacherOpenCourse管理>新增");
+ Common.openDlg(url,"开课关联应用管理>新增");
},
edit: function () {
var data = Common.getOneFromTable(table,"applicationMergeTeacherOpenCourseTable");
@@ -112,7 +114,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
return ;
}
var url = "/jlw/applicationMergeTeacherOpenCourse/add.do?applicationMergeTeacherOpenCourseId="+data.applicationMergeTeacherOpenCourseId;
- Common.openDlg(url,"ApplicationMergeTeacherOpenCourse管理>"+data.applicationMergeTeacherOpenCourseId+">编辑");
+ Common.openDlg(url,"开课关联应用管理>"+data.applicationMergeTeacherOpenCourseId+">编辑");
},
del: function () {
layui.use(['del'], function(){
@@ -122,10 +124,12 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
},
search: function () {
Lib.doSearchForm($("#searchForm"), applicationMergeTeacherOpenCourseTable, 1);
+ view.initToolBar()
},
refresh: function () {
searchForm.reset();
Lib.doSearchForm($("#searchForm"), applicationMergeTeacherOpenCourseTable, 1);
+ view.initToolBar()
},
}
//触发事件
@@ -133,11 +137,12 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
+
}, initTableTool: table.on('tool(applicationMergeTeacherOpenCourseTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/applicationMergeTeacherOpenCourse/add.do?applicationMergeTeacherOpenCourseId="+data.applicationMergeTeacherOpenCourseId;
- Common.openDlg(url,"ApplicationMergeTeacherOpenCourse管理>"+data.applicationMergeTeacherOpenCourseId+">编辑");
+ Common.openDlg(url,"开课关联应用管理>"+data.applicationMergeTeacherOpenCourseId+">编辑");
}else if(obj.event === "del"){
layer.confirm('是否确定删除该信息？', function (index) {
var ret = Common.postAjax("/jlw/applicationMergeTeacherOpenCourse/delete.json",{ids:data.applicationMergeTeacherOpenCourseId});
diff --git a/web/src/main/resources/static/js/jlw/teacherMergeApplication/index.js b/web/src/main/resources/static/js/jlw/teacherMergeApplication/index.js
index be069690..5317bed3 100644
--- a/web/src/main/resources/static/js/jlw/teacherMergeApplication/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherMergeApplication/index.js
@@ -49,18 +49,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'],
},
{
- field : 'applicationIdText', //数据字典类型为 resources_application.resources_application_name.1=1
+ field : 'resourcesApplicationIdText', //数据字典类型为 resources_application.application_name.1=1
title : '应用ID',
align:"center",
hideField :false,
- hide:$.isEmpty(sx_['applicationIdText'])?false:sx_['applicationIdText'],
+ hide:$.isEmpty(sx_['resourcesApplicationIdText'])?false:sx_['resourcesApplicationIdText'],
},
{
- field : 'orderIndex',
+ field : 'teacherMergeApplicationOrderIndex',
title : '排序',
align:"center",
hideField :false,
- hide:$.isEmpty(sx_['orderIndex'])?false:sx_['orderIndex'],
+ hide:$.isEmpty(sx_['teacherMergeApplicationOrderIndex'])?false:sx_['teacherMergeApplicationOrderIndex'],
+ },
+ {
+ field : 'teacherMergeApplicationAddTime',
+ title : '创建时间',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['teacherMergeApplicationAddTime'])?false:sx_['teacherMergeApplicationAddTime'],
},
{
field : 'orgId',
@@ -75,13 +82,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
align:"center",
hideField :false,
hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
- },
- {
- field : 'createTime',
- title : '创建时间',
- align:"center",
- hideField :false,
- hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
}
,{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
diff --git a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html
index a85f7cb5..125431b9 100644
--- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html
+++ b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html
@@ -6,13 +6,15 @@
<div class="layui-inline">
<label class="layui-form-label">应用ID</label>
<div class="layui-input-inline">
- <input type="text" id="applicationId" name="applicationId" value="${applicationMergeTeacherOpenCourse.applicationId}" class="layui-input" >
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${applicationMergeTeacherOpenCourse.resourcesApplicationId}" layVerify="" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">教师开课ID</label>
<div class="layui-input-inline">
- <input type="text" id="openCourseId" name="openCourseId" value="${applicationMergeTeacherOpenCourse.openCourseId}" class="layui-input" >
+ <layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+ id="teacherOpenCourseId" name="teacherOpenCourseId" value="${applicationMergeTeacherOpenCourse.teacherOpenCourseId}" layVerify="" />
</div>
</div>
</div>
@@ -20,15 +22,15 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">组织ID</label>
+ <label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
- <input type="text" id="orgId" name="orgId" value="${applicationMergeTeacherOpenCourse.orgId}" class="layui-input" >
+ <input type="text" id="applicationMergeTeacherOpenCourseAddTime" name="applicationMergeTeacherOpenCourseAddTime" value="${applicationMergeTeacherOpenCourse.applicationMergeTeacherOpenCourseAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">用户ID</label>
+ <label class="layui-form-label">组织ID</label>
<div class="layui-input-inline">
- <input type="text" id="userId" name="userId" value="${applicationMergeTeacherOpenCourse.userId}" class="layui-input" >
+ <input type="text" id="orgId" name="orgId" value="${applicationMergeTeacherOpenCourse.orgId}" class="layui-input" >
</div>
</div>
</div>
@@ -36,9 +38,9 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">创建时间</label>
+ <label class="layui-form-label">用户ID</label>
<div class="layui-input-inline">
- <input type="text" id="createTime" name="createTime" value="${applicationMergeTeacherOpenCourse.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ <input type="text" id="userId" name="userId" value="${applicationMergeTeacherOpenCourse.userId}" class="layui-input" >
</div>
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html
index 90791c8d..1652ace4 100644
--- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html
+++ b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html
@@ -6,13 +6,15 @@
<div class="layui-inline">
<label class="layui-form-label">应用ID</label>
<div class="layui-input-inline">
- <input type="text" id="applicationId" name="applicationId" value="${applicationMergeTeacherOpenCourse.applicationId}" class="layui-input" >
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${applicationMergeTeacherOpenCourse.resourcesApplicationId}" layVerify="" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">教师开课ID</label>
<div class="layui-input-inline">
- <input type="text" id="openCourseId" name="openCourseId" value="${applicationMergeTeacherOpenCourse.openCourseId}" class="layui-input" >
+ <layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+ id="teacherOpenCourseId" name="teacherOpenCourseId" value="${applicationMergeTeacherOpenCourse.teacherOpenCourseId}" layVerify="" />
</div>
</div>
</div>
@@ -20,15 +22,15 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">组织ID</label>
+ <label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
- <input type="text" id="orgId" name="orgId" value="${applicationMergeTeacherOpenCourse.orgId}" class="layui-input" >
+ <input type="text" id="applicationMergeTeacherOpenCourseAddTime" name="applicationMergeTeacherOpenCourseAddTime" value="${applicationMergeTeacherOpenCourse.applicationMergeTeacherOpenCourseAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">用户ID</label>
+ <label class="layui-form-label">组织ID</label>
<div class="layui-input-inline">
- <input type="text" id="userId" name="userId" value="${applicationMergeTeacherOpenCourse.userId}" class="layui-input" >
+ <input type="text" id="orgId" name="orgId" value="${applicationMergeTeacherOpenCourse.orgId}" class="layui-input" >
</div>
</div>
</div>
@@ -36,9 +38,9 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">创建时间</label>
+ <label class="layui-form-label">用户ID</label>
<div class="layui-input-inline">
- <input type="text" id="createTime" name="createTime" value="${applicationMergeTeacherOpenCourse.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ <input type="text" id="userId" name="userId" value="${applicationMergeTeacherOpenCourse.userId}" class="layui-input" >
</div>
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html
index 9b96605e..f3449175 100644
--- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html
+++ b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html
@@ -7,11 +7,15 @@
<script type="text/html" id="toolbar_applicationMergeTeacherOpenCourse">
<div class="layui-btn-container">
<div class="layui-btn-group" >
-<!-- <layui:accessButton function="applicationMergeTeacherOpenCourse.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton>-->
+ <!--# if(core.searchIsShow(search)) {-->
+ <layui:accessButton function="applicationMergeTeacherOpenCourse.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton>
+ <!--# }-->
<layui:accessButton function="applicationMergeTeacherOpenCourse.add" action="add">添加</layui:accessButton>
<layui:accessButton function="applicationMergeTeacherOpenCourse.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="applicationMergeTeacherOpenCourse.del" action="del">删除</layui:accessButton>
-<!-- <layui:accessButton function="applicationMergeTeacherOpenCourse.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton>-->
+ <!--# if(!isEmpty(search)) {-->
+ <layui:accessButton function="applicationMergeTeacherOpenCourse.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton>
+ <!--# }-->
</div>
</div>
</script>
diff --git a/web/src/main/resources/templates/jlw/teacherMergeApplication/add.html b/web/src/main/resources/templates/jlw/teacherMergeApplication/add.html
index 60b01125..648978f6 100644
--- a/web/src/main/resources/templates/jlw/teacherMergeApplication/add.html
+++ b/web/src/main/resources/templates/jlw/teacherMergeApplication/add.html
@@ -13,8 +13,8 @@
<div class="layui-inline">
<label class="layui-form-label">应用ID</label>
<div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline' type="resources_application.resources_application_name.1=1"
- id="applicationId" name="applicationId" value="${teacherMergeApplication.applicationId}" layVerify="" />
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${teacherMergeApplication.resourcesApplicationId}" layVerify="" />
</div>
</div>
</div>
@@ -24,13 +24,13 @@
<div class="layui-inline">
<label class="layui-form-label">排序</label>
<div class="layui-input-inline">
- <input type="text" id="orderIndex" name="orderIndex" value="${teacherMergeApplication.orderIndex}" class="layui-input" >
+ <input type="text" id="teacherMergeApplicationOrderIndex" name="teacherMergeApplicationOrderIndex" value="${teacherMergeApplication.teacherMergeApplicationOrderIndex}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">组织ID</label>
+ <label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
- <input type="text" id="orgId" name="orgId" value="${teacherMergeApplication.orgId}" class="layui-input" >
+ <input type="text" id="teacherMergeApplicationAddTime" name="teacherMergeApplicationAddTime" value="${teacherMergeApplication.teacherMergeApplicationAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
</div>
@@ -38,15 +38,15 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">用户ID</label>
+ <label class="layui-form-label">组织ID</label>
<div class="layui-input-inline">
- <input type="text" id="userId" name="userId" value="${teacherMergeApplication.userId}" class="layui-input" >
+ <input type="text" id="orgId" name="orgId" value="${teacherMergeApplication.orgId}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">创建时间</label>
+ <label class="layui-form-label">用户ID</label>
<div class="layui-input-inline">
- <input type="text" id="createTime" name="createTime" value="${teacherMergeApplication.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ <input type="text" id="userId" name="userId" value="${teacherMergeApplication.userId}" class="layui-input" >
</div>
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/teacherMergeApplication/edit.html b/web/src/main/resources/templates/jlw/teacherMergeApplication/edit.html
index aae3c048..109a4250 100644
--- a/web/src/main/resources/templates/jlw/teacherMergeApplication/edit.html
+++ b/web/src/main/resources/templates/jlw/teacherMergeApplication/edit.html
@@ -13,8 +13,8 @@
<div class="layui-inline">
<label class="layui-form-label">应用ID</label>
<div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline' type="resources_application.resources_application_name.1=1"
- id="applicationId" name="applicationId" value="${teacherMergeApplication.applicationId}" layVerify="" />
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${teacherMergeApplication.resourcesApplicationId}" layVerify="" />
</div>
</div>
</div>
@@ -24,13 +24,13 @@
<div class="layui-inline">
<label class="layui-form-label">排序</label>
<div class="layui-input-inline">
- <input type="text" id="orderIndex" name="orderIndex" value="${teacherMergeApplication.orderIndex}" class="layui-input" >
+ <input type="text" id="teacherMergeApplicationOrderIndex" name="teacherMergeApplicationOrderIndex" value="${teacherMergeApplication.teacherMergeApplicationOrderIndex}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">组织ID</label>
+ <label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
- <input type="text" id="orgId" name="orgId" value="${teacherMergeApplication.orgId}" class="layui-input" >
+ <input type="text" id="teacherMergeApplicationAddTime" name="teacherMergeApplicationAddTime" value="${teacherMergeApplication.teacherMergeApplicationAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
</div>
@@ -38,15 +38,15 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">用户ID</label>
+ <label class="layui-form-label">组织ID</label>
<div class="layui-input-inline">
- <input type="text" id="userId" name="userId" value="${teacherMergeApplication.userId}" class="layui-input" >
+ <input type="text" id="orgId" name="orgId" value="${teacherMergeApplication.orgId}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">创建时间</label>
+ <label class="layui-form-label">用户ID</label>
<div class="layui-input-inline">
- <input type="text" id="createTime" name="createTime" value="${teacherMergeApplication.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ <input type="text" id="userId" name="userId" value="${teacherMergeApplication.userId}" class="layui-input" >
</div>
</div>
</div>