Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-region-outline
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
cfld-backend
cfld-region-outline
Commits
483eb7d3
Commit
483eb7d3
authored
Nov 14, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
园区字典开发区新增保存、提交
parent
046c8e97
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
ParkInfoSaveVO.java
src/main/java/com/lyy/admin/VO/ParkInfoSaveVO.java
+1
-1
DevelopmentInfoController.java
...controller/developmentinfo/DevelopmentInfoController.java
+5
-3
ParkInfoController.java
...com/lyy/admin/controller/parkinfo/ParkInfoController.java
+6
-3
PersonalFunctionsController.java
...troller/personalfunction/PersonalFunctionsController.java
+2
-2
No files found.
src/main/java/com/lyy/admin/VO/ParkInfoSaveVO.java
View file @
483eb7d3
...
@@ -192,7 +192,7 @@ public class ParkInfoSaveVO implements Serializable {
...
@@ -192,7 +192,7 @@ public class ParkInfoSaveVO implements Serializable {
* 工业用电(单位:元/度)
* 工业用电(单位:元/度)
*/
*/
@ApiModelProperty
(
value
=
"工业用电(单位:元/度)"
)
@ApiModelProperty
(
value
=
"工业用电(单位:元/度)"
)
private
BigDecimal
electricityPrice
;
private
String
electricityPrice
;
/**
/**
* 供电类型
* 供电类型
*/
*/
...
...
src/main/java/com/lyy/admin/controller/developmentinfo/DevelopmentInfoController.java
View file @
483eb7d3
...
@@ -14,6 +14,7 @@ import com.lyy.admin.VO.DevelopmentInfoListVO;
...
@@ -14,6 +14,7 @@ import com.lyy.admin.VO.DevelopmentInfoListVO;
import
com.lyy.admin.domain.developmentinfo.DevelopmentInfo
;
import
com.lyy.admin.domain.developmentinfo.DevelopmentInfo
;
import
com.lyy.admin.domain.developmentinfo.DevelopmentInfoParam
;
import
com.lyy.admin.domain.developmentinfo.DevelopmentInfoParam
;
import
com.lyy.admin.enumerate.CacheType
;
import
com.lyy.admin.enumerate.CacheType
;
import
com.lyy.admin.enumerate.DevelopmentStatusEnum
;
import
com.lyy.admin.service.developmentinfo.DevelopmentInfoService
;
import
com.lyy.admin.service.developmentinfo.DevelopmentInfoService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -47,7 +48,8 @@ public class DevelopmentInfoController extends BaseController {
...
@@ -47,7 +48,8 @@ public class DevelopmentInfoController extends BaseController {
})
})
public
TableDataInfo
list
(
DevelopmentInfoParam
developmentInfoParam
)
{
public
TableDataInfo
list
(
DevelopmentInfoParam
developmentInfoParam
)
{
boolean
login
=
isLogin
();
boolean
login
=
isLogin
();
developmentInfoParam
.
setStatus
(
"3,4,5"
);
String
status
=
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
()+
","
+
DevelopmentStatusEnum
.
STATUS_YJJ
.
getCode
()+
","
+
DevelopmentStatusEnum
.
STATUS_DRZ
.
getCode
();
developmentInfoParam
.
setStatus
(
status
);
startPage
();
startPage
();
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoSerivce
.
selectDevelopmentInfoVOList
(
developmentInfoParam
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoSerivce
.
selectDevelopmentInfoVOList
(
developmentInfoParam
);
List
<
DevelopmentInfoListVO
>
developmentInfoVOs
=
developmentInfos
.
stream
().
map
(
developmentInfo
->
{
List
<
DevelopmentInfoListVO
>
developmentInfoVOs
=
developmentInfos
.
stream
().
map
(
developmentInfo
->
{
...
@@ -56,9 +58,9 @@ public class DevelopmentInfoController extends BaseController {
...
@@ -56,9 +58,9 @@ public class DevelopmentInfoController extends BaseController {
if
(
login
){
if
(
login
){
boolean
existInfo
=
developmentInfoSerivce
.
isExistInfo
(
getUserInfo
().
getUserId
(),
developmentInfoVO
.
getId
());
boolean
existInfo
=
developmentInfoSerivce
.
isExistInfo
(
getUserInfo
().
getUserId
(),
developmentInfoVO
.
getId
());
if
(
existInfo
)
{
if
(
existInfo
)
{
developmentInfoVO
.
setIsCollection
(
1
);
developmentInfoVO
.
setIsCollection
(
DevelopmentStatusEnum
.
IS_COLLECTION_1
.
getCode
()
);
}
else
{
}
else
{
developmentInfoVO
.
setIsCollection
(
0
);
developmentInfoVO
.
setIsCollection
(
DevelopmentStatusEnum
.
IS_COLLECTION_0
.
getCode
()
);
}
}
}
}
return
developmentInfoVO
;
return
developmentInfoVO
;
...
...
src/main/java/com/lyy/admin/controller/parkinfo/ParkInfoController.java
View file @
483eb7d3
...
@@ -13,6 +13,8 @@ import com.lyy.admin.controller.BaseController;
...
@@ -13,6 +13,8 @@ import com.lyy.admin.controller.BaseController;
import
com.lyy.admin.domain.SysCollection
;
import
com.lyy.admin.domain.SysCollection
;
import
com.lyy.admin.domain.parkinfo.*
;
import
com.lyy.admin.domain.parkinfo.*
;
import
com.lyy.admin.enumerate.CacheType
;
import
com.lyy.admin.enumerate.CacheType
;
import
com.lyy.admin.enumerate.DevelopmentStatusEnum
;
import
com.lyy.admin.enumerate.ParkInfoEnum
;
import
com.lyy.admin.service.SysCollectionService
;
import
com.lyy.admin.service.SysCollectionService
;
import
com.lyy.admin.service.carrierinfo.CarrierElevatorInfoService
;
import
com.lyy.admin.service.carrierinfo.CarrierElevatorInfoService
;
import
com.lyy.admin.service.carrierinfo.CarrierFloorInfoService
;
import
com.lyy.admin.service.carrierinfo.CarrierFloorInfoService
;
...
@@ -56,7 +58,8 @@ public class ParkInfoController extends BaseController {
...
@@ -56,7 +58,8 @@ public class ParkInfoController extends BaseController {
})
})
public
TableDataInfo
list
(
ParkInfoParam
parkInfoParam
)
{
public
TableDataInfo
list
(
ParkInfoParam
parkInfoParam
)
{
boolean
login
=
isLogin
();
boolean
login
=
isLogin
();
parkInfoParam
.
setStatus
(
"3,4,5"
);
String
status
=
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_YJJ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
();
parkInfoParam
.
setStatus
(
status
);
startPage
();
startPage
();
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfoParam
);
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfoParam
);
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
...
@@ -66,9 +69,9 @@ public class ParkInfoController extends BaseController {
...
@@ -66,9 +69,9 @@ public class ParkInfoController extends BaseController {
if
(
login
)
{
if
(
login
)
{
boolean
existInfo
=
parkInfoService
.
isExistInfo
(
getUserInfo
().
getUserId
(),
parkInfo
.
getId
());
boolean
existInfo
=
parkInfoService
.
isExistInfo
(
getUserInfo
().
getUserId
(),
parkInfo
.
getId
());
if
(
existInfo
)
{
if
(
existInfo
)
{
parkInfoListVO
.
setIsCollection
(
1
);
parkInfoListVO
.
setIsCollection
(
ParkInfoEnum
.
IS_COLLECTION_1
.
getCode
()
);
}
else
{
}
else
{
parkInfoListVO
.
setIsCollection
(
0
);
parkInfoListVO
.
setIsCollection
(
ParkInfoEnum
.
IS_COLLECTION_0
.
getCode
()
);
}
}
}
}
return
parkInfoListVO
;
return
parkInfoListVO
;
...
...
src/main/java/com/lyy/admin/controller/personalfunction/PersonalFunctionsController.java
View file @
483eb7d3
...
@@ -342,7 +342,7 @@ public class PersonalFunctionsController extends BaseController {
...
@@ -342,7 +342,7 @@ public class PersonalFunctionsController extends BaseController {
public
TableDataInfo
parkList
()
{
public
TableDataInfo
parkList
()
{
ParkInfoParam
parkInfoParam
=
new
ParkInfoParam
();
ParkInfoParam
parkInfoParam
=
new
ParkInfoParam
();
parkInfoParam
.
setUserId
(
getUserInfo
().
getUserId
());
parkInfoParam
.
setUserId
(
getUserInfo
().
getUserId
());
parkInfoParam
.
setStatus
(
"1"
);
parkInfoParam
.
setStatus
(
String
.
valueOf
(
ParkInfoEnum
.
STATUS_WRZ
.
getCode
())
);
startPage
();
startPage
();
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfoParam
);
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfoParam
);
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
...
@@ -365,7 +365,7 @@ public class PersonalFunctionsController extends BaseController {
...
@@ -365,7 +365,7 @@ public class PersonalFunctionsController extends BaseController {
public
TableDataInfo
developmentList
()
{
public
TableDataInfo
developmentList
()
{
DevelopmentInfoParam
developmentInfoParam
=
new
DevelopmentInfoParam
();
DevelopmentInfoParam
developmentInfoParam
=
new
DevelopmentInfoParam
();
developmentInfoParam
.
setUserId
(
getUserInfo
().
getUserId
());
developmentInfoParam
.
setUserId
(
getUserInfo
().
getUserId
());
developmentInfoParam
.
setStatus
(
"1"
);
developmentInfoParam
.
setStatus
(
String
.
valueOf
(
DevelopmentStatusEnum
.
STATUS_WRZ
.
getCode
())
);
startPage
();
startPage
();
List
<
DevelopmentInfo
>
lists
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfoParam
);
List
<
DevelopmentInfo
>
lists
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfoParam
);
...
...
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