//立业云后台提交

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/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> ');