Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-service-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
赵啸非
enterprise-service-platform
Commits
076fbd30
Commit
076fbd30
authored
Apr 15, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加排序字段
parent
828be6bc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
7 deletions
+10
-7
enterprise-service-manager/db/add.sql
enterprise-service-manager/db/add.sql
+1
-1
enterprise-service-manager/src/main/java/com/mortals/xhx/module/ent/web/EntLifeMatterController.java
...m/mortals/xhx/module/ent/web/EntLifeMatterController.java
+0
-2
enterprise-service-manager/src/main/resources/sqlmap/module/ent/EntLifeMatterMapper.xml
.../main/resources/sqlmap/module/ent/EntLifeMatterMapper.xml
+3
-3
enterprise-service-manager/src/test/java/com/mortals/httpclient/ent/EntLifeMatterController.http
...a/com/mortals/httpclient/ent/EntLifeMatterController.http
+1
-1
enterprise-service-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+5
-0
No files found.
enterprise-service-manager/db/add.sql
View file @
076fbd30
...
@@ -77,4 +77,4 @@ ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT '
...
@@ -77,4 +77,4 @@ ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT '
INSERT
INTO
`mortals_sys_area`
VALUES
(
null
,
',16ca461e2c824257a50dd0c7fab6f2de'
,
'达州东部经开区'
,
'gde17ba11bbf48568547c21b174c8a32'
,
'16ca461e2c824257a50dd0c7fab6f2de'
,
'True'
,
'True'
,
'false'
,
'false'
,
'511715000000'
,
3
,
'达州东部经开区'
,
'dzsgxjscyy.sczwfw.gov.cn'
,
1
,
'2025-03-20 10:20:10'
,
NULL
,
'2025-03-20 10:20:10'
);
INSERT
INTO
`mortals_sys_area`
VALUES
(
null
,
',16ca461e2c824257a50dd0c7fab6f2de'
,
'达州东部经开区'
,
'gde17ba11bbf48568547c21b174c8a32'
,
'16ca461e2c824257a50dd0c7fab6f2de'
,
'True'
,
'True'
,
'false'
,
'false'
,
'511715000000'
,
3
,
'达州东部经开区'
,
'dzsgxjscyy.sczwfw.gov.cn'
,
1
,
'2025-03-20 10:20:10'
,
NULL
,
'2025-03-20 10:20:10'
);
ALTER
TABLE
mortals_ent_life_matter
ADD
COLUMN
`num`
int
(
4
)
NULL
DEFAULT
0
COMMENT
'数量'
;
ALTER
TABLE
mortals_ent_life_matter
ADD
COLUMN
`num`
int
(
4
)
NULL
DEFAULT
0
COMMENT
'数量'
;
\ No newline at end of file
\ No newline at end of file
enterprise-service-manager/src/main/java/com/mortals/xhx/module/ent/web/EntLifeMatterController.java
View file @
076fbd30
...
@@ -42,8 +42,6 @@ import com.mortals.xhx.common.code.*;
...
@@ -42,8 +42,6 @@ import com.mortals.xhx.common.code.*;
@RequestMapping
(
"ent/life/matter"
)
@RequestMapping
(
"ent/life/matter"
)
public
class
EntLifeMatterController
extends
BaseCRUDJsonBodyMappingController
<
EntLifeMatterService
,
EntLifeMatterEntity
,
Long
>
{
public
class
EntLifeMatterController
extends
BaseCRUDJsonBodyMappingController
<
EntLifeMatterService
,
EntLifeMatterEntity
,
Long
>
{
@Autowired
private
ParamService
paramService
;
public
EntLifeMatterController
()
{
public
EntLifeMatterController
()
{
super
.
setModuleDesc
(
"企业周期事项主"
);
super
.
setModuleDesc
(
"企业周期事项主"
);
...
...
enterprise-service-manager/src/main/resources/sqlmap/module/ent/EntLifeMatterMapper.xml
View file @
076fbd30
...
@@ -655,21 +655,21 @@
...
@@ -655,21 +655,21 @@
,
,
</if>
</if>
<if
test=
"conditionParamRef.containsKey('lifeCycleIdList') and conditionParamRef.lifeCycleIdList.size() > 0"
>
<if
test=
"conditionParamRef.containsKey('lifeCycleIdList') and conditionParamRef.lifeCycleIdList.size() > 0"
>
field(a.life
CycleI
d,
field(a.life
_cycle_i
d,
<foreach
collection=
"conditionParamRef.lifeCycleIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
<foreach
collection=
"conditionParamRef.lifeCycleIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
#{item}
#{item}
</foreach>
</foreach>
,
,
</if>
</if>
<if
test=
"conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0"
>
<if
test=
"conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0"
>
field(a.dept
I
d,
field(a.dept
_i
d,
<foreach
collection=
"conditionParamRef.deptIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
<foreach
collection=
"conditionParamRef.deptIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
#{item}
#{item}
</foreach>
</foreach>
,
,
</if>
</if>
<if
test=
"conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"
>
<if
test=
"conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"
>
field(a.create
UserI
d,
field(a.create
_user_i
d,
<foreach
collection=
"conditionParamRef.createUserIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
<foreach
collection=
"conditionParamRef.createUserIdList"
open=
""
close=
")"
index=
"index"
item=
"item"
separator=
","
>
#{item}
#{item}
</foreach>
</foreach>
...
...
enterprise-service-manager/src/test/java/com/mortals/httpclient/ent/EntLifeMatterController.http
View file @
076fbd30
...
@@ -48,7 +48,7 @@ client.global.set("EntLifeMatter_id", JSON.parse(response.body).data.id);
...
@@ -48,7 +48,7 @@ client.global.set("EntLifeMatter_id", JSON.parse(response.body).data.id);
%}
%}
###企业周期事项主查看
###企业周期事项主查看
GET {{baseUrl}}/ent/life/matter/in
fo?id=1
GET {{baseUrl}}/ent/life/matter/in
terinfo?id=500
###企业周期事项主编辑
###企业周期事项主编辑
GET {{baseUrl}}/ent/life/matter/edit?id=1
GET {{baseUrl}}/ent/life/matter/edit?id=1
...
...
enterprise-service-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
076fbd30
...
@@ -9,5 +9,10 @@
...
@@ -9,5 +9,10 @@
},
},
"product"
:
{
"product"
:
{
"baseUrl"
:
"http://192.168.0.250:11089/entservice"
"baseUrl"
:
"http://192.168.0.250:11089/entservice"
},
"dazhou"
:
{
"baseUrl"
:
"http://61.157.227.62:11072/basics_api/entservice"
}
}
}
}
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