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
b182a5ee
Commit
b182a5ee
authored
Oct 31, 2024
by
wangqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基层单位自查-自查问题
parent
187cebeb
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
310 additions
and
6 deletions
+310
-6
qianhe-system/src/main/java/com/qianhe/system/service/ISysDeptService.java
+2
-0
qianhe-system/src/main/java/com/qianhe/system/service/impl/SysDeptServiceImpl.java
+5
-0
qianhe-ydsj/src/main/java/com/qianhe/controller/SjBfzwhController.java
+27
-0
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfJcdwwtcjController.java
+7
-0
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwwtcjController.java
+6
-0
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfbfzjcController.java
+1
-0
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfjgbmjcController.java
+1
-0
qianhe-ydsj/src/main/java/com/qianhe/domain/SjBfzbfdx.java
+54
-0
qianhe-ydsj/src/main/java/com/qianhe/domain/SjBfzwh.java
+11
-0
qianhe-ydsj/src/main/java/com/qianhe/domain/SjZdbfZsdwwtcj.java
+2
-2
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjBfzwhMapper.java
+9
-0
qianhe-ydsj/src/main/java/com/qianhe/service/ISjBfzwhService.java
+20
-0
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjBfzwhServiceImpl.java
+136
-2
qianhe-ydsj/src/main/resources/mapper/SjBfzwhMapper.xml
+26
-0
qianhe-ydsj/src/main/resources/mapper/SjZdbfJcdwwtcjMapper.xml
+3
-2
No files found.
qianhe-system/src/main/java/com/qianhe/system/service/ISysDeptService.java
View file @
b182a5ee
...
@@ -138,4 +138,6 @@ public interface ISysDeptService
...
@@ -138,4 +138,6 @@ public interface ISysDeptService
* @return 结果
* @return 结果
*/
*/
public
int
deleteDeptById
(
Long
deptId
);
public
int
deleteDeptById
(
Long
deptId
);
public
List
<
SysDept
>
selectDeptList_sy
(
SysDept
dept
);
}
}
qianhe-system/src/main/java/com/qianhe/system/service/impl/SysDeptServiceImpl.java
View file @
b182a5ee
...
@@ -378,4 +378,9 @@ public class SysDeptServiceImpl implements ISysDeptService
...
@@ -378,4 +378,9 @@ public class SysDeptServiceImpl implements ISysDeptService
{
{
return
getChildList
(
list
,
t
).
size
()
>
0
;
return
getChildList
(
list
,
t
).
size
()
>
0
;
}
}
public
List
<
SysDept
>
selectDeptList_sy
(
SysDept
dept
)
{
return
deptMapper
.
selectDeptList
(
dept
);
}
}
}
qianhe-ydsj/src/main/java/com/qianhe/controller/SjBfzwhController.java
View file @
b182a5ee
...
@@ -3,9 +3,11 @@ package com.qianhe.controller;
...
@@ -3,9 +3,11 @@ package com.qianhe.controller;
import
java.util.List
;
import
java.util.List
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
com.qianhe.common.core.domain.entity.SysDept
;
import
com.qianhe.common.utils.SecurityUtils
;
import
com.qianhe.common.utils.SecurityUtils
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.service.ISjBfzwhService
;
import
com.qianhe.service.ISjBfzwhService
;
import
com.qianhe.system.service.ISysDeptService
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
@@ -130,4 +132,29 @@ public class SjBfzwhController extends BaseController
...
@@ -130,4 +132,29 @@ public class SjBfzwhController extends BaseController
{
{
return
toAjax
(
sjBfzwhService
.
deleteSjBfzwhByIds
(
ids
));
return
toAjax
(
sjBfzwhService
.
deleteSjBfzwhByIds
(
ids
));
}
}
@Autowired
private
ISysDeptService
deptService
;
/**
* 加载对应帮扶组单位列表树
*/
@GetMapping
(
value
=
"/bfzBfdxTreeselect/{id}"
)
public
AjaxResult
roleMenuTreeselect
(
@PathVariable
(
"id"
)
Long
id
)
{
List
<
SysDept
>
depts
=
deptService
.
selectDeptList_sy
(
new
SysDept
());
AjaxResult
ajax
=
AjaxResult
.
success
();
ajax
.
put
(
"checkedKeys"
,
sjBfzwhService
.
selectBfdxListByBfz
(
id
));
ajax
.
put
(
"menus"
,
sjBfzwhService
.
buildBfdwTreeSelect
(
depts
));
return
ajax
;
}
/**
* 获取菜单下拉树列表
*/
@GetMapping
(
"/deptTreeselect"
)
public
AjaxResult
treeselect
(
SysDept
dept
)
{
List
<
SysDept
>
depts
=
deptService
.
selectDeptList_sy
(
new
SysDept
());
return
success
(
sjBfzwhService
.
buildBfdwTreeSelect
(
depts
));
}
}
}
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfJcdwwtcjController.java
View file @
b182a5ee
...
@@ -8,6 +8,7 @@ import com.qianhe.common.core.page.TableDataInfo;
...
@@ -8,6 +8,7 @@ import com.qianhe.common.core.page.TableDataInfo;
import
com.qianhe.common.enums.BusinessType
;
import
com.qianhe.common.enums.BusinessType
;
import
com.qianhe.common.exception.BusinessException
;
import
com.qianhe.common.exception.BusinessException
;
import
com.qianhe.common.utils.DateUtils
;
import
com.qianhe.common.utils.DateUtils
;
import
com.qianhe.common.utils.SecurityUtils
;
import
com.qianhe.common.utils.StringUtils
;
import
com.qianhe.common.utils.StringUtils
;
import
com.qianhe.domain.SjZdbfKhpjbzCb
;
import
com.qianhe.domain.SjZdbfKhpjbzCb
;
import
com.qianhe.domain.SjZdbfZsdwwtcj
;
import
com.qianhe.domain.SjZdbfZsdwwtcj
;
...
@@ -129,6 +130,7 @@ public class SjZdbfJcdwwtcjController extends BaseController
...
@@ -129,6 +130,7 @@ public class SjZdbfJcdwwtcjController extends BaseController
public
AjaxResult
add
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
add
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"基层单位自查"
);
sjZdbfZsdwwtcj
.
setJcjb
(
"基层单位自查"
);
sjZdbfZsdwwtcj
.
setYl3
(
sjZdbfZsdwwtcj
.
getDeptId
());
return
toAjax
(
sjZdbfJcdwwtcjService
.
insertSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfJcdwwtcjService
.
insertSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
@@ -140,6 +142,8 @@ public class SjZdbfJcdwwtcjController extends BaseController
...
@@ -140,6 +142,8 @@ public class SjZdbfJcdwwtcjController extends BaseController
@PutMapping
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"基层单位自查"
);
sjZdbfZsdwwtcj
.
setYl3
(
sjZdbfZsdwwtcj
.
getDeptId
());
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
@@ -212,6 +216,7 @@ public class SjZdbfJcdwwtcjController extends BaseController
...
@@ -212,6 +216,7 @@ public class SjZdbfJcdwwtcjController extends BaseController
return
AjaxResult
.
error
(
"导入失败,第"
+(
i
+
1
)+
"行未匹配到三级单位"
);
return
AjaxResult
.
error
(
"导入失败,第"
+(
i
+
1
)+
"行未匹配到三级单位"
);
}
}
zsdwwtcj
.
setDeptId
(
sjdept
.
getDeptId
());
zsdwwtcj
.
setDeptId
(
sjdept
.
getDeptId
());
zsdwwtcj
.
setYl3
(
sjdept
.
getDeptId
());
//问题描述
//问题描述
String
wtms
=
new
DataFormatter
().
formatCellValue
(
row
.
getCell
(
3
))
;
String
wtms
=
new
DataFormatter
().
formatCellValue
(
row
.
getCell
(
3
))
;
if
(
StringUtils
.
isEmpty
(
wtms
)){
if
(
StringUtils
.
isEmpty
(
wtms
)){
...
@@ -261,6 +266,8 @@ public class SjZdbfJcdwwtcjController extends BaseController
...
@@ -261,6 +266,8 @@ public class SjZdbfJcdwwtcjController extends BaseController
String
zgzt
=
new
DataFormatter
().
formatCellValue
(
row
.
getCell
(
10
))
;
String
zgzt
=
new
DataFormatter
().
formatCellValue
(
row
.
getCell
(
10
))
;
zsdwwtcj
.
setZgzt
(
zgzt
);
zsdwwtcj
.
setZgzt
(
zgzt
);
zsdwwtcj
.
setJcjb
(
"基层单位自查"
);
zsdwwtcj
.
setJcjb
(
"基层单位自查"
);
zsdwwtcj
.
setCreateTime
(
DateUtils
.
getNowDate
());
zsdwwtcj
.
setCreateBy
(
SecurityUtils
.
getUsername
());
list
.
add
(
zsdwwtcj
);
list
.
add
(
zsdwwtcj
);
}
}
if
(
list
.
size
()>
0
){
if
(
list
.
size
()>
0
){
...
...
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwwtcjController.java
View file @
b182a5ee
...
@@ -68,6 +68,7 @@ public class SjZdbfZsdwwtcjController extends BaseController
...
@@ -68,6 +68,7 @@ public class SjZdbfZsdwwtcjController extends BaseController
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
TableDataInfo
list
(
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"直属单位自查"
);
startPage
();
startPage
();
List
<
SjZdbfZsdwwtcj
>
list
=
sjZdbfZsdwwtcjService
.
selectSjZdbfZsdwwtcjList
(
sjZdbfZsdwwtcj
);
List
<
SjZdbfZsdwwtcj
>
list
=
sjZdbfZsdwwtcjService
.
selectSjZdbfZsdwwtcjList
(
sjZdbfZsdwwtcj
);
return
getDataTable
(
list
);
return
getDataTable
(
list
);
...
@@ -135,6 +136,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
...
@@ -135,6 +136,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
@PostMapping
@PostMapping
public
AjaxResult
add
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
add
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"直属单位自查"
);
sjZdbfZsdwwtcj
.
setYl3
(
sjZdbfZsdwwtcj
.
getDeptId
());
return
toAjax
(
sjZdbfZsdwwtcjService
.
insertSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfZsdwwtcjService
.
insertSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
@@ -146,6 +149,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
...
@@ -146,6 +149,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
@PutMapping
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"直属单位自查"
);
sjZdbfZsdwwtcj
.
setYl3
(
sjZdbfZsdwwtcj
.
getDeptId
());
return
toAjax
(
sjZdbfZsdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfZsdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
@@ -212,6 +217,7 @@ public class SjZdbfZsdwwtcjController extends BaseController
...
@@ -212,6 +217,7 @@ public class SjZdbfZsdwwtcjController extends BaseController
if
(
ejdept
==
null
){
if
(
ejdept
==
null
){
return
AjaxResult
.
error
(
"导入失败,第"
+(
i
+
1
)+
"行未匹配到二级单位"
);
return
AjaxResult
.
error
(
"导入失败,第"
+(
i
+
1
)+
"行未匹配到二级单位"
);
}
}
zsdwwtcj
.
setYl3
(
ejdept
.
getDeptId
());
String
sjdw
=
split
[
1
];
String
sjdw
=
split
[
1
];
SysDept
sjdept
=
deptList
.
stream
().
filter
(
dept
->
dept
.
getDeptName
().
equals
(
sjdw
)
&&
dept
.
getParentId
().
equals
(
ejdept
.
getDeptId
())).
findFirst
().
orElse
(
null
);
SysDept
sjdept
=
deptList
.
stream
().
filter
(
dept
->
dept
.
getDeptName
().
equals
(
sjdw
)
&&
dept
.
getParentId
().
equals
(
ejdept
.
getDeptId
())).
findFirst
().
orElse
(
null
);
if
(
sjdept
==
null
){
if
(
sjdept
==
null
){
...
...
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfbfzjcController.java
View file @
b182a5ee
...
@@ -160,6 +160,7 @@ public class SjZdbfbfzjcController extends BaseController
...
@@ -160,6 +160,7 @@ public class SjZdbfbfzjcController extends BaseController
@PutMapping
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"帮扶组检查"
);
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
...
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfjgbmjcController.java
View file @
b182a5ee
...
@@ -139,6 +139,7 @@ public class SjZdbfjgbmjcController extends BaseController
...
@@ -139,6 +139,7 @@ public class SjZdbfjgbmjcController extends BaseController
@PutMapping
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
public
AjaxResult
edit
(
@RequestBody
SjZdbfZsdwwtcj
sjZdbfZsdwwtcj
)
{
{
sjZdbfZsdwwtcj
.
setJcjb
(
"机关部门检查"
);
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
return
toAjax
(
sjZdbfJcdwwtcjService
.
updateSjZdbfZsdwwtcj
(
sjZdbfZsdwwtcj
));
}
}
...
...
qianhe-ydsj/src/main/java/com/qianhe/domain/SjBfzbfdx.java
0 → 100644
View file @
b182a5ee
package
com
.
qianhe
.
domain
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.qianhe.common.annotation.Excel
;
import
com.qianhe.common.core.domain.BaseEntity
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
java.util.Date
;
/**
* 三基帮扶组维护对象 sj_bfzwh
*
* @author qianhe
* @date 2024-08-31
*/
public
class
SjBfzbfdx
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** 帮扶组id */
private
Long
id
;
/** 部门id */
@Excel
(
name
=
"部门id"
)
private
Long
deptId
;
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
Long
getId
()
{
return
id
;
}
public
void
setDeptId
(
Long
deptId
)
{
this
.
deptId
=
deptId
;
}
public
Long
getDeptId
()
{
return
deptId
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"id"
,
getId
())
.
append
(
"deptId"
,
getDeptId
())
.
toString
();
}
}
qianhe-ydsj/src/main/java/com/qianhe/domain/SjBfzwh.java
View file @
b182a5ee
...
@@ -54,6 +54,9 @@ public class SjBfzwh extends BaseEntity
...
@@ -54,6 +54,9 @@ public class SjBfzwh extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
bz
;
private
String
bz
;
/** 单位组 */
private
Long
[]
deptIds
;
public
void
setId
(
Long
id
)
public
void
setId
(
Long
id
)
{
{
this
.
id
=
id
;
this
.
id
=
id
;
...
@@ -150,4 +153,12 @@ public class SjBfzwh extends BaseEntity
...
@@ -150,4 +153,12 @@ public class SjBfzwh extends BaseEntity
.
append
(
"bz"
,
getBz
())
.
append
(
"bz"
,
getBz
())
.
toString
();
.
toString
();
}
}
public
Long
[]
getDeptIds
()
{
return
deptIds
;
}
public
void
setDeptIds
(
Long
[]
deptIds
)
{
this
.
deptIds
=
deptIds
;
}
}
}
qianhe-ydsj/src/main/java/com/qianhe/domain/SjZdbfZsdwwtcj.java
View file @
b182a5ee
...
@@ -74,11 +74,11 @@ public class SjZdbfZsdwwtcj extends BaseEntity
...
@@ -74,11 +74,11 @@ public class SjZdbfZsdwwtcj extends BaseEntity
/** 预留2 */
/** 预留2 */
@Excel
(
name
=
"帮扶组检查-问题单位"
)
@Excel
(
name
=
"帮扶组检查-问题单位"
)
private
Stri
ng
yl2
;
private
Lo
ng
yl2
;
/** 预留3 */
/** 预留3 */
@Excel
(
name
=
"机关单位检查-问题单位"
)
@Excel
(
name
=
"机关单位检查-问题单位"
)
private
Stri
ng
yl3
;
private
Lo
ng
yl3
;
/** 预留4 */
/** 预留4 */
@Excel
(
name
=
"预留4"
)
@Excel
(
name
=
"预留4"
)
...
...
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjBfzwhMapper.java
View file @
b182a5ee
package
com
.
qianhe
.
mapper
;
package
com
.
qianhe
.
mapper
;
import
com.qianhe.domain.SjBfzbfdx
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.domain.SjBfzwh
;
import
java.util.List
;
import
java.util.List
;
...
@@ -65,4 +66,12 @@ public interface SjBfzwhMapper
...
@@ -65,4 +66,12 @@ public interface SjBfzwhMapper
* @return 结果
* @return 结果
*/
*/
public
int
deleteSjBfzwhByIds
(
Long
[]
ids
);
public
int
deleteSjBfzwhByIds
(
Long
[]
ids
);
public
List
<
Long
>
selectBfdxListByBfz
(
Long
id
);
public
int
batchBfzBfdx
(
List
<
SjBfzbfdx
>
bfzBfdxList
);
public
int
deleteBfzBfdxById
(
Long
id
);
public
int
deleteBfzBfdx
(
Long
[]
ids
);
}
}
qianhe-ydsj/src/main/java/com/qianhe/service/ISjBfzwhService.java
View file @
b182a5ee
package
com
.
qianhe
.
service
;
package
com
.
qianhe
.
service
;
import
com.qianhe.common.core.domain.TreeSelect
;
import
com.qianhe.common.core.domain.entity.SysDept
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.domain.SjBfzwh
;
import
java.util.List
;
import
java.util.List
;
...
@@ -62,4 +64,22 @@ public interface ISjBfzwhService
...
@@ -62,4 +64,22 @@ public interface ISjBfzwhService
* @return 结果
* @return 结果
*/
*/
public
int
deleteSjBfzwhById
(
Long
id
);
public
int
deleteSjBfzwhById
(
Long
id
);
/**
* 查询三基帮扶组帮扶对象
*
* @param id 三基帮扶组维护主键
* @return 三基帮扶组维护
*/
public
List
<
Long
>
selectBfdxListByBfz
(
Long
id
);
/**
* 构建前端所需要下拉树结构
*
* @param depts 单位列表
* @return 下拉树结构列表
*/
public
List
<
TreeSelect
>
buildBfdwTreeSelect
(
List
<
SysDept
>
depts
);
public
List
<
SysDept
>
buildBfdwxTree
(
List
<
SysDept
>
menus
);
}
}
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjBfzwhServiceImpl.java
View file @
b182a5ee
package
com
.
qianhe
.
service
.
impl
;
package
com
.
qianhe
.
service
.
impl
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
com.qianhe.common.annotation.DataScope
;
import
com.qianhe.common.annotation.DataScope
;
import
com.qianhe.common.core.domain.TreeSelect
;
import
com.qianhe.common.core.domain.entity.SysDept
;
import
com.qianhe.domain.SjBfzbfdx
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.domain.SjBfzwh
;
import
com.qianhe.mapper.SjBfzwhMapper
;
import
com.qianhe.mapper.SjBfzwhMapper
;
import
com.qianhe.service.ISjBfzwhService
;
import
com.qianhe.service.ISjBfzwhService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
/**
/**
...
@@ -62,9 +69,34 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
...
@@ -62,9 +69,34 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
* @return 结果
* @return 结果
*/
*/
@Override
@Override
@Transactional
public
int
insertSjBfzwh
(
SjBfzwh
sjBfzwh
)
public
int
insertSjBfzwh
(
SjBfzwh
sjBfzwh
)
{
{
return
sjBfzwhMapper
.
insertSjBfzwh
(
sjBfzwh
);
sjBfzwhMapper
.
insertSjBfzwh
(
sjBfzwh
);
return
insertBfzBfdx
(
sjBfzwh
);
}
/**
* 新增帮扶组帮扶对象信息
*
*/
public
int
insertBfzBfdx
(
SjBfzwh
sjBfzwh
)
{
int
rows
=
1
;
// 新增用户与角色管理
List
<
SjBfzbfdx
>
list
=
new
ArrayList
<
SjBfzbfdx
>();
for
(
Long
deptId
:
sjBfzwh
.
getDeptIds
())
{
SjBfzbfdx
rm
=
new
SjBfzbfdx
();
rm
.
setId
(
sjBfzwh
.
getId
());
rm
.
setDeptId
(
deptId
);
list
.
add
(
rm
);
}
if
(
list
.
size
()
>
0
)
{
rows
=
sjBfzwhMapper
.
batchBfzBfdx
(
list
);
}
return
rows
;
}
}
/**
/**
...
@@ -74,9 +106,13 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
...
@@ -74,9 +106,13 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
* @return 结果
* @return 结果
*/
*/
@Override
@Override
@Transactional
public
int
updateSjBfzwh
(
SjBfzwh
sjBfzwh
)
public
int
updateSjBfzwh
(
SjBfzwh
sjBfzwh
)
{
{
return
sjBfzwhMapper
.
updateSjBfzwh
(
sjBfzwh
);
sjBfzwhMapper
.
updateSjBfzwh
(
sjBfzwh
);
// 删除角色与菜单关联
sjBfzwhMapper
.
deleteBfzBfdxById
(
sjBfzwh
.
getId
());
return
insertBfzBfdx
(
sjBfzwh
);
}
}
/**
/**
...
@@ -86,8 +122,10 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
...
@@ -86,8 +122,10 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
* @return 结果
* @return 结果
*/
*/
@Override
@Override
@Transactional
public
int
deleteSjBfzwhByIds
(
Long
[]
ids
)
public
int
deleteSjBfzwhByIds
(
Long
[]
ids
)
{
{
sjBfzwhMapper
.
deleteBfzBfdx
(
ids
);
return
sjBfzwhMapper
.
deleteSjBfzwhByIds
(
ids
);
return
sjBfzwhMapper
.
deleteSjBfzwhByIds
(
ids
);
}
}
...
@@ -98,8 +136,104 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
...
@@ -98,8 +136,104 @@ public class SjBfzwhServiceImpl implements ISjBfzwhService
* @return 结果
* @return 结果
*/
*/
@Override
@Override
@Transactional
public
int
deleteSjBfzwhById
(
Long
id
)
public
int
deleteSjBfzwhById
(
Long
id
)
{
{
sjBfzwhMapper
.
deleteBfzBfdxById
(
id
);
return
sjBfzwhMapper
.
deleteSjBfzwhById
(
id
);
return
sjBfzwhMapper
.
deleteSjBfzwhById
(
id
);
}
}
@Override
public
List
<
Long
>
selectBfdxListByBfz
(
Long
id
)
{
return
sjBfzwhMapper
.
selectBfdxListByBfz
(
id
);
}
/**
* 构建前端所需要下拉树结构
*
* @param depts 菜单列表
* @return 下拉树结构列表
*/
@Override
public
List
<
TreeSelect
>
buildBfdwTreeSelect
(
List
<
SysDept
>
depts
)
{
List
<
SysDept
>
deptTrees
=
buildBfdwxTree
(
depts
);
return
deptTrees
.
stream
().
map
(
TreeSelect:
:
new
).
collect
(
Collectors
.
toList
());
}
/**
* 构建前端所需要树结构
*
* @param depts 单位列表
* @return 树结构列表
*/
@Override
public
List
<
SysDept
>
buildBfdwxTree
(
List
<
SysDept
>
depts
)
{
List
<
SysDept
>
returnList
=
new
ArrayList
<
SysDept
>();
List
<
Long
>
tempList
=
depts
.
stream
().
map
(
SysDept:
:
getDeptId
).
collect
(
Collectors
.
toList
());
for
(
Iterator
<
SysDept
>
iterator
=
depts
.
iterator
();
iterator
.
hasNext
();)
{
SysDept
menu
=
(
SysDept
)
iterator
.
next
();
// 如果是顶级节点, 遍历该父节点的所有子节点
if
(!
tempList
.
contains
(
menu
.
getParentId
()))
{
recursionFn
(
depts
,
menu
);
returnList
.
add
(
menu
);
}
}
if
(
returnList
.
isEmpty
())
{
returnList
=
depts
;
}
return
returnList
;
}
/**
* 递归列表
*
* @param list 分类表
* @param t 子节点
*/
private
void
recursionFn
(
List
<
SysDept
>
list
,
SysDept
t
)
{
// 得到子节点列表
List
<
SysDept
>
childList
=
getChildList
(
list
,
t
);
t
.
setChildren
(
childList
);
for
(
SysDept
tChild
:
childList
)
{
if
(
hasChild
(
list
,
tChild
))
{
recursionFn
(
list
,
tChild
);
}
}
}
/**
* 得到子节点列表
*/
private
List
<
SysDept
>
getChildList
(
List
<
SysDept
>
list
,
SysDept
t
)
{
List
<
SysDept
>
tlist
=
new
ArrayList
<
SysDept
>();
Iterator
<
SysDept
>
it
=
list
.
iterator
();
while
(
it
.
hasNext
())
{
SysDept
n
=
(
SysDept
)
it
.
next
();
if
(
n
.
getParentId
().
longValue
()
==
t
.
getDeptId
().
longValue
())
{
tlist
.
add
(
n
);
}
}
return
tlist
;
}
/**
* 判断是否有子节点
*/
private
boolean
hasChild
(
List
<
SysDept
>
list
,
SysDept
t
)
{
return
getChildList
(
list
,
t
).
size
()
>
0
;
}
}
}
qianhe-ydsj/src/main/resources/mapper/SjBfzwhMapper.xml
View file @
b182a5ee
...
@@ -95,4 +95,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -95,4 +95,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
#{id}
</foreach>
</foreach>
</delete>
</delete>
<select
id=
"selectBfdxListByBfz"
resultType=
"Long"
>
select d.dept_id from sys_dept d
left join sj_bfzbfdx m
on m.dept_id = d.dept_id
where m.id = #{id}
order by d.parent_id, d.order_num
</select>
<insert
id=
"batchBfzBfdx"
>
insert into sj_bfzbfdx(id, dept_id) values
<foreach
item=
"item"
index=
"index"
collection=
"list"
separator=
","
>
(#{item.id},#{item.deptId})
</foreach>
</insert>
<delete
id=
"deleteBfzBfdxById"
parameterType=
"Long"
>
delete from sj_bfzbfdx where id=#{id}
</delete>
<delete
id=
"deleteBfzBfdx"
parameterType=
"Long"
>
delete from sj_bfzbfdx where id in
<foreach
collection=
"array"
item=
"id"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</delete>
</mapper>
</mapper>
qianhe-ydsj/src/main/resources/mapper/SjZdbfJcdwwtcjMapper.xml
View file @
b182a5ee
...
@@ -145,9 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -145,9 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</trim>
</insert>
</insert>
<insert
id=
"batchSave"
>
<insert
id=
"batchSave"
>
insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt) values
insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt
,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5
) values
<foreach
item=
"item"
index=
"index"
collection=
"list"
separator=
","
>
<foreach
item=
"item"
index=
"index"
collection=
"list"
separator=
","
>
( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt})
( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}
, #{item.createBy}, #{item.createTime}, #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
</foreach>
</foreach>
</insert>
</insert>
...
...
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