Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
3464d18e
Commit
3464d18e
authored
Jun 28, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://172.16.10.76/moa/amos-boot-biz
into developer
parents
fa9de309
654ca68c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
182 additions
and
143 deletions
+182
-143
FireExpertsDto.java
...ejoin/amos/boot/module/common/api/dto/FireExpertsDto.java
+10
-10
FireExperts.java
...ejoin/amos/boot/module/common/api/entity/FireExperts.java
+13
-12
OrgUsrMapper.java
...yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java
+2
-0
OrgUsrMapper.xml
...module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml
+35
-1
FireExpertsController.java
...t/module/common/biz/controller/FireExpertsController.java
+86
-73
OrgPersonController.java
...s/boot/module/jcs/biz/controller/OrgPersonController.java
+3
-2
OrgUsrServiceImpl.java
...s/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java
+33
-45
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java
View file @
3464d18e
...
...
@@ -28,31 +28,31 @@ public class FireExpertsDto extends BaseDto {
private
String
name
;
@ApiModelProperty
(
value
=
"证件类型"
)
private
String
document
Type
;
private
String
certificates
Type
;
@ApiModelProperty
(
value
=
"证件类型code"
)
private
String
document
TypeCode
;
private
String
certificates
TypeCode
;
@ApiModelProperty
(
value
=
"证件号"
)
private
Long
document
Num
;
private
Long
certificates
Num
;
@ApiModelProperty
(
value
=
"单位"
)
private
String
units
Name
;
private
String
company
Name
;
@ApiModelProperty
(
value
=
"性别"
)
private
String
gender
;
@ApiModelProperty
(
value
=
"名族"
)
private
String
nation
al
;
private
String
nation
;
@ApiModelProperty
(
value
=
"籍贯"
)
private
String
nativePlace
;
@ApiModelProperty
(
value
=
"现居住地"
)
private
String
theLatter
;
private
String
residence
;
@ApiModelProperty
(
value
=
"政治面貌"
)
private
String
political
Landscape
;
private
String
political
Outlook
;
@ApiModelProperty
(
value
=
"办公用 电话"
)
private
String
officePhone
;
...
...
@@ -61,7 +61,7 @@ public class FireExpertsDto extends BaseDto {
private
String
mobilePhone
;
@ApiModelProperty
(
value
=
"最高学历"
)
private
String
educationBackground
;
private
String
highestEducation
;
@ApiModelProperty
(
value
=
"岗位名称"
)
private
String
jobs
;
...
...
@@ -70,10 +70,10 @@ public class FireExpertsDto extends BaseDto {
private
String
jobsCode
;
@ApiModelProperty
(
value
=
"消防专家领域"
)
private
String
field
;
private
String
expert
;
@ApiModelProperty
(
value
=
"消防专家领域code"
)
private
String
field
Code
;
private
String
expert
Code
;
@ApiModelProperty
(
value
=
"人员照片"
)
private
String
personnelPhotos
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java
View file @
3464d18e
...
...
@@ -28,30 +28,31 @@ public class FireExperts extends BaseEntity {
private
String
name
;
@ApiModelProperty
(
value
=
"证件类型"
)
private
String
documentType
;
private
String
certificatesType
;
@ApiModelProperty
(
value
=
"证件类型code"
)
private
String
document
TypeCode
;
private
String
certificates
TypeCode
;
@ApiModelProperty
(
value
=
"证件号"
)
private
Long
document
Num
;
private
Long
certificates
Num
;
@ApiModelProperty
(
value
=
"单位"
)
private
String
units
Name
;
private
String
company
Name
;
@ApiModelProperty
(
value
=
"性别"
)
private
String
gender
;
@ApiModelProperty
(
value
=
"名族"
)
private
String
nation
al
;
private
String
nation
;
@ApiModelProperty
(
value
=
"籍贯"
)
private
String
nativePlace
;
@ApiModelProperty
(
value
=
"现居住地"
)
private
String
theLatter
;
private
String
residence
;
@ApiModelProperty
(
value
=
"政治面貌"
)
private
String
political
Landscape
;
private
String
political
Outlook
;
@ApiModelProperty
(
value
=
"办公用 电话"
)
private
String
officePhone
;
...
...
@@ -60,7 +61,7 @@ public class FireExperts extends BaseEntity {
private
String
mobilePhone
;
@ApiModelProperty
(
value
=
"最高学历"
)
private
String
educationBackground
;
private
String
highestEducation
;
@ApiModelProperty
(
value
=
"岗位名称"
)
private
String
jobs
;
...
...
@@ -69,10 +70,10 @@ public class FireExperts extends BaseEntity {
private
String
jobsCode
;
@ApiModelProperty
(
value
=
"消防专家领域"
)
private
String
field
;
private
String
expert
;
@ApiModelProperty
(
value
=
"消防专家领域code"
)
private
String
field
Code
;
private
String
expert
Code
;
@ApiModelProperty
(
value
=
"人员照片"
)
private
String
personnelPhotos
;
...
...
@@ -88,10 +89,10 @@ public class FireExperts extends BaseEntity {
@ApiModelProperty
(
value
=
"消防机构id"
)
private
Long
fireTeamId
;
@ApiModelProperty
(
value
=
"消防机构name"
)
private
Long
fireTeamName
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
note
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java
View file @
3464d18e
...
...
@@ -17,6 +17,8 @@ import org.apache.ibatis.annotations.Param;
*/
public
interface
OrgUsrMapper
extends
BaseMapper
<
OrgUsr
>
{
String
selectUpUnitByParam
(
@Param
(
"id"
)
String
biz_org_code
);
int
selectPersonListCount
(
Map
<
String
,
Object
>
map
);
List
<
Map
<
String
,
Object
>>
selectPersonList
(
Map
<
String
,
Object
>
map
);
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
3464d18e
...
...
@@ -15,7 +15,38 @@
</select>
<select
id=
"selectPersonListCount"
resultType=
"Integer"
>
select count(1) from (
SELECT
DISTINCT
u.sequence_nbr sequenceNbr,
u.biz_org_name bizOrgName,
u.biz_org_code bizOrgCode,
<if
test=
"fields != null"
>
<foreach
collection=
"fields"
item=
"item"
separator=
","
>
MAX(case f.field_code when #{item} then v.field_value end) ${item}
</foreach>
</if>
FROM
cb_org_usr u LEFT JOIN
jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
where u.parent_id = #{parentId}
AND u.biz_org_type = #{bizOrgType}
AND U.is_delete = 0
GROUP BY
u.sequence_nbr ,
u.biz_org_name ,
u.biz_org_code
)a where a.sequenceNbr is not null
<if
test=
"bizOrgName != null"
>
AND u.bizOrgName = #{bizOrgName}
</if>
<if
test=
"bizOrgCode != null"
>
AND u.bizOrgName = #{bizOrgCode}
</if>
<if
test=
"fieldsValue != null"
>
<foreach
collection=
"fieldsValue.keys"
item=
"item"
>
AND a.${item} = #{fieldsValue[${item}]}
</foreach>
</if>
</select>
<select
id=
"selectPersonList"
resultType=
"Map"
>
...
...
@@ -46,6 +77,9 @@
<if
test=
"bizOrgCode != null"
>
AND u.bizOrgName = #{bizOrgCode}
</if>
<if
test=
"fieldsValue != null"
>
<foreach
collection=
"fieldsValue.keys"
item=
"item"
>
AND a.${item} = #{fieldsValue[${item}]}
</foreach>
</if>
LIMIT #{pageNum}, #{pageSize}
</select>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java
View file @
3464d18e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
biz
.
controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
java.util.List
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto
;
...
...
@@ -18,13 +22,13 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
*
*消防专家
* @author system_generator
* @date 2021-06-25
*/
* 消防专家
*
* @author system_generator
* @date 2021-06-25
*/
@RestController
@Api
(
tags
=
"Api"
)
@Api
(
tags
=
"
消防专家
Api"
)
@RequestMapping
(
value
=
"/common/fire-experts"
)
public
class
FireExpertsController
extends
BaseController
{
...
...
@@ -32,77 +36,86 @@ public class FireExpertsController extends BaseController {
FireExpertsServiceImpl
fireExpertsServiceImpl
;
/**
* 新增
* @return
*/
* 新增
*
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ResponseModel
<
FireExpertsDto
>
save
(
@RequestBody
FireExpertsDto
model
)
{
model
=
fireExpertsServiceImpl
.
createWithModel
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ResponseModel
<
FireExpertsDto
>
save
(
@RequestBody
FireExpertsDto
model
)
{
model
=
fireExpertsServiceImpl
.
createWithModel
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
/**
* 根据sequenceNbr更新
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新"
,
notes
=
"根据sequenceNbr更新"
)
public
ResponseModel
<
FireExpertsDto
>
updateBySequenceNbrFireExperts
(
@RequestBody
FireExpertsDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
updateWithModel
(
model
));
}
/**
* 根据sequenceNbr删除
* @param sequenceNbr 主键
* @return
*/
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新"
,
notes
=
"根据sequenceNbr更新"
)
public
ResponseModel
<
FireExpertsDto
>
updateBySequenceNbrFireExperts
(
@RequestBody
FireExpertsDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
updateWithModel
(
model
));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除"
,
notes
=
"根据sequenceNbr删除"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
FireExpertsDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
FireExpertsDto
>
seleteOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 列表分页查询
*@param current 当前页
*@param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页查询"
,
notes
=
"分页查询"
)
public
ResponseModel
<
Page
<
FireExpertsDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
FireExpertsDto
>
page
=
new
Page
<
FireExpertsDto
>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryForFireExpertsPage
(
page
));
}
/**
*列表全部数据查询
*@return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
FireExpertsDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryForFireExpertsList
());
}
* 列表分页查询
*
* @param current 当前页
* @param size 每页大小
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页查询"
,
notes
=
"分页查询"
)
public
ResponseModel
<
Page
<
FireExpertsDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
FireExpertsDto
>
page
=
new
Page
<>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryForFireExpertsPage
(
page
));
}
/**
* 列表全部数据查询
*
* @return 返回结果
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
FireExpertsDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
queryForFireExpertsList
());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java
View file @
3464d18e
...
...
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
...
...
@@ -157,8 +158,8 @@ public class OrgPersonController {
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"/list"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表分页查询"
,
notes
=
"列表分页查询"
)
public
ResponseModel
<
Object
>
listPage
(
String
pageNum
,
String
pageSize
,
OrgUsr
orgUsr
)
{
return
ResponseHelper
.
buildResponse
(
iOrgUsrService
.
pagePerson
(
pageNum
,
pageSize
,
orgUsr
));
public
ResponseModel
<
Object
>
listPage
(
@RequestParam
Map
<
String
,
Object
>
requestBody
)
{
return
ResponseHelper
.
buildResponse
(
iOrgUsrService
.
pagePerson
(
requestBody
.
get
(
"pageNum"
).
toString
(),
requestBody
.
get
(
"pageSize"
).
toString
(),
requestBody
));
}
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java
View file @
3464d18e
...
...
@@ -246,46 +246,29 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return
list
==
null
?
new
ArrayList
<
Map
<
String
,
Object
>>()
:
list
;
}
public
IPage
<
Map
<
String
,
Object
>>
pagePerson
(
String
pageNum
,
String
pageSize
,
OrgUsr
orgUsr
)
{
public
IPage
<
Map
<
String
,
Object
>>
pagePerson
(
String
pageNum
,
String
pageSize
,
Map
<
String
,
Object
>
req
)
{
IPage
<
Map
<
String
,
Object
>>
pageBean
=
null
;
if
(
StringUtils
.
isBlank
(
pageNum
)
||
StringUtils
.
isBlank
(
pageSize
))
{
pageBean
=
new
Page
<>(
0
,
Long
.
MAX_VALUE
);
}
else
{
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
QueryWrapper
<
OrgUsr
>
orgUsrQueryWrapper
=
new
QueryWrapper
<>();
orgUsr
.
setBizOrgType
(
OrgPersonEnum
.
人员
.
getKey
());
Class
<?
extends
OrgUsr
>
aClass
=
orgUsr
.
getClass
();
Arrays
.
stream
(
aClass
.
getDeclaredFields
()).
forEach
(
field
->
{
try
{
field
.
setAccessible
(
true
);
Object
o
=
field
.
get
(
orgUsr
);
if
(
o
!=
null
)
{
Class
<?>
type
=
field
.
getType
();
String
name
=
NameUtils
.
camel2Underline
(
field
.
getName
());
if
(
type
.
equals
(
Integer
.
class
))
{
Integer
fileValue
=
(
Integer
)
field
.
get
(
orgUsr
);
orgUsrQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
if
(
type
.
equals
(
Long
.
class
))
{
Long
fileValue
=
(
Long
)
field
.
get
(
orgUsr
);
orgUsrQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
if
(
type
.
equals
(
String
.
class
))
{
String
fileValue
=
(
String
)
field
.
get
(
orgUsr
);
orgUsrQueryWrapper
.
like
(
name
,
fileValue
);
}
else
{
String
fileValue
=
(
String
)
field
.
get
(
orgUsr
);
orgUsrQueryWrapper
.
eq
(
name
,
fileValue
);
}
}
}
catch
(
Exception
e
)
{
}
});
pageBean
.
setTotal
(
this
.
baseMapper
.
selectCount
(
orgUsrQueryWrapper
));
Map
<
String
,
Object
>
map
=
Bean
.
BeantoMap
(
orgUsr
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"bizOrgType"
,
OrgPersonEnum
.
人员
.
getKey
());
if
(!
ObjectUtils
.
isEmpty
(
req
.
get
(
"bizOrgName"
)))
{
map
.
put
(
"bizOrgName"
,
req
.
get
(
"bizOrgName"
));
}
map
.
put
(
"parentId"
,
req
.
get
(
"parentId"
));
req
.
remove
(
"bizOrgName"
);
req
.
remove
(
"pageSize"
);
req
.
remove
(
"pageNum"
);
req
.
remove
(
"parentId"
);
map
.
put
(
"fieldsValue"
,
req
);
map
.
put
(
"fields"
,
alertFormServiceImpl
.
queryListByFormId
(
OrgPersonEnum
.
人员
.
getCode
()));
pageBean
.
setTotal
(
this
.
baseMapper
.
selectPersonListCount
(
map
));
map
.
put
(
"pageNum"
,
(
pageBean
.
getCurrent
()
-
1
)
*
pageBean
.
getSize
());
map
.
put
(
"pageSize"
,
pageBean
.
getSize
());
map
.
put
(
"fields"
,
alertFormServiceImpl
.
queryListByFormId
(
OrgPersonEnum
.
人员
.
getCode
()));
map
.
put
(
"bizOrgType"
,
OrgPersonEnum
.
人员
.
getKey
());
List
<
Map
<
String
,
Object
>>
list
=
this
.
baseMapper
.
selectPersonList
(
map
);
pageBean
.
setRecords
(
list
);
...
...
@@ -332,9 +315,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsr
.
setRecUserName
(
oriOrgUsr
.
getRecUserName
());
orgUsr
.
setAmosOrgId
(
oriOrgUsr
.
getAmosOrgId
());
orgUsr
.
setAmosOrgCode
(
oriOrgUsr
.
getAmosOrgCode
());
if
(
or
gUsr
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
o
rgUsr
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
orgUsr
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
or
iOrgUsr
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
oriO
rgUsr
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
or
iOr
gUsr
.
getParentId
());
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
oriOrgUsr
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
@@ -404,6 +387,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
alertFormValueServiceImpl
.
saveBatch
(
creatList
);
}
List
<
AlertFormValue
>
creatList
=
alertFromValuelist
.
stream
().
filter
(
v
->
v
.
getSequenceNbr
()
==
null
||
v
.
getSequenceNbr
()
==
0
).
collect
(
Collectors
.
toList
());
if
(
creatList
!=
null
&&
creatList
.
size
()
>
0
)
{
alertFormValueServiceImpl
.
saveBatch
(
creatList
);
}
}
else
{
// 保存动态表单数据
alertFormValueServiceImpl
.
saveBatch
(
alertFromValuelist
);
...
...
@@ -440,9 +428,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
BeanUtils
.
copyProperties
(
OrgUsrVo
,
orgUsr
);
orgUsr
.
setBizOrgType
(
CommonConstant
.
BIZ_ORG_TYPE_COMPANY
);
if
(
OrgUsrVo
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
OrgUsrVo
.
getParentId
()))
{
if
(
OrgUsrVo
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
OrgUsrVo
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
OrgUsrVo
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
OrgUsrVo
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
@@ -456,9 +444,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
BeanUtils
.
copyProperties
(
OrgPersonVo
,
orgUsr
);
orgUsr
.
setBizOrgType
(
CommonConstant
.
BIZ_ORG_TYPE_PERSON
);
if
(
OrgPersonVo
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
OrgPersonVo
.
getParentId
()))
{
if
(
OrgPersonVo
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
OrgPersonVo
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
OrgPersonVo
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
OrgPersonVo
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
@@ -480,9 +468,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
OrgUsr
oriOrgUsr
=
getById
(
id
);
BeanUtils
.
copyProperties
(
OrgUsrVo
,
orgUsr
);
if
(
orgUsr
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
orgUsr
.
getParentId
()))
{
if
(
orgUsr
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
orgUsr
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
orgUsr
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
OrgUsrVo
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
@@ -612,9 +600,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
BeanUtils
.
copyProperties
(
OrgDepartmentVo
,
orgUsr
);
orgUsr
.
setBizOrgType
(
CommonConstant
.
BIZ_ORG_TYPE_DEPARTMENT
);
if
(
OrgDepartmentVo
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
OrgDepartmentVo
.
getParentId
()))
{
if
(
OrgDepartmentVo
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
OrgDepartmentVo
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
OrgDepartmentVo
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
OrgDepartmentVo
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
@@ -629,9 +617,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
OrgUsr
oriOrgUsr
=
getById
(
id
);
BeanUtils
.
copyProperties
(
OrgDepartmentVo
,
orgUsr
);
if
(
orgUsr
.
getParentId
()
!=
null
&&
"-1"
.
equals
(
orgUsr
.
getParentId
()))
{
if
(
orgUsr
.
getParentId
()
!=
null
&&
!
"-1"
.
equals
(
orgUsr
.
getParentId
()))
{
OrgUsr
parent
=
getById
(
orgUsr
.
getParentId
());
if
(
parent
!=
null
)
{
if
(
parent
!=
null
&&
ObjectUtils
.
isEmpty
(
OrgDepartmentVo
.
getBizOrgCode
())
)
{
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
}
else
{
...
...
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