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
dac72ecb
Commit
dac72ecb
authored
May 29, 2023
by
zhangyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目商机80%
parent
65c14563
Changes
20
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
574 additions
and
83 deletions
+574
-83
EnterpriseProjectController.java
...m/dsk/web/controller/dsk/EnterpriseProjectController.java
+60
-40
EnterpriseProjectApprovalExaminePageBody.java
...omain/model/EnterpriseProjectApprovalExaminePageBody.java
+21
-0
EnterpriseProjectApprovalInfoDetailBody.java
...domain/model/EnterpriseProjectApprovalInfoDetailBody.java
+21
-0
EnterpriseProjectApprovalMarketingPageBody.java
...ain/model/EnterpriseProjectApprovalMarketingPageBody.java
+21
-0
EnterpriseProjectApprovalProjectPageBody.java
...omain/model/EnterpriseProjectApprovalProjectPageBody.java
+34
-0
EnterpriseProjectBidNoticeAreaBody.java
...core/domain/model/EnterpriseProjectBidNoticeAreaBody.java
+21
-0
EnterpriseProjectBidNoticeDetailBody.java
...re/domain/model/EnterpriseProjectBidNoticeDetailBody.java
+21
-0
EnterpriseProjectBidNoticePageBody.java
...core/domain/model/EnterpriseProjectBidNoticePageBody.java
+53
-0
EnterpriseProjectBidNoticeProAssessmentWayBody.java
...model/EnterpriseProjectBidNoticeProAssessmentWayBody.java
+21
-0
EnterpriseProjectBidNoticeProDetailBody.java
...domain/model/EnterpriseProjectBidNoticeProDetailBody.java
+21
-0
EnterpriseProjectBidNoticeProPageBody.java
...e/domain/model/EnterpriseProjectBidNoticeProPageBody.java
+44
-0
EnterpriseProjectBidNoticeProProjectPurposesBody.java
...del/EnterpriseProjectBidNoticeProProjectPurposesBody.java
+21
-0
EnterpriseProjectBidNoticeProProjectTypeBody.java
...n/model/EnterpriseProjectBidNoticeProProjectTypeBody.java
+21
-0
EnterpriseProjectBidNoticeTenderStageBody.java
...main/model/EnterpriseProjectBidNoticeTenderStageBody.java
+22
-0
EnterpriseProjectCreditXzxkPageBody.java
...ore/domain/model/EnterpriseProjectCreditXzxkPageBody.java
+27
-0
EnterpriseProjectLandDetailBody.java
...on/core/domain/model/EnterpriseProjectLandDetailBody.java
+23
-0
EnterpriseProjectLandTransactionPageBody.java
...omain/model/EnterpriseProjectLandTransactionPageBody.java
+39
-0
EnterpriseProjectLandUseBody.java
...ommon/core/domain/model/EnterpriseProjectLandUseBody.java
+24
-0
EnterpriseProjectService.java
...a/com/dsk/system/dskService/EnterpriseProjectService.java
+52
-36
EnterpriseService.java
...ain/java/com/dsk/system/dskService/EnterpriseService.java
+7
-7
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java
View file @
dac72ecb
This diff is collapsed.
Click to expand it.
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalExaminePageBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectApprovalExaminePageBody
extends
BasePage
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
)
private
String
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalInfoDetailBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectApprovalInfoDetailBody
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
)
private
String
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalMarketingPageBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectApprovalMarketingPageBody
extends
BasePage
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
)
private
String
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalProjectPageBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectApprovalProjectPageBody
extends
BasePage
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
/**
* 查询关键字
*/
private
String
keys
;
/*
* 1金额倒序,2金额正序,3计划开工时间倒序,4计划开工时间正序,13计划完工时间倒序,14计划完工时间正序
*/
@NotNull
(
message
=
"排序条件不能为空"
)
private
Integer
sort
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeAreaBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeAreaBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeDetailBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeDetailBody
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
)
private
String
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticePageBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectBidNoticePageBody
extends
BasePage
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
/**
* 查询关键字
*/
private
String
keys
;
/**
* 类型
*/
private
String
tenderStage
;
/*
* 1金额倒序,2金额正序,3时间倒序,4时间正序
*/
@NotNull
(
message
=
"排序条件不能为空"
)
private
Integer
sort
;
/**
* 省份
*/
private
List
<
Integer
>
provinceIds
;
/**
* 市份
*/
private
List
<
Integer
>
cityIds
;
/**
* 县
*/
private
List
<
Integer
>
areaIds
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProAssessmentWayBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeProAssessmentWayBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProDetailBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeProDetailBody
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
)
private
String
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProPageBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectBidNoticeProPageBody
extends
BasePage
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
/**
* 查询关键字
*/
private
String
keys
;
/**
* 项目类别
*/
private
String
projectType
;
/**
* 工程用途
*/
private
String
projectPurposes
;
/**
* 评标办法
*/
private
String
bidAssessmentWay
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectPurposesBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeProProjectPurposesBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectTypeBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectBidNoticeProProjectTypeBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeTenderStageBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectBidNoticeTenderStageBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectCreditXzxkPageBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectCreditXzxkPageBody
extends
BasePage
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
/**
* 查询关键字
*/
private
String
keys
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandDetailBody.java
0 → 100644
View file @
dac72ecb
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
EnterpriseProjectLandDetailBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"id不能为空"
)
private
Integer
id
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandTransactionPageBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectLandTransactionPageBody
extends
BasePage
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
/**
* 土地用途
*/
private
List
<
String
>
landUse
;
/**
* 查询关键字
*/
private
String
keys
;
/*
* 1金额倒序,2金额正序,3时间倒序,4时间正序,11面积倒序,12面积正序
*/
@NotNull
(
message
=
"排序条件不能为空"
)
private
Integer
sort
;
}
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandUseBody.java
0 → 100644
View file @
dac72ecb
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.ToString
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
EnterpriseProjectLandUseBody
{
/**
* 企业id
*/
@NotNull
(
message
=
"企业id不能为空"
)
private
Integer
cid
;
}
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java
View file @
dac72ecb
This diff is collapsed.
Click to expand it.
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @
dac72ecb
...
...
@@ -57,17 +57,17 @@ public class EnterpriseService {
//todo 新数据,待入库
public
TableDataInfo
partners
(
EnterprisePartnersBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/partners"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/partners"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
investment
(
EnterpriseInvestmentBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/investment"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/investment"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
affiliates
(
EnterpriseAffiliatesBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/affiliates"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/affiliates"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
...
...
@@ -105,22 +105,22 @@ public class EnterpriseService {
}
public
R
icInfo
(
EnterpriseIcInfoBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/icInfo"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/icInfo"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
public
TableDataInfo
changeInfo
(
EnterpriseChangeInfoBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/changeInfo"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/changeInfo"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
keymembers
(
EnterpriseKeymembersBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/keymembers"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/keymembers"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
bestStockPage
(
EnterpriseKeymembersBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
Local
(
"/operate/enterprise/bestStockPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterprise/bestStockPage"
,
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