园区字典开发区新增保存、提交

src/main/java/com/lyy/admin/VO/ParkInfoSaveVO.java

@@ -192,7 +192,7 @@ public class ParkInfoSaveVO implements Serializable {
      * 工业用电（单位：元/度）
      */
     @ApiModelProperty(value = "工业用电（单位：元/度）")
-    private BigDecimal electricityPrice;
+    private String electricityPrice;
     /**
      * 供电类型
      */

src/main/java/com/lyy/admin/controller/developmentinfo/DevelopmentInfoController.java

@@ -14,6 +14,7 @@ import com.lyy.admin.VO.DevelopmentInfoListVO;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfo;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfoParam;
 import com.lyy.admin.enumerate.CacheType;
+import com.lyy.admin.enumerate.DevelopmentStatusEnum;
 import com.lyy.admin.service.developmentinfo.DevelopmentInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -47,7 +48,8 @@ public class DevelopmentInfoController extends BaseController {
     })
     public TableDataInfo list(DevelopmentInfoParam developmentInfoParam) {
         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();
         List<DevelopmentInfo> developmentInfos = developmentInfoSerivce.selectDevelopmentInfoVOList(developmentInfoParam);
         List<DevelopmentInfoListVO> developmentInfoVOs = developmentInfos.stream().map(developmentInfo -> {
@@ -56,9 +58,9 @@ public class DevelopmentInfoController extends BaseController {
             if(login){
                 boolean existInfo = developmentInfoSerivce.isExistInfo(getUserInfo().getUserId(), developmentInfoVO.getId());
                 if (existInfo) {
-                    developmentInfoVO.setIsCollection(1);
+                    developmentInfoVO.setIsCollection(DevelopmentStatusEnum.IS_COLLECTION_1.getCode());
                 } else {
-                    developmentInfoVO.setIsCollection(0);
+                    developmentInfoVO.setIsCollection(DevelopmentStatusEnum.IS_COLLECTION_0.getCode());
                 }
             }
             return developmentInfoVO;

src/main/java/com/lyy/admin/controller/parkinfo/ParkInfoController.java

@@ -13,6 +13,8 @@ import com.lyy.admin.controller.BaseController;
 import com.lyy.admin.domain.SysCollection;
 import com.lyy.admin.domain.parkinfo.*;
 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.carrierinfo.CarrierElevatorInfoService;
 import com.lyy.admin.service.carrierinfo.CarrierFloorInfoService;
@@ -56,7 +58,8 @@ public class ParkInfoController extends BaseController {
     })
     public TableDataInfo list(ParkInfoParam parkInfoParam) {
         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();
         List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoParam);
         List<ParkInfoListVO> parkInfoListVOs = lists.stream().map(parkInfo -> {
@@ -66,9 +69,9 @@ public class ParkInfoController extends BaseController {
             if (login) {
                 boolean existInfo = parkInfoService.isExistInfo(getUserInfo().getUserId(), parkInfo.getId());
                 if (existInfo) {
-                    parkInfoListVO.setIsCollection(1);
+                    parkInfoListVO.setIsCollection(ParkInfoEnum.IS_COLLECTION_1.getCode());
                 } else {
-                    parkInfoListVO.setIsCollection(0);
+                    parkInfoListVO.setIsCollection(ParkInfoEnum.IS_COLLECTION_0.getCode());
                 }
             }
             return parkInfoListVO;

src/main/java/com/lyy/admin/controller/personalfunction/PersonalFunctionsController.java

@@ -342,7 +342,7 @@ public class PersonalFunctionsController extends BaseController {
     public TableDataInfo parkList() {
         ParkInfoParam parkInfoParam = new ParkInfoParam();
         parkInfoParam.setUserId(getUserInfo().getUserId());
-        parkInfoParam.setStatus("1");
+        parkInfoParam.setStatus(String.valueOf(ParkInfoEnum.STATUS_WRZ.getCode()));
         startPage();
         List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoParam);
         List<ParkInfoListVO> parkInfoListVOs = lists.stream().map(parkInfo -> {
@@ -365,7 +365,7 @@ public class PersonalFunctionsController extends BaseController {
     public TableDataInfo developmentList() {
         DevelopmentInfoParam developmentInfoParam = new DevelopmentInfoParam();
         developmentInfoParam.setUserId(getUserInfo().getUserId());
-        developmentInfoParam.setStatus("1");
+        developmentInfoParam.setStatus(String.valueOf(DevelopmentStatusEnum.STATUS_WRZ.getCode()));
         startPage();
         List<DevelopmentInfo> lists = developmentInfoService.selectDevelopmentInfoVOList(developmentInfoParam);