Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
dsk-cr20g
Commits
841294be
Commit
841294be
authored
Jun 19, 2023
by
zhangyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
12f684ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
6 deletions
+26
-6
EnterpriseBussinessController.java
...dsk/web/controller/dsk/EnterpriseBussinessController.java
+2
-2
EnterpriseBussinessService.java
...com/dsk/system/dskService/EnterpriseBussinessService.java
+24
-4
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java
View file @
841294be
...
@@ -35,7 +35,7 @@ public class EnterpriseBussinessController {
...
@@ -35,7 +35,7 @@ public class EnterpriseBussinessController {
@ApiOperation
(
value
=
"客户项目列表(openApi)"
)
@ApiOperation
(
value
=
"客户项目列表(openApi)"
)
@RequestMapping
(
value
=
"/clientProjectPage"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/clientProjectPage"
,
method
=
RequestMethod
.
POST
)
public
TableDataInfo
clientProjectPage
(
@RequestBody
EnterpriseBussinessClientProjectPageBody
paramMap
)
throws
Exception
{
public
Map
<
String
,
Object
>
clientProjectPage
(
@RequestBody
EnterpriseBussinessClientProjectPageBody
paramMap
)
throws
Exception
{
return
enterpriseBussinessService
.
clientProjectPage
(
paramMap
);
return
enterpriseBussinessService
.
clientProjectPage
(
paramMap
);
}
}
...
@@ -59,7 +59,7 @@ public class EnterpriseBussinessController {
...
@@ -59,7 +59,7 @@ public class EnterpriseBussinessController {
@ApiOperation
(
value
=
"供应商项目列表(openApi)"
)
@ApiOperation
(
value
=
"供应商项目列表(openApi)"
)
@RequestMapping
(
value
=
"/supplierProjectPage"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/supplierProjectPage"
,
method
=
RequestMethod
.
POST
)
public
TableDataInfo
supplierProjectPage
(
@RequestBody
EnterpriseBussinessSupplierProjectPageBody
paramMap
)
throws
Exception
{
public
Map
<
String
,
Object
>
supplierProjectPage
(
@RequestBody
EnterpriseBussinessSupplierProjectPageBody
paramMap
)
throws
Exception
{
return
enterpriseBussinessService
.
supplierProjectPage
(
paramMap
);
return
enterpriseBussinessService
.
supplierProjectPage
(
paramMap
);
}
}
...
...
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @
841294be
package
com
.
dsk
.
system
.
dskService
;
package
com
.
dsk
.
system
.
dskService
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.model.*
;
import
com.dsk.common.core.domain.model.*
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
org.apache.commons.collections4.MapUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@Service
@Service
...
@@ -27,9 +30,17 @@ public class EnterpriseBussinessService {
...
@@ -27,9 +30,17 @@ public class EnterpriseBussinessService {
}
}
public
TableDataInfo
clientProjectPage
(
EnterpriseBussinessClientProjectPageBody
body
)
throws
Exception
{
public
Map
<
String
,
Object
>
clientProjectPage
(
EnterpriseBussinessClientProjectPageBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseBussiness/clientProjectPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseBussiness/clientProjectPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
Integer
code
=
MapUtils
.
getInteger
(
map
,
"code"
,
300
);
Map
data
=
MapUtils
.
getMap
(
map
,
"data"
,
null
);
if
(
200
!=
code
)
throw
new
RuntimeException
();
Integer
count
=
MapUtils
.
getInteger
(
data
,
"totalCount"
,
0
);
Object
list
=
MapUtils
.
getObject
(
data
,
"list"
,
""
);
TableDataInfo
tableDataInfo
=
new
TableDataInfo
((
List
<?>)
list
,
count
);
Map
<
String
,
Object
>
resMap
=
BeanUtil
.
beanToMap
(
tableDataInfo
);
resMap
.
put
(
"totalAmount"
,
MapUtils
.
getDouble
(
data
,
"totalAmount"
,
0.0
));
return
resMap
;
}
}
...
@@ -51,9 +62,18 @@ public class EnterpriseBussinessService {
...
@@ -51,9 +62,18 @@ public class EnterpriseBussinessService {
}
}
public
TableDataInfo
supplierProjectPage
(
EnterpriseBussinessSupplierProjectPageBody
body
)
throws
Exception
{
public
Map
<
String
,
Object
>
supplierProjectPage
(
EnterpriseBussinessSupplierProjectPageBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseBussiness/supplierProjectPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseBussiness/supplierProjectPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
log
.
info
(
JSONUtil
.
toJsonStr
(
map
));
Integer
code
=
MapUtils
.
getInteger
(
map
,
"code"
,
300
);
Map
data
=
MapUtils
.
getMap
(
map
,
"data"
,
null
);
if
(
200
!=
code
)
throw
new
RuntimeException
();
Integer
count
=
MapUtils
.
getInteger
(
data
,
"totalCount"
,
0
);
Object
list
=
MapUtils
.
getObject
(
data
,
"list"
,
""
);
TableDataInfo
tableDataInfo
=
new
TableDataInfo
((
List
<?>)
list
,
count
);
Map
<
String
,
Object
>
resMap
=
BeanUtil
.
beanToMap
(
tableDataInfo
);
resMap
.
put
(
"totalAmount"
,
MapUtils
.
getDouble
(
data
,
"totalAmount"
,
0.0
));
return
resMap
;
}
}
...
...
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