Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
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
fulixin
dsk-operate-sys-cscec
Commits
7a12eb4e
Commit
7a12eb4e
authored
Dec 21, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
咨询机构管理:bug修复
parent
bacc8335
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
AdvisoryBodyManageController.java
...om/dsk/cscec/controller/AdvisoryBodyManageController.java
+4
-1
AddAdvisoryBodyBo.java
.../main/java/com/dsk/cscec/domain/bo/AddAdvisoryBodyBo.java
+3
-0
AdvisoryBodyServiceImpl.java
...a/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
+12
-7
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
View file @
7a12eb4e
...
...
@@ -12,6 +12,7 @@ import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
import
com.dsk.cscec.service.AdvisoryBodyProjectService
;
import
com.dsk.cscec.service.AdvisoryBodyService
;
import
com.dsk.cscec.service.IDProjectService
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -73,7 +74,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 校验咨询机构是否存在
*/
@GetMapping
(
"/checkAdvisoryBodyExist"
)
public
R
<
AdvisoryBodyExistVo
>
checkAdvisoryBodyExist
(
@
Validated
@
NotBlank
(
message
=
"咨询机构名称不能为空"
)
String
advisoryBodyName
)
{
public
R
<
AdvisoryBodyExistVo
>
checkAdvisoryBodyExist
(
@NotBlank
(
message
=
"咨询机构名称不能为空"
)
String
advisoryBodyName
)
{
return
R
.
ok
(
advisoryBodyService
.
checkAdvisoryBodyExist
(
advisoryBodyName
));
}
...
...
@@ -97,6 +98,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 新增咨询机构自定义表单
*/
@PostMapping
(
"/addAdvisoryBodyCustomForm"
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
R
<
Void
>
addAdvisoryBodyCustomForm
(
@Validated
AdvisoryBodyCustomForm
advisoryBodyCustomForm
)
{
return
toAjax
(
advisoryBodyCustomFormService
.
save
(
advisoryBodyCustomForm
));
}
...
...
@@ -105,6 +107,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 更新咨询机构自定义表单
*/
@PutMapping
(
"/updateAdvisoryBodyCustomForm"
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
R
<
Void
>
updateAdvisoryBodyCustomForm
(
@Validated
AdvisoryBodyCustomForm
advisoryBodyCustomForm
)
{
return
toAjax
(
advisoryBodyCustomFormService
.
updateById
(
advisoryBodyCustomForm
));
}
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddAdvisoryBodyBo.java
View file @
7a12eb4e
package
com
.
dsk
.
cscec
.
domain
.
bo
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
...
...
@@ -57,10 +58,12 @@ public class AddAdvisoryBodyBo {
/**
* 结算开始时间
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
settleStartTime
;
/**
* 结算完成时间
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
settleFinishTime
;
/**
* 是否为终审单位(0代表是 1代表否)
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
View file @
7a12eb4e
package
com
.
dsk
.
cscec
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
...
...
@@ -27,7 +28,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -132,17 +132,18 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
List
<
Map
<
String
,
Object
>>
data
=
(
List
<
Map
<
String
,
Object
>>)
jskData
.
get
(
"list"
);
for
(
Map
<
String
,
Object
>
companyData
:
data
)
{
//企业名称完全匹配上,则直接返回给前端
if
(
advisoryBodyName
.
equals
(
companyData
.
get
(
"name"
)))
{
String
companyName
=
StringUtils
.
removeRed
(
MapUtils
.
getString
(
companyData
,
"name"
,
"NotExist"
));
if
(
advisoryBodyName
.
equals
(
companyName
))
{
AdvisoryBodyExistVo
advisoryBodyExistVo
=
new
AdvisoryBodyExistVo
();
advisoryBodyExistVo
.
setAdvisoryBodyCid
(
Math
.
toIntExact
(
MapUtils
.
getLong
(
companyData
,
"jskEid"
)));
advisoryBodyExistVo
.
setAdvisoryBodyName
(
MapUtils
.
getString
(
companyData
,
"name"
)
);
advisoryBodyExistVo
.
setAdvisoryBodyName
(
companyName
);
advisoryBodyExistVo
.
setBusinessScope
(
MapUtils
.
getString
(
companyData
,
"businessScope"
));
advisoryBodyExistVo
.
setIsNewAdvisoryBody
(
true
);
break
;
return
advisoryBodyExistVo
;
}
}
//查不到则抛异常
throw
new
ServiceException
(
"咨询机构不存在"
);
throw
new
ServiceException
(
"咨询机构不存在
或结果不唯一,请输入完整咨询机构企业名称
"
);
}
}
return
null
;
...
...
@@ -157,20 +158,24 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Integer
addAdvisoryBody
(
AddAdvisoryBodyBo
addAdvisoryBodyBo
)
{
long
advisoryBodyId
=
IdUtil
.
getSnowflakeNextId
();;
//如果是新增咨询机构,则需要新增记录到咨询机构表
if
(
addAdvisoryBodyBo
.
getIsNewAdvisoryBody
())
{
AdvisoryBody
newAdvisoryBody
=
BeanUtil
.
toBean
(
addAdvisoryBodyBo
,
AdvisoryBody
.
class
);
newAdvisoryBody
.
set
CreateTime
(
new
Date
()
);
newAdvisoryBody
.
set
AdvisoryBodyId
(
advisoryBodyId
);
baseMapper
.
insert
(
newAdvisoryBody
);
}
return
advisoryBodyProjectMapper
.
insert
(
BeanUtil
.
toBean
(
addAdvisoryBodyBo
,
AdvisoryBodyProject
.
class
));
AdvisoryBodyProject
advisoryBodyProject
=
BeanUtil
.
toBean
(
addAdvisoryBodyBo
,
AdvisoryBodyProject
.
class
);
advisoryBodyProject
.
setAdvisoryBodyId
(
advisoryBodyId
);
return
advisoryBodyProjectMapper
.
insert
(
advisoryBodyProject
);
}
/**
* 每小时更新一次咨询机构经营范围
*/
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
updateAdvisoryBodyBusinessScope
()
{
EnterpriseInfoHeaderBody
infoHeaderBody
=
new
EnterpriseInfoHeaderBody
();
for
(
AdvisoryBody
advisoryBody
:
baseMapper
.
selectList
(
null
))
{
...
...
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