//立业云后台提交

ruoyi-system/src/main/java/com/ruoyi/system/controller/DevelopmentInfoController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.system.VO.DevelopmentInfoDetailVO;
+import com.ruoyi.system.domain.ParkInfo;
 import com.ruoyi.system.enums.DevelopmentStatusEnum;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +104,29 @@ public class DevelopmentInfoController extends BaseController {
         return prefix + "/edit";
     }
 
+    /**
+     * 修改保存开发区信息
+     */
+    @RequiresPermissions("developmentInfo:info:edit")
+    @Log(title = "开发区信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/changeParkStatus")
+    @ResponseBody
+    public AjaxResult changeParkStatus(DevelopmentInfo developmentInfo) {
+        return toAjax(developmentInfoService.changeParkStatus(developmentInfo));
+    }
+
+
+//    /**
+//     * 修改保存开发区信息
+//     */
+//    @RequiresPermissions("developmentInfo:info:edit")
+//    @Log(title = "开发区信息", businessType = BusinessType.UPDATE)
+//    @PostMapping("/edit")
+//    @ResponseBody
+//    public AjaxResult edit(DevelopmentInfo developmentInfo) {
+//        return toAjax(developmentInfoService.updateDevelopmentInfo(developmentInfo));
+//    }
+
     /**
      * 修改保存开发区信息
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/DevelopmentInfo.java

@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 开发区对象 development_info
  *
  * @author ruoyi
- * @date 2023-11-10
+ * @date 2023-12-01
  */
 public class DevelopmentInfo extends BaseEntity
 {
@@ -21,8 +21,8 @@ public class DevelopmentInfo extends BaseEntity
     /** 主键id */
     private Long id;
 
-    /** 片区名称 */
-    @Excel(name = "片区名称")
+    /** 开发区名称 */
+    @Excel(name = "开发区名称")
     private String name;
 
     /** 所属集团id */
@@ -41,12 +41,12 @@ public class DevelopmentInfo extends BaseEntity
     @Excel(name = "开发区级别名称")
     private String levelName;
 
-    /** 片区级别-其他 */
-    @Excel(name = "片区级别-其他")
+    /** 开发区级别-其他 */
+    @Excel(name = "开发区级别-其他")
     private String levelOther;
 
-    /** 请选择省份城市与地区 */
-    @Excel(name = "请选择省份城市与地区")
+    /** 请选择省份城市与地区->作废 */
+    @Excel(name = "请选择省份城市与地区->作废")
     private String location;
 
     /** 规划面积（平方公里） */
@@ -97,60 +97,60 @@ public class DevelopmentInfo extends BaseEntity
     @Excel(name = "片区区位信息-其他补充信息")
     private String locationOther;
 
-    /** 整体定位 */
-    @Excel(name = "整体定位")
+    /** 整体定位=》作废 */
+    @Excel(name = "整体定位=》作废")
     private String overallPositioning;
 
-    /** 所属区县人口信息—常住人口（万人） */
+    /** 所属区县人口信息—常住人口（万人）=》作废 */
     @Excel(name = "所属区县人口信息—常住人口", readConverterExp = "万=人")
     private BigDecimal permanentPopulation;
 
-    /** 户籍人口（万人） */
+    /** 户籍人口（万人）=》作废 */
     @Excel(name = "户籍人口", readConverterExp = "万=人")
     private BigDecimal registerPopulation;
 
-    /** 流动人口（万人） */
+    /** 流动人口（万人）=》作废 */
     @Excel(name = "流动人口", readConverterExp = "万=人")
     private BigDecimal floatingPopulation;
 
-    /** 常住人口增长率（‰） */
+    /** 常住人口增长率（‰）=》作废 */
     @Excel(name = "常住人口增长率", readConverterExp = "‰=")
     private String permanentRatio;
 
-    /** 户籍人口增长率（‰） */
+    /** 户籍人口增长率（‰）=》作废 */
     @Excel(name = "户籍人口增长率", readConverterExp = "‰=")
     private String registerRatio;
 
-    /** 流动人口增长率（‰） */
+    /** 流动人口增长率（‰）=》作废 */
     @Excel(name = "流动人口增长率", readConverterExp = "‰=")
     private String floatingRatio;
 
-    /** 所属区县经济信息（2022年）—区县GDP（亿元） */
+    /** 所属区县经济信息（2022年）—区县GDP（亿元）=》作废 */
     @Excel(name = "所属区县经济信息", readConverterExp = "2=022年")
     private BigDecimal gdp;
 
-    /** 规上工业增加值（亿元） */
+    /** 规上工业增加值（亿元）=》作废 */
     @Excel(name = "规上工业增加值", readConverterExp = "亿=元")
     private BigDecimal addValue;
 
-    /** 一般公共预算收入（亿元） */
+    /** 一般公共预算收入（亿元）=》作废 */
     @Excel(name = "一般公共预算收入", readConverterExp = "亿=元")
     private BigDecimal budgetIncome;
 
-    /** 增值税地方留存比例（%） */
+    /** 增值税地方留存比例（%）=》作废 */
     @Excel(name = "增值税地方留存比例", readConverterExp = "%=")
     private BigDecimal addValueTax;
 
-    /** 所得税地方留存比例（%） */
+    /** 所得税地方留存比例（%）=》作废 */
     @Excel(name = "所得税地方留存比例", readConverterExp = "%=")
     private BigDecimal incomeTax;
 
-    /** 综合留存比例（%） */
+    /** 综合留存比例（%）=》作废 */
     @Excel(name = "综合留存比例", readConverterExp = "%=")
     private BigDecimal comprehensive;
 
-    /** 片区产业-产业空间规划 */
-    @Excel(name = "片区产业-产业空间规划")
+    /** 片区产业-产业空间规划  =》作废 */
+    @Excel(name = "片区产业-产业空间规划  =》作废")
     private String industrySpacePlan;
 
     /** 产规图像1 */
@@ -333,8 +333,8 @@ public class DevelopmentInfo extends BaseEntity
     @Excel(name = "总投资额", readConverterExp = "亿=元")
     private BigDecimal investmentAmountTotal;
 
-    /** 投资周期（月） */
-    @Excel(name = "投资周期", readConverterExp = "月=")
+    /** 建设周期（月） */
+    @Excel(name = "建设周期", readConverterExp = "月=")
     private Long buildingPeriod;
 
     /** 工业用电（元/度） */
@@ -422,13 +422,25 @@ public class DevelopmentInfo extends BaseEntity
     @Excel(name = "污水处理价格")
     private BigDecimal sewageWaterPrice;
 
-    /** 原因 */
-    @Excel(name = "原因")
+    /** 所属机构 */
+    @Excel(name = "所属机构")
+    private String organization;
+
+    /** 通过或拒绝原因 */
+    @Excel(name = "通过或拒绝原因")
     private String reason;
 
-    /** 组织机构 */
-    @Excel(name = "组织机构")
-    private String organization;
+    /** 是否为星级开发区（1-是） */
+    @Excel(name = "是否为星级开发区", readConverterExp = "1=-是")
+    private Integer isSuper;
+
+    /** 经度（坐标系-gcj02） */
+    @Excel(name = "经度", readConverterExp = "坐=标系-gcj02")
+    private BigDecimal longitude;
+
+    /** 纬度（坐标系-gcj02） */
+    @Excel(name = "纬度", readConverterExp = "坐=标系-gcj02")
+    private BigDecimal latitude;
 
     public void setId(Long id)
     {
@@ -1339,21 +1351,50 @@ public class DevelopmentInfo extends BaseEntity
     {
         return sewageWaterPrice;
     }
+    public void setOrganization(String organization)
+    {
+        this.organization = organization;
+    }
+
+    public String getOrganization()
+    {
+        return organization;
+    }
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
 
-    public String getReason() {
+    public String getReason()
+    {
         return reason;
     }
+    public void setIsSuper(Integer isSuper)
+    {
+        this.isSuper = isSuper;
+    }
 
-    public void setReason(String reason) {
-        this.reason = reason;
+    public Integer getIsSuper()
+    {
+        return isSuper;
+    }
+    public void setLongitude(BigDecimal longitude)
+    {
+        this.longitude = longitude;
     }
 
-    public String getOrganization() {
-        return organization;
+    public BigDecimal getLongitude()
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
     }
 
-    public void setOrganization(String organization) {
-        this.organization = organization;
+    public BigDecimal getLatitude()
+    {
+        return latitude;
     }
 
     @Override
@@ -1462,8 +1503,11 @@ public class DevelopmentInfo extends BaseEntity
                 .append("submitTime", getSubmitTime())
                 .append("sewageWaterType", getSewageWaterType())
                 .append("sewageWaterPrice", getSewageWaterPrice())
-            .append("reason", getReason())
                 .append("organization", getOrganization())
+                .append("reason", getReason())
+                .append("isSuper", getIsSuper())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
                 .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ParkInfo.java

 package com.ruoyi.system.domain;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * parkinfo对象 park_info
  *
  * @author ruoyi
- * @date 2023-11-15
+ * @date 2023-12-01
  */
 public class ParkInfo extends BaseEntity
 {
@@ -130,8 +129,8 @@ public class ParkInfo extends BaseEntity
     @Excel(name = "所属行业")
     private String industryIds;
 
-    /** 招商方向 */
-    @Excel(name = "招商方向")
+    /** 招商方向-》作废 */
+    @Excel(name = "招商方向-》作废")
     private String investmentDirection;
 
     /** 禁限目录 */
@@ -254,12 +253,12 @@ public class ParkInfo extends BaseEntity
     @Excel(name = "充电桩", readConverterExp = "0=-无；1-有")
     private Integer chargingStation;
 
-    /** 开发区id */
-    @Excel(name = "开发区id")
+    /** 开发区id=》作废 */
+    @Excel(name = "开发区id=》作废")
     private Long developmentZoneId;
 
-    /** 开发区名称 */
-    @Excel(name = "开发区名称")
+    /** 开发区名称=》作废 */
+    @Excel(name = "开发区名称=》作废")
     private String developmentZoneName;
 
     /** 认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝;9-作废） */
@@ -315,8 +314,8 @@ public class ParkInfo extends BaseEntity
     @Excel(name = "总投资额", readConverterExp = "亿=元")
     private BigDecimal investmentAmountTotal;
 
-    /** 建设周期（月） */
-    @Excel(name = "建设周期", readConverterExp = "月=")
+    /** 投资周期（月） */
+    @Excel(name = "投资周期", readConverterExp = "月=")
     private Long buildingPeriod;
 
     /** 租售类别 */
@@ -371,6 +370,14 @@ public class ParkInfo extends BaseEntity
     @Excel(name = "通过或拒绝原因")
     private String reason;
 
+    /** 经度（坐标系gcj02） */
+    @Excel(name = "经度", readConverterExp = "坐=标系gcj02")
+    private BigDecimal longitude;
+
+    /** 纬度（坐标系gcj02） */
+    @Excel(name = "纬度", readConverterExp = "坐=标系gcj02")
+    private BigDecimal latitude;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -1163,6 +1170,24 @@ public class ParkInfo extends BaseEntity
     {
         return reason;
     }
+    public void setLongitude(BigDecimal longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude()
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude()
+    {
+        return latitude;
+    }
 
     @Override
     public String toString() {
@@ -1257,6 +1282,8 @@ public class ParkInfo extends BaseEntity
                 .append("lectureHall", getLectureHall())
                 .append("organization", getOrganization())
                 .append("reason", getReason())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
                 .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IDevelopmentInfoService.java

@@ -44,6 +44,8 @@ public interface IDevelopmentInfoService {
      */
     public int updateDevelopmentInfo(DevelopmentInfo developmentInfo);
 
+    public int changeParkStatus(DevelopmentInfo developmentInfo);
+
     /**
      * 批量删除开发区
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java

@@ -69,6 +69,19 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
      */
     @Override
     public int updateDevelopmentInfo(DevelopmentInfo developmentInfo) {
+        developmentInfo.setUpdateTime(DateUtils.getNowDate());
+        return developmentInfoMapper.updateDevelopmentInfo(developmentInfo);
+    }
+
+
+    /**
+     * 修改开发区
+     *
+     * @param developmentInfo 开发区
+     * @return 结果
+     */
+    @Override
+    public int changeParkStatus(DevelopmentInfo developmentInfo) {
         developmentInfo.setUpdateTime(DateUtils.getNowDate());
         Long id = developmentInfo.getId();
         Integer status = developmentInfo.getStatus();

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java

@@ -152,8 +152,7 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     @Transactional
     public int updateParkInfo(ParkInfo parkInfo) {
         parkInfo.setUpdateTime(DateUtils.getNowDate());
-        parkInfoMapper.updateParkInfo(parkInfo);
-        return 1;
+        return parkInfoMapper.updateParkInfo(parkInfo);
     }
 
     public int updateOtherUserParkInfo(Map<String, Long> map) {

ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html

@@ -572,18 +572,17 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'详情\',\'/developmentInfo/info/detail/' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区信息</a> ');
-                        // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/developmentInfo/traffic?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'重点企业信息\',\'/developmentInfo/primaryEnterprise?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑重点企业信息</a> <br>');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区到周边距离信息\',\'/developmentInfo/periphery?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区到周边距离信息</a> ');
-                        // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区所属园区信息\',\'/developmentInfo/park?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区所属园区信息</a> ');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'其他产业资产信息\',\'/developmentInfo/otherProperty?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑其他产业资产信息</a> <br>');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/developmentInfo/investmentDirection?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑招商方向信息</a> ');
-                        // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业政策信息\',\'/developmentInfo/industryPolicy?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业政策信息</a> ');
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业基金信息\',\'/developmentInfo/industryFund?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业基金信息</a> <br>');
-                        // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
-
-                        // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/info/update?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区信息</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/developmentInfo/traffic?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'重点企业信息\',\'/developmentInfo/primaryEnterprise?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑重点企业信息</a> <br>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区到周边距离信息\',\'/developmentInfo/periphery?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区到周边距离信息</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区所属园区信息\',\'/developmentInfo/park?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区所属园区信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'其他产业资产信息\',\'/developmentInfo/otherProperty?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑其他产业资产信息</a> <br>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/developmentInfo/investmentDirection?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑招商方向信息</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业政策信息\',\'/developmentInfo/industryPolicy?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业政策信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业基金信息\',\'/developmentInfo/industryFund?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业基金信息</a> <br>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/info/update?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
                         let status = row.status;
                         if (status == 2) {
                             actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="clickValid(' + row.id + ',3,'+row.mirrorId+')">通过</a> ');