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
9ce82895
Commit
9ce82895
authored
Mar 11, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改测试bug
parent
f67fdb14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
...ls/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
+2
-1
single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java
...xhx/module/apply/service/impl/MatterApplyServiceImpl.java
+13
-3
No files found.
single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
View file @
9ce82895
package
com.mortals.xhx.module.apply.model.vo
;
package
com.mortals.xhx.module.apply.model.vo
;
import
com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu
;
import
com.mortals.xhx.module.matter.model.MatterDatumFileEntity
;
import
com.mortals.xhx.module.matter.model.MatterDatumFileEntity
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -31,5 +32,5 @@ public class MatterApplyDatumGroupVO {
...
@@ -31,5 +32,5 @@ public class MatterApplyDatumGroupVO {
private
List
<
DatumFileVO
>
datumFileList
;
private
List
<
DatumFileVO
>
datumFileList
;
/** 示例样表 */
/** 示例样表 */
private
List
<
MatterDatumFile
Entity
>
exampleFileList
;
private
List
<
MatterDatumFile
Pdu
>
exampleFileList
;
}
}
single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java
View file @
9ce82895
package
com.mortals.xhx.module.apply.service.impl
;
package
com.mortals.xhx.module.apply.service.impl
;
import
com.mortals.framework.common.Rest
;
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.model.PageInfo
;
import
com.mortals.framework.model.PageInfo
;
...
@@ -7,6 +8,10 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...
@@ -7,6 +8,10 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.xhx.base.system.user.model.UserEntity
;
import
com.mortals.xhx.base.system.user.model.UserEntity
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.pdu.RespData
;
import
com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu
;
import
com.mortals.xhx.feign.matter.IMatterDatumFileFeign
;
import
com.mortals.xhx.module.apply.dao.MatterApplyDao
;
import
com.mortals.xhx.module.apply.dao.MatterApplyDao
;
import
com.mortals.xhx.module.apply.model.MatterApplyDatumEntity
;
import
com.mortals.xhx.module.apply.model.MatterApplyDatumEntity
;
import
com.mortals.xhx.module.apply.model.MatterApplyDatumQuery
;
import
com.mortals.xhx.module.apply.model.MatterApplyDatumQuery
;
...
@@ -56,7 +61,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
...
@@ -56,7 +61,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
@Autowired
@Autowired
private
SingleMatterService
singleMatterService
;
private
SingleMatterService
singleMatterService
;
@Autowired
@Autowired
private
MatterDatumFileService
matterDatumFileService
;
private
IMatterDatumFileFeign
iMatterDatumFileFeign
;
@Override
@Override
protected
void
saveBefore
(
MatterApplyEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
saveBefore
(
MatterApplyEntity
entity
,
Context
context
)
throws
AppException
{
...
@@ -233,8 +238,13 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
...
@@ -233,8 +238,13 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
datumFileList
.
add
(
fileVO
);
datumFileList
.
add
(
fileVO
);
}
}
groupVO
.
setDatumFileList
(
datumFileList
);
groupVO
.
setDatumFileList
(
datumFileList
);
List
<
MatterDatumFileEntity
>
datumFileEntities
=
matterDatumFileService
.
find
(
new
MatterDatumFileQuery
().
datumId
(
groupVO
.
getDatumId
()).
filetype
(
"示例样表"
));
MatterDatumFilePdu
matterDatumFilePdu
=
new
MatterDatumFilePdu
();
groupVO
.
setExampleFileList
(
datumFileEntities
);
matterDatumFilePdu
.
setDatumId
(
groupVO
.
getDatumId
());
matterDatumFilePdu
.
setFiletype
(
"示例样表"
);
Rest
<
RespData
<
List
<
MatterDatumFilePdu
>>>
datumFileEntities
=
iMatterDatumFileFeign
.
list
(
matterDatumFilePdu
);
if
(
datumFileEntities
.
getCode
()==
YesNoEnum
.
YES
.
getValue
()){
groupVO
.
setExampleFileList
(
datumFileEntities
.
getData
().
getData
());
}
groupVOList
.
add
(
groupVO
);
groupVOList
.
add
(
groupVO
);
}
}
}
}
...
...
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