Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_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
赵啸非
smart_gov_platform
Commits
179b1589
Commit
179b1589
authored
Feb 20, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改根据业务查询部门逻辑
parent
838d18ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
7 deletions
+27
-7
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterInfo.java
...va/com/mortals/xhx/module/matter/model/vo/MatterInfo.java
+1
-4
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
...java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
+5
-0
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
...a/com/mortals/xhx/module/matter/web/MatterController.java
+19
-0
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
.../java/com/mortals/httpclient/matter/MatterController.http
+2
-3
No files found.
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterInfo.java
View file @
179b1589
...
@@ -53,9 +53,6 @@ public class MatterInfo {
...
@@ -53,9 +53,6 @@ public class MatterInfo {
* 承诺办结时限
* 承诺办结时限
*/
*/
private
String
promiseTimeLimitShow
;
private
String
promiseTimeLimitShow
;
/**
* 行政处罚排除
*/
private
List
<
String
>
eventTypeShowNotList
;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
View file @
179b1589
...
@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong {
...
@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong {
private
List
<
Long
>
idList
;
private
List
<
Long
>
idList
;
/**
* 行政处罚排除
*/
private
List
<
String
>
eventTypeShowNotList
;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
View file @
179b1589
...
@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting;
...
@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
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
;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.model.Result
;
...
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
...
@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
super
.
setModuleDesc
(
"基础事项"
);
super
.
setModuleDesc
(
"基础事项"
);
}
}
/**
* @param query
* @param model
* @param context
* @throws AppException
*/
@Override
protected
void
doListBefore
(
MatterEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
if
(
ObjectUtils
.
isEmpty
(
query
.
getEventTypeShowNotList
())){
ArrayList
<
String
>
notList
=
new
ArrayList
<>();
notList
.
add
(
"行政处罚"
);
query
.
setEventTypeShowNotList
(
notList
);
}
super
.
doListBefore
(
query
,
model
,
context
);
}
@Override
@Override
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"appoveObjectShow"
,
paramService
.
getParamBySecondOrganize
(
"Matter"
,
"appoveObjectShow"
));
this
.
addDict
(
model
,
"appoveObjectShow"
,
paramService
.
getParamBySecondOrganize
(
"Matter"
,
"appoveObjectShow"
));
...
...
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
View file @
179b1589
...
@@ -20,9 +20,8 @@ POST {{baseUrl}}/matter/list
...
@@ -20,9 +20,8 @@ POST {{baseUrl}}/matter/list
Content-Type: application/json
Content-Type: application/json
{
{
"siteId": "",
"siteId": 1,
"matterName": "%对墓穴占地面积超过标准的处罚%",
"eventTypeShowNotList": ["行政处罚"],
"deptCode":"",
"page": 1,
"page": 1,
"size": 10
"size": 10
}
}
...
...
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