记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
6646fa86
Commit
6646fa86
authored
Jul 31, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 partner
parent
47158460
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
KylinPerformancesRecommendController.java
.../zhengzai/kylin/KylinPerformancesRecommendController.java
+4
-4
KylinRoadShowController.java
...eb/controller/zhengzai/kylin/KylinRoadShowController.java
+8
-8
performances.html
...s/templates/zhengzai/kylin/performances/performances.html
+3
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesRecommendController.java
View file @
6646fa86
...
@@ -36,7 +36,7 @@ public class KylinPerformancesRecommendController extends BaseController {
...
@@ -36,7 +36,7 @@ public class KylinPerformancesRecommendController extends BaseController {
@Autowired
@Autowired
private
IKylinPerformancesAdminService
kylinPerformancesService
;
private
IKylinPerformancesAdminService
kylinPerformancesService
;
@RequiresPermissions
(
"kylin:performances:recommend"
)
//
@RequiresPermissions("kylin:performances:recommend")
@GetMapping
()
@GetMapping
()
public
String
recommend
()
{
public
String
recommend
()
{
return
prefix
+
"/recommend"
;
return
prefix
+
"/recommend"
;
...
@@ -45,7 +45,7 @@ public class KylinPerformancesRecommendController extends BaseController {
...
@@ -45,7 +45,7 @@ public class KylinPerformancesRecommendController extends BaseController {
/**
/**
* 查询演出列表
* 查询演出列表
*/
*/
@RequiresPermissions
(
"kylin:performances:recommend:list"
)
//
@RequiresPermissions("kylin:performances:recommend:list")
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
()
{
public
TableDataInfo
list
()
{
...
@@ -64,7 +64,7 @@ public class KylinPerformancesRecommendController extends BaseController {
...
@@ -64,7 +64,7 @@ public class KylinPerformancesRecommendController extends BaseController {
/**
/**
* 修改
* 修改
*/
*/
@RequiresPermissions
(
"kylin:performances:recommend:change"
)
//
@RequiresPermissions("kylin:performances:recommend:change")
@PostMapping
(
"/change"
)
@PostMapping
(
"/change"
)
@ResponseBody
@ResponseBody
public
AjaxResult
setRecommend
(
@RequestParam
(
value
=
"ids"
)
String
performancesId
,
@RequestParam
(
value
=
"isRecommend"
,
required
=
false
)
Integer
isRecommend
)
{
public
AjaxResult
setRecommend
(
@RequestParam
(
value
=
"ids"
)
String
performancesId
,
@RequestParam
(
value
=
"isRecommend"
,
required
=
false
)
Integer
isRecommend
)
{
...
@@ -82,7 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController {
...
@@ -82,7 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController {
return
prefix
+
"/edit"
;
return
prefix
+
"/edit"
;
}
}
@RequiresPermissions
(
"kylin:performances:recommend:change"
)
//
@RequiresPermissions("kylin:performances:recommend:change")
@GetMapping
(
value
=
"/performance/status"
)
@GetMapping
(
value
=
"/performance/status"
)
@ResponseBody
@ResponseBody
public
AjaxResult
listByStatus
(
@RequestParam
(
value
=
"status"
)
String
status
,
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
)
{
public
AjaxResult
listByStatus
(
@RequestParam
(
value
=
"status"
)
String
status
,
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRoadShowController.java
View file @
6646fa86
...
@@ -41,13 +41,13 @@ public class KylinRoadShowController extends BaseController {
...
@@ -41,13 +41,13 @@ public class KylinRoadShowController extends BaseController {
@Autowired
@Autowired
private
IKylinPerformancesAdminService
kylinPerformancesService
;
private
IKylinPerformancesAdminService
kylinPerformancesService
;
@RequiresPermissions
(
"kylin:performances:roadShow"
)
//
@RequiresPermissions("kylin:performances:roadShow")
@GetMapping
()
@GetMapping
()
public
String
roadShow
()
{
public
String
roadShow
()
{
return
prefix
+
"/roadShow"
;
return
prefix
+
"/roadShow"
;
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:list"
)
//
@RequiresPermissions("kylin:performances:roadShow:list")
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
listRoadShow
(
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
,
public
TableDataInfo
listRoadShow
(
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
,
...
@@ -66,7 +66,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -66,7 +66,7 @@ public class KylinRoadShowController extends BaseController {
return
prefix
+
"/add"
;
return
prefix
+
"/add"
;
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:add"
)
//
@RequiresPermissions("kylin:performances:roadShow:add")
@Log
(
title
=
"巡演"
,
businessType
=
BusinessType
.
INSERT
)
@Log
(
title
=
"巡演"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
(
"/add"
)
@PostMapping
(
"/add"
)
@ResponseBody
@ResponseBody
...
@@ -74,7 +74,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -74,7 +74,7 @@ public class KylinRoadShowController extends BaseController {
return
toAjax
(!
kylinRoadShowsAdminService
.
createRoadShow
(
createRoadShowParam
).
equals
(
""
));
return
toAjax
(!
kylinRoadShowsAdminService
.
createRoadShow
(
createRoadShowParam
).
equals
(
""
));
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:details"
)
//
@RequiresPermissions("kylin:performances:roadShow:details")
@GetMapping
(
value
=
"/details/{roadShowId}"
)
@GetMapping
(
value
=
"/details/{roadShowId}"
)
public
String
detailsRoadShow
(
@PathVariable
(
"roadShowId"
)
String
roadShowId
,
ModelMap
mmap
)
{
public
String
detailsRoadShow
(
@PathVariable
(
"roadShowId"
)
String
roadShowId
,
ModelMap
mmap
)
{
KylinRoadShowAdminVo
result
=
kylinRoadShowsAdminService
.
detailsRoadShow
(
roadShowId
);
KylinRoadShowAdminVo
result
=
kylinRoadShowsAdminService
.
detailsRoadShow
(
roadShowId
);
...
@@ -82,7 +82,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -82,7 +82,7 @@ public class KylinRoadShowController extends BaseController {
return
prefix
+
"/edit"
;
return
prefix
+
"/edit"
;
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:edit"
)
//
@RequiresPermissions("kylin:performances:roadShow:edit")
@Log
(
title
=
"巡演"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"巡演"
,
businessType
=
BusinessType
.
UPDATE
)
@PostMapping
(
"/edit"
)
@PostMapping
(
"/edit"
)
@ResponseBody
@ResponseBody
...
@@ -100,7 +100,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -100,7 +100,7 @@ public class KylinRoadShowController extends BaseController {
return
prefix
+
"/details"
;
return
prefix
+
"/details"
;
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:addPerformance"
)
//
@RequiresPermissions("kylin:performances:roadShow:addPerformance")
@GetMapping
(
value
=
"/performance/{roadShowId}"
)
@GetMapping
(
value
=
"/performance/{roadShowId}"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
listByRoadShowId
(
@PathVariable
(
"roadShowId"
)
String
roadShowId
)
{
public
TableDataInfo
listByRoadShowId
(
@PathVariable
(
"roadShowId"
)
String
roadShowId
)
{
...
@@ -109,7 +109,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -109,7 +109,7 @@ public class KylinRoadShowController extends BaseController {
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:change:performance"
)
//
@RequiresPermissions("kylin:performances:roadShow:change:performance")
@PostMapping
(
value
=
"/roadShow/relation"
)
@PostMapping
(
value
=
"/roadShow/relation"
)
@ResponseBody
@ResponseBody
public
AjaxResult
changeRoadShowId
(
@RequestParam
(
value
=
"ids"
)
String
performancesId
,
@RequestParam
(
value
=
"roadShowId"
,
required
=
false
)
String
roadShowId
)
{
public
AjaxResult
changeRoadShowId
(
@RequestParam
(
value
=
"ids"
)
String
performancesId
,
@RequestParam
(
value
=
"roadShowId"
,
required
=
false
)
String
roadShowId
)
{
...
@@ -126,7 +126,7 @@ public class KylinRoadShowController extends BaseController {
...
@@ -126,7 +126,7 @@ public class KylinRoadShowController extends BaseController {
return
prefix
+
"/addPerformances"
;
return
prefix
+
"/addPerformances"
;
}
}
@RequiresPermissions
(
"kylin:performances:roadShow:change:performance"
)
//
@RequiresPermissions("kylin:performances:roadShow:change:performance")
@GetMapping
(
value
=
"/performance/status"
)
@GetMapping
(
value
=
"/performance/status"
)
@ResponseBody
@ResponseBody
public
AjaxResult
listByStatus
(
@RequestParam
(
value
=
"status"
)
String
status
,
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
)
{
public
AjaxResult
listByStatus
(
@RequestParam
(
value
=
"status"
)
String
status
,
@RequestParam
(
value
=
"title"
,
required
=
false
)
String
title
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html
View file @
6646fa86
...
@@ -165,12 +165,12 @@
...
@@ -165,12 +165,12 @@
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
var
actions
=
[];
var
actions
=
[];
if
(
row
.
auditStatus
==
0
)
{
if
(
row
.
auditStatus
==
0
)
{
actions
.
push
(
'<a class="btn btn-success btn-xs
'
+
detailFlag
+
'
" href="javascript:void(0)" onclick="$.operate.detailTab(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-edit"></i>管理</a> '
);
actions
.
push
(
'<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-edit"></i>管理</a> '
);
}
else
{
}
else
{
actions
.
push
(
'<a class="btn btn-success btn-xs
'
+
detailFlag
+
'
" href="javascript:void(0)" onclick="$.operate.detailTab(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-edit"></i>查看</a> '
);
actions
.
push
(
'<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-edit"></i>查看</a> '
);
}
}
if
(
row
.
syncDamai
==
1
)
{
if
(
row
.
syncDamai
==
1
)
{
actions
.
push
(
'<a class="btn btn-warning btn-xs
'
+
expertFlag
+
'
" href="javascript:void(0)" onclick="f(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-remove"></i>同步</a>'
);
actions
.
push
(
'<a class="btn btn-warning btn-xs " href="javascript:void(0)" onclick="f(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-remove"></i>同步</a>'
);
}
}
return
actions
.
join
(
''
);
return
actions
.
join
(
''
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment