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
1639b268
Commit
1639b268
authored
2 years ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加应用serviceApi参数字段
parent
24d7f003
master
first
platform-vs1
reg
suining
test
xuanhan
yanshi
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
.../com/mortals/xhx/module/app/web/AppDatasetController.java
+1
-2
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
.../main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
+6
-7
No files found.
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
View file @
1639b268
...
@@ -75,7 +75,6 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
...
@@ -75,7 +75,6 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
}
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getFieldCode
())||!
ObjectUtils
.
isEmpty
(
query
.
getFieldName
()))
{
if
(!
ObjectUtils
.
isEmpty
(
query
.
getFieldCode
())||!
ObjectUtils
.
isEmpty
(
query
.
getFieldName
()))
{
AppDatasetQuery
appDatasetQuery
=
new
AppDatasetQuery
();
AppDatasetQuery
appDatasetQuery
=
new
AppDatasetQuery
();
appDatasetQuery
.
setFieldCode
(
query
.
getFieldCode
());
appDatasetQuery
.
setFieldCode
(
query
.
getFieldCode
());
...
@@ -83,7 +82,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
...
@@ -83,7 +82,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
appDatasetQuery
.
setAppId
(
query
.
getAppId
());
appDatasetQuery
.
setAppId
(
query
.
getAppId
());
// String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
// String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
// fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
// fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
// appDatasetQuery.setFieldValue(fieldValue
);
appDatasetQuery
.
setFieldValue
(
query
.
getFieldValue
()
);
PageInfo
pageInfo
=
this
.
buildPageInfo
(
query
);
PageInfo
pageInfo
=
this
.
buildPageInfo
(
query
);
Result
<
AppInfoFieldEntity
>
customResult
=
this
.
service
.
findCustomList
(
appDatasetQuery
,
pageInfo
,
context
);
Result
<
AppInfoFieldEntity
>
customResult
=
this
.
service
.
findCustomList
(
appDatasetQuery
,
pageInfo
,
context
);
List
<
Long
>
datasetIdList
=
customResult
.
getList
().
stream
().
map
(
item
->
item
.
getDatasetId
()).
collect
(
Collectors
.
toList
());
List
<
Long
>
datasetIdList
=
customResult
.
getList
().
stream
().
map
(
item
->
item
.
getDatasetId
()).
collect
(
Collectors
.
toList
());
...
...
This diff is collapsed.
Click to expand it.
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
View file @
1639b268
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
and a.appId = #{condition.appId,jdbcType=VARCHAR}
and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if>
</if>
<!-- <include refid="_second_condition_"/>--
>
<include
refid=
"_second_condition_"
/
>
<if
test=
"condition.fieldCode!=null and condition.fieldCode!=''"
>
<!--
<if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if>
</if>
<if test="condition.fieldName!=null and condition.fieldName!=''">
<if test="condition.fieldName!=null and condition.fieldName!=''">
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</if>
</if>
<if test="condition.fieldValue != null and condition.fieldValue != ''">
<if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue}
and b.fieldValue like #{condition.fieldValue}
</if>
</if>
-->
</trim>
</trim>
</trim>
</trim>
...
@@ -44,10 +44,9 @@
...
@@ -44,10 +44,9 @@
<if
test=
"condition.appId!=null and condition.appId!=''"
>
<if
test=
"condition.appId!=null and condition.appId!=''"
>
and a.appId = #{condition.appId,jdbcType=VARCHAR}
and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if>
</if>
<!--
<include
refid=
"_second_condition_"
/>
<include refid="_second_condition_"/>-->
<if
test=
"condition.fieldCode!=null and condition.fieldCode!=''"
>
<!--
<if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if>
</if>
<if test="condition.fieldName!=null and condition.fieldName!=''">
<if test="condition.fieldName!=null and condition.fieldName!=''">
...
@@ -55,7 +54,7 @@
...
@@ -55,7 +54,7 @@
</if>
</if>
<if test="condition.fieldValue != null and condition.fieldValue != ''">
<if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue}
and b.fieldValue like #{condition.fieldValue}
</if>
</if>
-->
</trim>
</trim>
</trim>
</trim>
</select>
</select>
...
...
This diff is collapsed.
Click to expand it.
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