Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
44ec0abe
Commit
44ec0abe
authored
Nov 09, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除网关module
parent
624ab4bf
Pipeline
#2291
failed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
...a/com/mortals/xhx/module/matter/web/MatterController.java
+0
-1
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
.../mortals/xhx/module/matter/web/MatterDatumController.java
+11
-4
No files found.
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
View file @
44ec0abe
...
...
@@ -71,7 +71,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
@RequestMapping
(
value
=
{
"createMatter"
},
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
})
public
String
createMatter
(
Long
[]
ids
,
Long
siteId
)
{
// public String createMatter(Long[] ids) {
Map
<
String
,
Object
>
model
=
new
HashMap
();
int
code
=
1
;
String
busiDesc
=
"站点事项转事项"
;
...
...
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @
44ec0abe
package
com.mortals.xhx.module.matter.web
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.key.ParamKey
;
...
...
@@ -15,12 +16,10 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import
com.mortals.xhx.module.matter.service.MatterDatumService
;
import
org.apache.commons.lang3.ArrayUtils
;
import
com.mortals.framework.util.StringUtils
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
com.alibaba.fastjson.JSONObject
;
import
java.util.Arrays
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
static
com
.
mortals
.
framework
.
ap
.
SysConstains
.*;
...
...
@@ -49,6 +48,14 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
super
.
init
(
model
,
context
);
}
@Override
protected
void
doListBefore
(
MatterDatumEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
List
<
OrderCol
>
orderColList
=
new
ArrayList
<>();
orderColList
.
add
(
new
OrderCol
(
"isRecommend"
,
OrderCol
.
DESCENDING
));
query
.
setOrderColList
(
orderColList
);
super
.
doListBefore
(
query
,
model
,
context
);
}
@Override
protected
int
doListAfter
(
MatterDatumEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
int
recommendCount
=
paramService
.
getParamIntValue
(
ParamKey
.
MATTER_DATUM_RECOMMEND_COUNT
);
...
...
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