Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chuanshan_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
chuanshan_gov_platform
Commits
d04ef8dc
Commit
d04ef8dc
authored
Mar 07, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
c5801060
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java
...dule/single/service/impl/SingleMatterFileServiceImpl.java
+13
-8
No files found.
single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java
View file @
d04ef8dc
package
com.mortals.xhx.module.single.service.impl
;
package
com.mortals.xhx.module.single.service.impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.xhx.common.pdu.matter.MatterPdu
;
import
com.mortals.xhx.feign.matter.IMatterFeign
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
import
com.mortals.xhx.module.matter.service.MatterService
;
import
com.mortals.xhx.module.matter.service.MatterService
;
import
com.mortals.xhx.module.single.dao.SingleMatterFileDao
;
import
com.mortals.xhx.module.single.dao.SingleMatterFileDao
;
...
@@ -28,7 +31,7 @@ import java.util.Date;
...
@@ -28,7 +31,7 @@ import java.util.Date;
public
class
SingleMatterFileServiceImpl
extends
AbstractCRUDServiceImpl
<
SingleMatterFileDao
,
SingleMatterFileEntity
,
Long
>
implements
SingleMatterFileService
{
public
class
SingleMatterFileServiceImpl
extends
AbstractCRUDServiceImpl
<
SingleMatterFileDao
,
SingleMatterFileEntity
,
Long
>
implements
SingleMatterFileService
{
@Autowired
@Autowired
private
MatterService
matterService
;
private
IMatterFeign
matterService
;
@Override
@Override
protected
void
validData
(
SingleMatterFileEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
validData
(
SingleMatterFileEntity
entity
,
Context
context
)
throws
AppException
{
...
@@ -60,15 +63,17 @@ public class SingleMatterFileServiceImpl extends AbstractCRUDServiceImpl<SingleM
...
@@ -60,15 +63,17 @@ public class SingleMatterFileServiceImpl extends AbstractCRUDServiceImpl<SingleM
dao
.
update
(
update
);
dao
.
update
(
update
);
}
}
}
else
{
}
else
{
MatterEntity
matterEntity
=
matterService
.
get
(
entity
.
getMatterId
());
String
resp
=
matterService
.
info
(
entity
.
getMatterId
());
if
(
matterEntity
==
null
){
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
resp
);
MatterPdu
pdu
=
JSONObject
.
parseObject
(
jsonObject
.
getString
(
"data"
),
MatterPdu
.
class
);
if
(
pdu
==
null
){
throw
new
AppException
(
"基础事项id不正确,查不到对应的事项"
);
throw
new
AppException
(
"基础事项id不正确,查不到对应的事项"
);
}
}
entity
.
setMatterCode
(
matterEntity
.
getMatterNo
());
entity
.
setMatterCode
(
pdu
.
getMatterNo
());
entity
.
setMatterName
(
matterEntity
.
getMatterName
());
entity
.
setMatterName
(
pdu
.
getMatterName
());
if
(
entity
.
getSiteId
()==
null
)
{
//
if(entity.getSiteId()==null) {
entity
.
setSiteId
(
matterEntity
.
getSiteId
());
// entity.setSiteId(pdu
.getSiteId());
}
//
}
if
(
context
!=
null
&&
context
.
getUser
()!=
null
){
if
(
context
!=
null
&&
context
.
getUser
()!=
null
){
entity
.
setCreateUserId
(
context
.
getUser
().
getId
());
entity
.
setCreateUserId
(
context
.
getUser
().
getId
());
}
}
...
...
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