Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Q
qianhe-ydsj
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangyun
qianhe-ydsj
Commits
df7baf31
Commit
df7baf31
authored
Nov 11, 2024
by
wangqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
管理区手册模板
parent
87aad036
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
51 deletions
+47
-51
qianhe-admin/src/main/java/com/qianhe/web/controller/system/SysMenuController.java
+3
-3
qianhe-system/src/main/java/com/qianhe/system/service/impl/SysMenuServiceImpl.java
+5
-5
qianhe-ydsj/src/main/java/com/qianhe/bzsc/controller/BzscCyglqglscMbcbController.java
+7
-3
qianhe-ydsj/src/main/java/com/qianhe/bzsc/controller/BzscCyglqglscMbzbController.java
+13
-3
qianhe-ydsj/src/main/java/com/qianhe/bzsc/domain/BzscCyglqglscMbcb.java
+1
-26
qianhe-ydsj/src/main/java/com/qianhe/bzsc/mapper/BzscCyglqglscMbcbMapper.java
+2
-0
qianhe-ydsj/src/main/java/com/qianhe/bzsc/service/IBzscCyglqglscMbcbService.java
+2
-0
qianhe-ydsj/src/main/java/com/qianhe/bzsc/service/impl/BzscCyglqglscMbcbServiceImpl.java
+7
-0
qianhe-ydsj/src/main/resources/mapper/bzsc/BzscCyglqglscMbcbMapper.xml
+7
-11
No files found.
qianhe-admin/src/main/java/com/qianhe/web/controller/system/SysMenuController.java
View file @
df7baf31
...
...
@@ -130,9 +130,9 @@ public class SysMenuController extends BaseController
public
AjaxResult
remove
(
@PathVariable
(
"menuId"
)
Long
menuId
)
{
if
(
menuService
.
hasChildByMenuId
(
menuId
))
{
return
warn
(
"存在子菜单,不允许删除"
);
}
{
return
warn
(
"存在子菜单,不允许删除"
);
}
if
(
menuService
.
checkMenuExistRole
(
menuId
))
{
return
warn
(
"菜单已分配,不允许删除"
);
...
...
qianhe-system/src/main/java/com/qianhe/system/service/impl/SysMenuServiceImpl.java
View file @
df7baf31
...
...
@@ -274,11 +274,11 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 结果
*/
@Override
public
boolean
hasChildByMenuId
(
Long
menuId
)
{
int
result
=
menuMapper
.
hasChildByMenuId
(
menuId
);
return
result
>
0
;
}
public
boolean
hasChildByMenuId
(
Long
menuId
)
{
int
result
=
menuMapper
.
hasChildByMenuId
(
menuId
);
return
result
>
0
;
}
/**
* 查询菜单使用数量
...
...
qianhe-ydsj/src/main/java/com/qianhe/bzsc/controller/BzscCyglqglscMbcbController.java
View file @
df7baf31
...
...
@@ -96,9 +96,13 @@ public class BzscCyglqglscMbcbController extends BaseController
* 删除标准手册-采油管理区管理手册-模板从
*/
@Log
(
title
=
"标准手册-采油管理区管理手册-模板从"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ID
s
}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
IDs
)
@DeleteMapping
(
"/{ID}"
)
public
AjaxResult
remove
(
@PathVariable
Long
ID
)
{
return
toAjax
(
bzscCyglqglscMbcbService
.
deleteBzscCyglqglscMbcbByIDs
(
IDs
));
if
(
bzscCyglqglscMbcbService
.
hasChildByID
(
ID
))
{
return
warn
(
"存在子内容,不允许删除"
);
}
return
toAjax
(
bzscCyglqglscMbcbService
.
deleteBzscCyglqglscMbcbByID
(
ID
));
}
}
qianhe-ydsj/src/main/java/com/qianhe/bzsc/controller/BzscCyglqglscMbzbController.java
View file @
df7baf31
...
...
@@ -2,6 +2,9 @@ package com.qianhe.bzsc.controller;
import
java.util.List
;
import
javax.servlet.http.HttpServletResponse
;
import
com.qianhe.bzsc.domain.BzscCyglqglscMbcb
;
import
com.qianhe.bzsc.service.IBzscCyglqglscMbcbService
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -86,13 +89,20 @@ public class BzscCyglqglscMbzbController extends BaseController
return
toAjax
(
bzscCyglqglscMbzbService
.
updateBzscCyglqglscMbzb
(
bzscCyglqglscMbzb
));
}
@Autowired
private
IBzscCyglqglscMbcbService
bzscCyglqglscMbcbService
;
/**
* 删除标准手册-采油管理区管理手册-模板主
*/
@Log
(
title
=
"标准手册-采油管理区管理手册-模板主"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ID
s
}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
IDs
)
@DeleteMapping
(
"/{ID}"
)
public
AjaxResult
remove
(
@PathVariable
Long
ID
)
{
return
toAjax
(
bzscCyglqglscMbzbService
.
deleteBzscCyglqglscMbzbByIDs
(
IDs
));
List
<
BzscCyglqglscMbcb
>
list
=
bzscCyglqglscMbcbService
.
selectBzscCyglqglscMbcbList_ByZbid
(
ID
);
if
(
list
.
size
()>
0
)
{
return
warn
(
"存在明细内容,不允许删除"
);
}
return
toAjax
(
bzscCyglqglscMbzbService
.
deleteBzscCyglqglscMbzbByID
(
ID
));
}
}
qianhe-ydsj/src/main/java/com/qianhe/bzsc/domain/BzscCyglqglscMbcb.java
View file @
df7baf31
...
...
@@ -24,14 +24,6 @@ public class BzscCyglqglscMbcb extends BaseEntity
@Excel
(
name
=
"主表id"
)
private
Long
zbId
;
/** 单位id */
@Excel
(
name
=
"单位id"
)
private
Long
deptId
;
/** 年度 */
@Excel
(
name
=
"年度"
)
private
String
nd
;
/** 上级id */
@Excel
(
name
=
"上级id"
)
private
Long
parentId
;
...
...
@@ -90,24 +82,8 @@ public class BzscCyglqglscMbcb extends BaseEntity
{
return
zbId
;
}
public
void
setDeptId
(
Long
deptId
)
{
this
.
deptId
=
deptId
;
}
public
Long
getDeptId
()
{
return
deptId
;
}
public
void
setNd
(
String
nd
)
{
this
.
nd
=
nd
;
}
public
String
getNd
()
{
return
nd
;
}
public
void
setParentId
(
Long
parentId
)
{
this
.
parentId
=
parentId
;
...
...
@@ -204,8 +180,7 @@ public class BzscCyglqglscMbcb extends BaseEntity
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"ID"
,
getID
())
.
append
(
"zbId"
,
getZbId
())
.
append
(
"deptId"
,
getDeptId
())
.
append
(
"nd"
,
getNd
())
.
append
(
"parentId"
,
getParentId
())
.
append
(
"mc"
,
getMc
())
.
append
(
"ms"
,
getMs
())
...
...
qianhe-ydsj/src/main/java/com/qianhe/bzsc/mapper/BzscCyglqglscMbcbMapper.java
View file @
df7baf31
...
...
@@ -60,4 +60,6 @@ public interface BzscCyglqglscMbcbMapper
public
int
deleteBzscCyglqglscMbcbByIDs
(
Long
[]
IDs
);
public
List
<
BzscCyglqglscMbcb
>
selectBzscCyglqglscMbcbList_ByZbid
(
Long
zbId
);
public
int
hasChildByID
(
Long
ID
);
}
qianhe-ydsj/src/main/java/com/qianhe/bzsc/service/IBzscCyglqglscMbcbService.java
View file @
df7baf31
...
...
@@ -60,4 +60,6 @@ public interface IBzscCyglqglscMbcbService
public
int
deleteBzscCyglqglscMbcbByID
(
Long
ID
);
public
List
<
BzscCyglqglscMbcb
>
selectBzscCyglqglscMbcbList_ByZbid
(
Long
zbId
);
public
boolean
hasChildByID
(
Long
menuId
);
}
qianhe-ydsj/src/main/java/com/qianhe/bzsc/service/impl/BzscCyglqglscMbcbServiceImpl.java
View file @
df7baf31
...
...
@@ -169,4 +169,11 @@ public class BzscCyglqglscMbcbServiceImpl implements IBzscCyglqglscMbcbService
{
return
getChildList
(
list
,
t
).
size
()
>
0
;
}
@Override
public
boolean
hasChildByID
(
Long
ID
)
{
int
result
=
bzscCyglqglscMbcbMapper
.
hasChildByID
(
ID
);
return
result
>
0
;
}
}
qianhe-ydsj/src/main/resources/mapper/bzsc/BzscCyglqglscMbcbMapper.xml
View file @
df7baf31
...
...
@@ -7,8 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"BzscCyglqglscMbcb"
id=
"BzscCyglqglscMbcbResult"
>
<result
property=
"ID"
column=
"ID"
/>
<result
property=
"zbId"
column=
"zb_id"
/>
<result
property=
"deptId"
column=
"dept_id"
/>
<result
property=
"nd"
column=
"nd"
/>
<result
property=
"parentId"
column=
"parent_id"
/>
<result
property=
"mc"
column=
"mc"
/>
<result
property=
"ms"
column=
"ms"
/>
...
...
@@ -27,15 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql
id=
"selectBzscCyglqglscMbcbVo"
>
select ID, zb_id,
dept_id, nd,
parent_id, mc, ms, nr, px, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5 from bzsc_cyglqglsc_mbcb
select ID, zb_id, parent_id, mc, ms, nr, px, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5 from bzsc_cyglqglsc_mbcb
</sql>
<select
id=
"selectBzscCyglqglscMbcbList"
parameterType=
"BzscCyglqglscMbcb"
resultMap=
"BzscCyglqglscMbcbResult"
>
<include
refid=
"selectBzscCyglqglscMbcbVo"
/>
<where>
<if
test=
"zbId != null "
>
and zb_id = #{zbId}
</if>
<if
test=
"deptId != null "
>
and dept_id = #{deptId}
</if>
<if
test=
"nd != null and nd != ''"
>
and nd = #{nd}
</if>
<if
test=
"parentId != null "
>
and parent_id = #{parentId}
</if>
<if
test=
"mc != null and mc != ''"
>
and mc = #{mc}
</if>
<if
test=
"ms != null and ms != ''"
>
and ms = #{ms}
</if>
...
...
@@ -66,8 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bzsc_cyglqglsc_mbcb
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"zbId != null"
>
zb_id,
</if>
<if
test=
"deptId != null"
>
dept_id,
</if>
<if
test=
"nd != null"
>
nd,
</if>
<if
test=
"parentId != null"
>
parent_id,
</if>
<if
test=
"mc != null"
>
mc,
</if>
<if
test=
"ms != null"
>
ms,
</if>
...
...
@@ -86,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"zbId != null"
>
#{zbId},
</if>
<if
test=
"deptId != null"
>
#{deptId},
</if>
<if
test=
"nd != null"
>
#{nd},
</if>
<if
test=
"parentId != null"
>
#{parentId},
</if>
<if
test=
"mc != null"
>
#{mc},
</if>
<if
test=
"ms != null"
>
#{ms},
</if>
...
...
@@ -110,8 +103,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bzsc_cyglqglsc_mbcb
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"zbId != null"
>
zb_id = #{zbId},
</if>
<if
test=
"deptId != null"
>
dept_id = #{deptId},
</if>
<if
test=
"nd != null"
>
nd = #{nd},
</if>
<if
test=
"parentId != null"
>
parent_id = #{parentId},
</if>
<if
test=
"mc != null"
>
mc = #{mc},
</if>
<if
test=
"ms != null"
>
ms = #{ms},
</if>
...
...
@@ -141,4 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{ID}
</foreach>
</delete>
<select
id=
"hasChildByID"
resultType=
"Integer"
>
select count(1) from bzsc_cyglqglsc_mbcb where parent_id = #{ID}
</select>
</mapper>
\ No newline at end of file
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