Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
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
fulixin
dsk-operate-sys-cscec
Commits
6153f32e
Commit
6153f32e
authored
Aug 16, 2023
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-企业标签
parent
60ede402
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
139 additions
and
5 deletions
+139
-5
EnterpriseController.java
...java/com/dsk/web/controller/dsk/EnterpriseController.java
+7
-0
IndexController.java
...main/java/com/dsk/web/controller/dsk/IndexController.java
+2
-3
EnterpriseInfoLabelBody.java
...dsk/common/core/domain/model/EnterpriseInfoLabelBody.java
+26
-0
IndexBigBidPageBody.java
...com/dsk/common/core/domain/model/IndexBigBidPageBody.java
+39
-0
IndexBigWinningBidsPageBody.java
...common/core/domain/model/IndexBigWinningBidsPageBody.java
+39
-0
EnterpriseService.java
...ain/java/com/dsk/system/dskService/EnterpriseService.java
+24
-0
IndexService.java
...src/main/java/com/dsk/system/dskService/IndexService.java
+2
-2
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java
View file @
6153f32e
...
...
@@ -28,6 +28,13 @@ public class EnterpriseController {
@Autowired
private
EnterpriseService
enterpriseService
;
@ApiOperation
(
value
=
"企业标签信息(建设库)"
)
@PostMapping
(
"/label"
)
public
R
label
(
@RequestBody
@Valid
EnterpriseInfoLabelBody
body
)
throws
Exception
{
return
enterpriseService
.
label
(
body
);
}
@ApiOperation
(
value
=
"企业详情头部信息(建设库)"
)
@PostMapping
(
"/infoHeader"
)
public
R
infoHeader
(
@RequestBody
@Valid
EnterpriseInfoHeaderBody
body
)
throws
Exception
{
...
...
dsk-admin/src/main/java/com/dsk/web/controller/dsk/IndexController.java
View file @
6153f32e
...
...
@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
import
java.util.Map
;
...
...
@@ -46,13 +45,13 @@ public class IndexController {
@ApiOperation
(
value
=
"大项目最新中标"
)
@PostMapping
(
value
=
"bigWinningBidsPage"
)
public
TableDataInfo
bigWinningBidsPage
(
@RequestBody
@Valid
EnterprisePartners
Body
vo
)
throws
Exception
{
public
TableDataInfo
bigWinningBidsPage
(
@RequestBody
IndexBigWinningBidsPage
Body
vo
)
throws
Exception
{
return
enterpriseService
.
bigWinningBidsPage
(
vo
);
}
@ApiOperation
(
value
=
"大项目最新招标"
)
@PostMapping
(
value
=
"bigBidPage"
)
public
TableDataInfo
bigBidPage
(
@RequestBody
@Valid
EnterprisePartners
Body
vo
)
throws
Exception
{
public
TableDataInfo
bigBidPage
(
@RequestBody
IndexBigBidPage
Body
vo
)
throws
Exception
{
return
enterpriseService
.
bigBidPage
(
vo
);
}
...
...
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInfoLabelBody.java
0 → 100644
View file @
6153f32e
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseInfoLabelBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
companyId
;
public
boolean
isVaildCid
()
{
return
0
==
companyId
;
}
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigBidPageBody.java
0 → 100644
View file @
6153f32e
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
java.util.Date
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
IndexBigBidPageBody
extends
BasePage
{
/**
* 开始时间
*/
private
Date
timeStart
;
/**
* 截止时间
*/
private
Date
timeEnd
;
/**
* 金额起 默认2亿
*/
private
Double
amountStart
=
20000.00
;
/**
* 金额止
*/
private
Double
amountEnd
;
/**
* 省份Id
*/
private
Integer
provinceId
;
private
List
<
String
>
projects
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigWinningBidsPageBody.java
0 → 100644
View file @
6153f32e
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
java.util.Date
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
IndexBigWinningBidsPageBody
extends
BasePage
{
/**
* 开始时间
*/
private
Date
timeStart
;
/**
* 截止时间
*/
private
Date
timeEnd
;
/**
* 金额起 默认2亿
*/
private
Double
amountStart
=
20000.00
;
/**
* 金额止
*/
private
Double
amountEnd
;
/**
* 省份Id
*/
private
Integer
provinceId
;
private
List
<
String
>
projects
;
}
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @
6153f32e
...
...
@@ -49,6 +49,30 @@ public class EnterpriseService {
@Autowired
private
RedisCache
redisCache
;
public
R
label
(
EnterpriseInfoLabelBody
body
)
throws
Exception
{
List
<
Map
<
String
,
Object
>>
mapList
=
new
ArrayList
<>();
if
(
body
.
isVaildCid
())
{
return
R
.
ok
(
mapList
);
}
Map
<
String
,
Object
>
companyMap
=
dskOpenApiUtil
.
requestBody
(
"/api/jsk/enterprise/label"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Integer
companyCode
=
MapUtils
.
getInteger
(
companyMap
,
"code"
,
300
);
if
(
200
!=
companyCode
)
{
return
R
.
ok
(
mapList
);
}
// list
List
<
Map
<
String
,
Object
>>
data
=
(
List
<
Map
<
String
,
Object
>>)
companyMap
.
get
(
"data"
);
if
(
ObjectUtil
.
isNotEmpty
(
data
))
{
for
(
Map
<
String
,
Object
>
labelsMap
:
data
)
{
String
labelName
=
MapUtils
.
getString
(
labelsMap
,
"labelName"
,
""
);
if
(
labelName
.
equals
(
"央企企业"
)
||
labelName
.
equals
(
"国企"
)
||
labelName
.
equals
(
"央企"
)
||
labelName
.
equals
(
"央企子公司"
)
||
labelName
.
equals
(
"国有企业"
)
||
labelName
.
equals
(
"省属国企"
))
{
mapList
.
add
(
labelsMap
);
}
}
}
return
R
.
ok
(
mapList
);
}
public
R
infoHeader
(
EnterpriseInfoHeaderBody
body
)
throws
Exception
{
if
(
body
.
isVaildCid
())
return
R
.
ok
();
Map
<
String
,
Object
>
companyMap
=
dskOpenApiUtil
.
requestBody
(
"/api/jsk/enterprise/infoHeader"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
...
...
dsk-system/src/main/java/com/dsk/system/dskService/IndexService.java
View file @
6153f32e
...
...
@@ -37,12 +37,12 @@ public class IndexService {
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
public
TableDataInfo
bigWinningBidsPage
(
EnterprisePartners
Body
body
)
throws
Exception
{
public
TableDataInfo
bigWinningBidsPage
(
IndexBigWinningBidsPage
Body
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/bigWinningBidsPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
bigBidPage
(
EnterprisePartners
Body
body
)
throws
Exception
{
public
TableDataInfo
bigBidPage
(
IndexBigBidPage
Body
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/bigBidPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
...
...
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