Skip to content

cfld-liyeyun-admin
cfld-liyeyun-admin
Commit face22b1 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

//立业云后台提交

parent cb0e068d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 928 additions and 376 deletions
ruoyi-admin/src/main/resources/application-test.yml
View file @ face22b1
......@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://rm-2ze10ohzb1898j5qd.mysql.rds.aliyuncs.com:3306/liyeyun?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://rm-2ze10ohzb1898j5qdfo.mysql.rds.aliyuncs.com:3306/liyeyun?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: liyeyun
password: CF**ldcn
# 从库数据源
......
ruoyi-admin/src/main/resources/application.yml
View file @ face22b1
......@@ -59,7 +59,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
active: dev
active: test
# 文件上传
servlet:
multipart:
......@@ -98,7 +98,7 @@ shiro:
# 首页地址
indexUrl: /index
# 验证码开关
captchaEnabled: true
captchaEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
cookie:
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/CarrierInfoController.java
View file @ face22b1
package com.ruoyi.system.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.CarrierInfo;
import com.ruoyi.system.service.ICarrierInfoService;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.CarrierInfo;
import com.ruoyi.system.service.ICarrierInfoService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 载体信息Controller
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
@Controller
@RequestMapping("/carrier/info")
......@@ -34,10 +36,8 @@ public class CarrierInfoController extends BaseController
@RequiresPermissions("carrier:info:view")
@GetMapping()
public String info(HttpServletRequest request, ModelMap mmap)
public String info()
{
String parkId = request.getParameter("parkId");
mmap.put("parkId", parkId);
return prefix + "/info";
}
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/DevelopmentIndustrialLandInfoController.java
View file @ face22b1
......@@ -19,36 +19,32 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import javax.servlet.http.HttpServletRequest;
/**
* 开发区产业用地信息Controller
* 土地信息Controller
*
* @author ruoyi
* @date 2023-10-07
* @date 2023-12-07
*/
@Controller
@RequestMapping("/developmentInfo/industrialLand")
@RequestMapping("/land/info")
public class DevelopmentIndustrialLandInfoController extends BaseController
{
private String prefix = "developmentInfo/industrialLand";
private String prefix = "land/info";
@Autowired
private IDevelopmentIndustrialLandInfoService developmentIndustrialLandInfoService;
// @RequiresPermissions("developmentInfo:industrialLand:view")
@RequiresPermissions("land:info:view")
@GetMapping()
public String industrialLand(HttpServletRequest request, ModelMap mmap)
public String info()
{
String developmentId = request.getParameter("developmentId");
mmap.put("developmentId", developmentId);
return prefix + "/industrialLand";
return prefix + "/info";
}
/**
* 查询开发区产业用地信息列表
* 查询土地信息列表
*/
// @RequiresPermissions("developmentInfo:industrialLand:list")
@RequiresPermissions("land:info:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
......@@ -59,21 +55,21 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
}
/**
* 导出开发区产业用地信息列表
* 导出土地信息列表
*/
// @RequiresPermissions("developmentInfo:industrialLand:export")
@Log(title = "开发区产业用地信息", businessType = BusinessType.EXPORT)
@RequiresPermissions("land:info:export")
@Log(title = "土地信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
{
List<DevelopmentIndustrialLandInfo> list = developmentIndustrialLandInfoService.selectDevelopmentIndustrialLandInfoList(developmentIndustrialLandInfo);
ExcelUtil<DevelopmentIndustrialLandInfo> util = new ExcelUtil<DevelopmentIndustrialLandInfo>(DevelopmentIndustrialLandInfo.class);
return util.exportExcel(list, "开发区产业用地信息数据");
return util.exportExcel(list, "土地信息数据");
}
/**
* 新增开发区产业用地信息
* 新增土地信息
*/
@GetMapping("/add")
public String add()
......@@ -82,10 +78,10 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
}
/**
* 新增保存开发区产业用地信息
* 新增保存土地信息
*/
// @RequiresPermissions("developmentInfo:industrialLand:add")
@Log(title = "开发区产业用地信息", businessType = BusinessType.INSERT)
@RequiresPermissions("land:info:add")
@Log(title = "土地信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
......@@ -94,9 +90,9 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
}
/**
* 修改开发区产业用地信息
* 修改土地信息
*/
// @RequiresPermissions("developmentInfo:industrialLand:edit")
@RequiresPermissions("land:info:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
......@@ -106,10 +102,10 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
}
/**
* 修改保存开发区产业用地信息
* 修改保存土地信息
*/
// @RequiresPermissions("developmentInfo:industrialLand:edit")
@Log(title = "开发区产业用地信息", businessType = BusinessType.UPDATE)
@RequiresPermissions("land:info:edit")
@Log(title = "土地信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
......@@ -118,10 +114,10 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
}
/**
* 删除开发区产业用地信息
* 删除土地信息
*/
// @RequiresPermissions("developmentInfo:industrialLand:remove")
@Log(title = "开发区产业用地信息", businessType = BusinessType.DELETE)
@RequiresPermissions("land:info:remove")
@Log(title = "土地信息", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/CarrierInfo.java
View file @ face22b1
......@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 载体信息对象 carrier_info
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
public class CarrierInfo extends BaseEntity
{
......@@ -115,6 +115,14 @@ public class CarrierInfo extends BaseEntity
@Excel(name = "耐火等级")
private String fireResistant;
/** 主屏照片 */
@Excel(name = "主屏照片")
private String imgUrl;
/** 承重 */
@Excel(name = "承重")
private BigDecimal weight;
public void setId(Long id)
{
this.id = id;
......@@ -340,6 +348,24 @@ public class CarrierInfo extends BaseEntity
{
return fireResistant;
}
public void setImgUrl(String imgUrl)
{
this.imgUrl = imgUrl;
}
public String getImgUrl()
{
return imgUrl;
}
public void setWeight(BigDecimal weight)
{
this.weight = weight;
}
public BigDecimal getWeight()
{
return weight;
}
@Override
public String toString() {
......@@ -371,6 +397,8 @@ public class CarrierInfo extends BaseEntity
.append("distance", getDistance())
.append("elevatorType", getElevatorType())
.append("fireResistant", getFireResistant())
.append("imgUrl", getImgUrl())
.append("weight", getWeight())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/DevelopmentIndustrialLandInfo.java
View file @ face22b1
......@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 土地信息对象 development_industrial_land_info
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
public class DevelopmentIndustrialLandInfo extends BaseEntity
{
......@@ -31,8 +31,8 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
@Excel(name = "面积", readConverterExp = "亩=")
private BigDecimal area;
/** 持有方类别 */
@Excel(name = "持有方类别")
/** 土地类型（工业土地 仓储用地 商务金融用地 文化设施用地 科研用地 其他商服用地 其他） */
@Excel(name = "土地类型", readConverterExp = "工=业土地,仓=储用地,商=务金融用地,文=化设施用地,科=研用地,其=他商服用地,其=他")
private String type;
/** 土地现状 */
......@@ -47,18 +47,74 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
@Excel(name = "产业方向")
private String industryDirection;
/** */
@Excel(name = "")
/** 联系人姓名 */
@Excel(name = "联系人姓名")
private String contacterName;
/** */
@Excel(name = "")
/** 联系电话 */
@Excel(name = "联系电话")
private String contacterPhone;
/** 价格（单位亩） */
@Excel(name = "价格", readConverterExp = "单=位亩")
private BigDecimal price;
/** 首屏图片信息 */
@Excel(name = "首屏图片信息")
private String imgUrl;
/** 容积率 */
@Excel(name = "容积率")
private String ratio;
/** 土地证价格 */
@Excel(name = "土地证价格")
private String landDeed;
/** 出让年限 */
@Excel(name = "出让年限")
private String ageLimit;
/** 开发程度 */
@Excel(name = "开发程度")
private String developLevel;
/** 出让状态 */
@Excel(name = "出让状态")
private String shellState;
/** 持有方类别 */
@Excel(name = "持有方类别")
private String holderType;
/** 总投资额 */
@Excel(name = "总投资额")
private String totalInvestment;
/** 亩均年产值 */
@Excel(name = "亩均年产值")
private String outputValue;
/** 亩均投资强度 */
@Excel(name = "亩均投资强度")
private Long investNum;
/** 亩均税收 */
@Excel(name = "亩均税收")
private String taxRevenue;
/** 建设周期 */
@Excel(name = "建设周期")
private String constructionCycle;
/** 能评要求 */
@Excel(name = "能评要求")
private String energyRequire;
/** 乐观锁 */
@Excel(name = "乐观锁")
private Long version;
public void setId(Long id)
{
this.id = id;
......@@ -158,6 +214,132 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
{
return price;
}
public void setImgUrl(String imgUrl)
{
this.imgUrl = imgUrl;
}
public String getImgUrl()
{
return imgUrl;
}
public void setRatio(String ratio)
{
this.ratio = ratio;
}
public String getRatio()
{
return ratio;
}
public void setLandDeed(String landDeed)
{
this.landDeed = landDeed;
}
public String getLandDeed()
{
return landDeed;
}
public void setAgeLimit(String ageLimit)
{
this.ageLimit = ageLimit;
}
public String getAgeLimit()
{
return ageLimit;
}
public void setDevelopLevel(String developLevel)
{
this.developLevel = developLevel;
}
public String getDevelopLevel()
{
return developLevel;
}
public void setShellState(String shellState)
{
this.shellState = shellState;
}
public String getShellState()
{
return shellState;
}
public void setHolderType(String holderType)
{
this.holderType = holderType;
}
public String getHolderType()
{
return holderType;
}
public void setTotalInvestment(String totalInvestment)
{
this.totalInvestment = totalInvestment;
}
public String getTotalInvestment()
{
return totalInvestment;
}
public void setOutputValue(String outputValue)
{
this.outputValue = outputValue;
}
public String getOutputValue()
{
return outputValue;
}
public void setInvestNum(Long investNum)
{
this.investNum = investNum;
}
public Long getInvestNum()
{
return investNum;
}
public void setTaxRevenue(String taxRevenue)
{
this.taxRevenue = taxRevenue;
}
public String getTaxRevenue()
{
return taxRevenue;
}
public void setConstructionCycle(String constructionCycle)
{
this.constructionCycle = constructionCycle;
}
public String getConstructionCycle()
{
return constructionCycle;
}
public void setEnergyRequire(String energyRequire)
{
this.energyRequire = energyRequire;
}
public String getEnergyRequire()
{
return energyRequire;
}
public void setVersion(Long version)
{
this.version = version;
}
public Long getVersion()
{
return version;
}
@Override
public String toString() {
......@@ -173,6 +355,24 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
.append("contacterName", getContacterName())
.append("contacterPhone", getContacterPhone())
.append("price", getPrice())
.append("imgUrl", getImgUrl())
.append("ratio", getRatio())
.append("landDeed", getLandDeed())
.append("ageLimit", getAgeLimit())
.append("developLevel", getDevelopLevel())
.append("shellState", getShellState())
.append("holderType", getHolderType())
.append("totalInvestment", getTotalInvestment())
.append("outputValue", getOutputValue())
.append("investNum", getInvestNum())
.append("taxRevenue", getTaxRevenue())
.append("constructionCycle", getConstructionCycle())
.append("energyRequire", getEnergyRequire())
.append("version", getVersion())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/CarrierInfoMapper.java
View file @ face22b1
......@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.CarrierInfo;
* 载体信息Mapper接口
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
public interface CarrierInfoMapper
{
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DevelopmentIndustrialLandInfoMapper.java
View file @ face22b1
......@@ -4,55 +4,55 @@ import java.util.List;
import com.ruoyi.system.domain.DevelopmentIndustrialLandInfo;
/**
* 开发区产业用地信息Mapper接口
* 土地信息Mapper接口
*
* @author ruoyi
* @date 2023-10-07
* @date 2023-12-07
*/
public interface DevelopmentIndustrialLandInfoMapper
{
/**
* 查询开发区产业用地信息
* 查询土地信息
*
* @param id 开发区产业用地信息主键
* @return 开发区产业用地信息
* @param id 土地信息主键
* @return 土地信息
*/
public DevelopmentIndustrialLandInfo selectDevelopmentIndustrialLandInfoById(Long id);
/**
* 查询开发区产业用地信息列表
* 查询土地信息列表
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @return 开发区产业用地信息集合
* @param developmentIndustrialLandInfo 土地信息
* @return 土地信息集合
*/
public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 新增开发区产业用地信息
* 新增土地信息
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @param developmentIndustrialLandInfo 土地信息
* @return 结果
*/
public int insertDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 修改开发区产业用地信息
* 修改土地信息
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @param developmentIndustrialLandInfo 土地信息
* @return 结果
*/
public int updateDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 删除开发区产业用地信息
* 删除土地信息
*
* @param id 开发区产业用地信息主键
* @param id 土地信息主键
* @return 结果
*/
public int deleteDevelopmentIndustrialLandInfoById(Long id);
/**
* 批量删除开发区产业用地信息
* 批量删除土地信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ICarrierInfoService.java
View file @ face22b1
......@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.CarrierInfo;
* 载体信息Service接口
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
public interface ICarrierInfoService
{
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IDevelopmentIndustrialLandInfoService.java
View file @ face22b1
......@@ -4,57 +4,57 @@ import java.util.List;
import com.ruoyi.system.domain.DevelopmentIndustrialLandInfo;
/**
* 开发区产业用地信息Service接口
* 土地信息Service接口
*
* @author ruoyi
* @date 2023-10-07
* @date 2023-12-07
*/
public interface IDevelopmentIndustrialLandInfoService
{
/**
* 查询开发区产业用地信息
* 查询土地信息
*
* @param id 开发区产业用地信息主键
* @return 开发区产业用地信息
* @param id 土地信息主键
* @return 土地信息
*/
public DevelopmentIndustrialLandInfo selectDevelopmentIndustrialLandInfoById(Long id);
/**
* 查询开发区产业用地信息列表
* 查询土地信息列表
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @return 开发区产业用地信息集合
* @param developmentIndustrialLandInfo 土地信息
* @return 土地信息集合
*/
public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 新增开发区产业用地信息
* 新增土地信息
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @param developmentIndustrialLandInfo 土地信息
* @return 结果
*/
public int insertDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 修改开发区产业用地信息
* 修改土地信息
*
* @param developmentIndustrialLandInfo 开发区产业用地信息
* @param developmentIndustrialLandInfo 土地信息
* @return 结果
*/
public int updateDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/**
* 批量删除开发区产业用地信息
* 批量删除土地信息
*
* @param ids 需要删除的开发区产业用地信息主键集合
* @param ids 需要删除的土地信息主键集合
* @return 结果
*/
public int deleteDevelopmentIndustrialLandInfoByIds(String ids);
/**
* 删除开发区产业用地信息信息
* 删除土地信息信息
*
* @param id 开发区产业用地信息主键
* @param id 土地信息主键
* @return 结果
*/
public int deleteDevelopmentIndustrialLandInfoById(Long id);
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java
View file @ face22b1
......@@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert;
* 载体信息Service业务层处理
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
@Service
public class CarrierInfoServiceImpl implements ICarrierInfoService
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentIndustrialLandInfoServiceImpl.java
View file @ face22b1
package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.DevelopmentIndustrialLandInfoMapper;
......@@ -12,7 +13,7 @@ import com.ruoyi.common.core.text.Convert;
* 土地信息Service业务层处理
*
* @author ruoyi
* @date 2023-11-15
* @date 2023-12-07
*/
@Service
public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentIndustrialLandInfoService
......@@ -53,6 +54,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
@Override
public int insertDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
{
developmentIndustrialLandInfo.setCreateTime(DateUtils.getNowDate());
return developmentIndustrialLandInfoMapper.insertDevelopmentIndustrialLandInfo(developmentIndustrialLandInfo);
}
......@@ -65,6 +67,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
@Override
public int updateDevelopmentIndustrialLandInfo(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
{
developmentIndustrialLandInfo.setUpdateTime(DateUtils.getNowDate());
return developmentIndustrialLandInfoMapper.updateDevelopmentIndustrialLandInfo(developmentIndustrialLandInfo);
}
......
ruoyi-system/src/main/resources/mapper/carrier/CarrierInfoMapper.xml
View file @ face22b1
......@@ -32,10 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="distance" column="distance" />
<result property="elevatorType" column="elevator_type" />
<result property="fireResistant" column="fire_resistant" />
<result property="imgUrl" column="img_url" />
<result property="weight" column="weight" />
</resultMap>
<sql id="selectCarrierInfoVo">
select id, create_time, update_time, group_id, group_name, zone_id, zone_name, park_id, park_name, building_number, structure, type, area, fire_protection_level, has_crown_block, crown_block_high, water, electricity, gas, heating, wenjuanxingid, floor_number, floor_high, single_area, distance, elevator_type, fire_resistant from carrier_info
select id, create_time, update_time, group_id, group_name, zone_id, zone_name, park_id, park_name, building_number, structure, type, area, fire_protection_level, has_crown_block, crown_block_high, water, electricity, gas, heating, wenjuanxingid, floor_number, floor_high, single_area, distance, elevator_type, fire_resistant, img_url, weight from carrier_info
</sql>
<select id="selectCarrierInfoList" parameterType="CarrierInfo" resultMap="CarrierInfoResult">
......@@ -65,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null "> and distance = #{distance}</if>
<if test="elevatorType != null and elevatorType != ''"> and elevator_type = #{elevatorType}</if>
<if test="fireResistant != null and fireResistant != ''"> and fire_resistant = #{fireResistant}</if>
<if test="imgUrl != null and imgUrl != ''"> and img_url = #{imgUrl}</if>
<if test="weight != null "> and weight = #{weight}</if>
</where>
</select>
......@@ -102,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">distance,</if>
<if test="elevatorType != null">elevator_type,</if>
<if test="fireResistant != null">fire_resistant,</if>
<if test="imgUrl != null">img_url,</if>
<if test="weight != null">weight,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="createTime != null">#{createTime},</if>
......@@ -130,6 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">#{distance},</if>
<if test="elevatorType != null">#{elevatorType},</if>
<if test="fireResistant != null">#{fireResistant},</if>
<if test="imgUrl != null">#{imgUrl},</if>
<if test="weight != null">#{weight},</if>
</trim>
</insert>
......@@ -162,6 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">distance = #{distance},</if>
<if test="elevatorType != null">elevator_type = #{elevatorType},</if>
<if test="fireResistant != null">fire_resistant = #{fireResistant},</if>
<if test="imgUrl != null">img_url = #{imgUrl},</if>
<if test="weight != null">weight = #{weight},</if>
</trim>
where id = #{id}
</update>
......
ruoyi-system/src/main/resources/mapper/developmentInfo/DevelopmentIndustrialLandInfoMapper.xml → ruoyi-system/src/main/resources/mapper/land/DevelopmentIndustrialLandInfoMapper.xml
View file @ face22b1
......@@ -16,10 +16,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="contacterName" column="contacter_name" />
<result property="contacterPhone" column="contacter_phone" />
<result property="price" column="price" />
<result property="imgUrl" column="img_url" />
<result property="ratio" column="ratio" />
<result property="landDeed" column="land_deed" />
<result property="ageLimit" column="age_limit" />
<result property="developLevel" column="develop_level" />
<result property="shellState" column="shell_state" />
<result property="holderType" column="holder_type" />
<result property="totalInvestment" column="total_investment" />
<result property="outputValue" column="output_value" />
<result property="investNum" column="invest_num" />
<result property="taxRevenue" column="tax_revenue" />
<result property="constructionCycle" column="construction_cycle" />
<result property="energyRequire" column="energy_require" />
<result property="version" column="version" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectDevelopmentIndustrialLandInfoVo">
select id, name, address, area, type, land_status, development_id, industry_direction, contacter_name, contacter_phone, price from development_industrial_land_info
select id, name, address, area, type, land_status, development_id, industry_direction, contacter_name, contacter_phone, price, img_url, ratio, land_deed, age_limit, develop_level, shell_state, holder_type, total_investment, output_value, invest_num, tax_revenue, construction_cycle, energy_require, version, create_by, create_time, update_by, update_time from development_industrial_land_info
</sql>
<select id="selectDevelopmentIndustrialLandInfoList" parameterType="DevelopmentIndustrialLandInfo" resultMap="DevelopmentIndustrialLandInfoResult">
......@@ -35,6 +53,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contacterName != null and contacterName != ''"> and contacter_name like concat('%', #{contacterName}, '%')</if>
<if test="contacterPhone != null and contacterPhone != ''"> and contacter_phone = #{contacterPhone}</if>
<if test="price != null "> and price = #{price}</if>
<if test="imgUrl != null and imgUrl != ''"> and img_url = #{imgUrl}</if>
<if test="ratio != null and ratio != ''"> and ratio = #{ratio}</if>
<if test="landDeed != null and landDeed != ''"> and land_deed = #{landDeed}</if>
<if test="ageLimit != null and ageLimit != ''"> and age_limit = #{ageLimit}</if>
<if test="developLevel != null and developLevel != ''"> and develop_level = #{developLevel}</if>
<if test="shellState != null and shellState != ''"> and shell_state = #{shellState}</if>
<if test="holderType != null and holderType != ''"> and holder_type = #{holderType}</if>
<if test="totalInvestment != null and totalInvestment != ''"> and total_investment = #{totalInvestment}</if>
<if test="outputValue != null and outputValue != ''"> and output_value = #{outputValue}</if>
<if test="investNum != null "> and invest_num = #{investNum}</if>
<if test="taxRevenue != null and taxRevenue != ''"> and tax_revenue = #{taxRevenue}</if>
<if test="constructionCycle != null and constructionCycle != ''"> and construction_cycle = #{constructionCycle}</if>
<if test="energyRequire != null and energyRequire != ''"> and energy_require = #{energyRequire}</if>
<if test="version != null "> and version = #{version}</if>
</where>
</select>
......@@ -56,6 +88,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contacterName != null">contacter_name,</if>
<if test="contacterPhone != null">contacter_phone,</if>
<if test="price != null">price,</if>
<if test="imgUrl != null">img_url,</if>
<if test="ratio != null">ratio,</if>
<if test="landDeed != null">land_deed,</if>
<if test="ageLimit != null">age_limit,</if>
<if test="developLevel != null">develop_level,</if>
<if test="shellState != null">shell_state,</if>
<if test="holderType != null">holder_type,</if>
<if test="totalInvestment != null">total_investment,</if>
<if test="outputValue != null">output_value,</if>
<if test="investNum != null">invest_num,</if>
<if test="taxRevenue != null">tax_revenue,</if>
<if test="constructionCycle != null">construction_cycle,</if>
<if test="energyRequire != null">energy_require,</if>
<if test="version != null">version,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
......@@ -68,6 +118,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contacterName != null">#{contacterName},</if>
<if test="contacterPhone != null">#{contacterPhone},</if>
<if test="price != null">#{price},</if>
<if test="imgUrl != null">#{imgUrl},</if>
<if test="ratio != null">#{ratio},</if>
<if test="landDeed != null">#{landDeed},</if>
<if test="ageLimit != null">#{ageLimit},</if>
<if test="developLevel != null">#{developLevel},</if>
<if test="shellState != null">#{shellState},</if>
<if test="holderType != null">#{holderType},</if>
<if test="totalInvestment != null">#{totalInvestment},</if>
<if test="outputValue != null">#{outputValue},</if>
<if test="investNum != null">#{investNum},</if>
<if test="taxRevenue != null">#{taxRevenue},</if>
<if test="constructionCycle != null">#{constructionCycle},</if>
<if test="energyRequire != null">#{energyRequire},</if>
<if test="version != null">#{version},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
......@@ -84,6 +152,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contacterName != null">contacter_name = #{contacterName},</if>
<if test="contacterPhone != null">contacter_phone = #{contacterPhone},</if>
<if test="price != null">price = #{price},</if>
<if test="imgUrl != null">img_url = #{imgUrl},</if>
<if test="ratio != null">ratio = #{ratio},</if>
<if test="landDeed != null">land_deed = #{landDeed},</if>
<if test="ageLimit != null">age_limit = #{ageLimit},</if>
<if test="developLevel != null">develop_level = #{developLevel},</if>
<if test="shellState != null">shell_state = #{shellState},</if>
<if test="holderType != null">holder_type = #{holderType},</if>
<if test="totalInvestment != null">total_investment = #{totalInvestment},</if>
<if test="outputValue != null">output_value = #{outputValue},</if>
<if test="investNum != null">invest_num = #{investNum},</if>
<if test="taxRevenue != null">tax_revenue = #{taxRevenue},</if>
<if test="constructionCycle != null">construction_cycle = #{constructionCycle},</if>
<if test="energyRequire != null">energy_require = #{energyRequire},</if>
<if test="version != null">version = #{version},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
......
ruoyi-system/src/main/resources/templates/carousel/info/add.html
View file @ face22b1
......@@ -32,7 +32,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">类别：</label>
<label class="col-sm-3 control-label">资源类型：</label>
<div class="col-sm-8">
<select id="urlType" name="urlType" class="form-control m-b" th:with="type=${@dict.getType('sys_carousel_urltype')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
......
ruoyi-system/src/main/resources/templates/carousel/info/edit.html
View file @ face22b1
......@@ -33,7 +33,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">类型：</label>
<label class="col-sm-3 control-label">资源类型：</label>
<div class="col-sm-8">
<select id="urlType" name="urlType" class="form-control m-b" th:with="type=${@dict.getType('sys_carousel_urltype')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{urlType}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
......
ruoyi-system/src/main/resources/templates/carrier/info/add.html
View file @ face22b1
......@@ -2,6 +2,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增载体信息')" />
<th:block th:include="include :: bootstrap-fileinput-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
......@@ -138,9 +139,25 @@
<input name="fireResistant" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">图片信息：</label>
<div class="col-sm-8">
<input type="hidden" name="imgUrl" >
<div class="file-loading">
<input class="form-control img-upload" id="imgUrl" name="file" type="file">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">承重：</label>
<div class="col-sm-8">
<input name="weight" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-fileinput-js"/>
<script th:inline="javascript">
var prefix = ctx + "carrier/info"
$("#form-info-add").validate({
......@@ -152,6 +169,22 @@
$.operate.save(prefix + "/add", $('#form-info-add').serialize());
}
}
$(".img-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({
// 'uploadUrl': ctx + 'common/upload',
'uploadUrl': ctx + 'sysFile/uploadImgHuawei',
initialPreviewAsData: true,
initialPreview: [val],
maxFileCount: 1,
autoReplace: true
}).on('fileuploaded', function (event, data, previewId, index) {
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
$(this).fileinput('_initFileActions');
});
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/carrier/info/info.html
View file @ face22b1
......@@ -10,29 +10,17 @@
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>所属集团id(1-产业新城；2-幸福产城)：</label>
<input type="text" name="groupId"/>
</li>
<li>
<label>所属集团：</label>
<input type="text" name="groupName"/>
</li>
<li>
<label>所属片区id：</label>
<input type="text" name="zoneId"/>
</li>
<li>
<label>所属片区：</label>
<input type="text" name="zoneName"/>
</li>
<li>
<li style="display: none">
<label>所属园区id：</label>
<input type="text" name="parkId"/>
</li>
<!-- <li>-->
<!-- <label>所属园区名称：</label>-->
<!-- <input type="text" name="parkName"/>-->
<!-- </li>-->
<li>
<label>所属园区名称：</label>
<input type="text" name="parkName"/>
<label>所属园区：</label>
<input type="text" id="parkName" name="parkName" onclick="selectType()">
</li>
<li>
<label>楼号：</label>
......@@ -42,62 +30,6 @@
<label>结构形式：</label>
<input type="text" name="structure"/>
</li>
<li>
<label>单栋面积：</label>
<input type="text" name="area"/>
</li>
<li>
<label>消防等级：</label>
<input type="text" name="fireProtectionLevel"/>
</li>
<li>
<label>是否安装天车：</label>
<input type="text" name="hasCrownBlock"/>
</li>
<li>
<label>天车-安装高度：</label>
<input type="text" name="crownBlockHigh"/>
</li>
<li>
<label>供水参数：</label>
<input type="text" name="water"/>
</li>
<li>
<label>供电参数：</label>
<input type="text" name="electricity"/>
</li>
<li>
<label>供气参数：</label>
<input type="text" name="gas"/>
</li>
<li>
<label>供暖参数：</label>
<input type="text" name="heating"/>
</li>
<li>
<label>问卷星id：</label>
<input type="text" name="wenjuanxingid"/>
</li>
<li>
<label>层数：</label>
<input type="text" name="floorNumber"/>
</li>
<li>
<label>层高(m)：</label>
<input type="text" name="floorHigh"/>
</li>
<li>
<label>单层面积：</label>
<input type="text" name="singleArea"/>
</li>
<li>
<label>柱距：</label>
<input type="text" name="distance"/>
</li>
<li>
<label>耐火等级：</label>
<input type="text" name="fireResistant"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
......@@ -148,22 +80,6 @@
title: '主键id',
visible: false
},
{
field: 'groupId',
title: '所属集团id(1-产业新城；2-幸福产城)'
},
{
field: 'groupName',
title: '所属集团'
},
{
field: 'zoneId',
title: '所属片区id'
},
{
field: 'zoneName',
title: '所属片区'
},
{
field: 'parkId',
title: '所属园区id'
......@@ -182,68 +98,17 @@
},
{
field: 'type',
title: '产品类型'
title: '载体类型'
},
{
field: 'area',
title: '单栋面积'
},
{
field: 'fireProtectionLevel',
title: '消防等级'
},
{
field: 'hasCrownBlock',
title: '是否安装天车'
},
{
field: 'crownBlockHigh',
title: '天车-安装高度'
},
{
field: 'water',
title: '供水参数'
},
{
field: 'electricity',
title: '供电参数'
},
{
field: 'gas',
title: '供气参数'
title: '建筑面积'
},
{
field: 'heating',
title: '供暖参数'
},
{
field: 'wenjuanxingid',
title: '问卷星id'
},
{
field: 'floorNumber',
title: '层数'
},
{
field: 'floorHigh',
title: '层高(m)'
},
{
field: 'singleArea',
title: '单层面积'
},
{
field: 'distance',
title: '柱距'
},
{
field: 'elevatorType',
title: '电梯类型'
},
{
field: 'fireResistant',
title: '耐火等级'
field: 'imgUrl',
title: '图片信息'
},
{
title: '操作',
align: 'center',
......@@ -257,6 +122,26 @@
};
$.table.init(options);
});
function selectType(){
var options = {
title: '选择',
url: "carousel/info" + "/selectType?type=2",
callBack: doSubmit2
};
$.modal.openOptions(options);
}
function doSubmit2(index, layero){
var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
$('#parkName').val(rows.name);
$('#parkId').val(rows.id);
$.modal.close(index);
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/developmentInfo/industrialLand/add.html deleted 100644 → 0
View file @ cb0e068d
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增开发区产业用地信息')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-industrialLand-add">
<div class="form-group">
<label class="col-sm-3 control-label">地块名称：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">位置信息：</label>
<div class="col-sm-8">
<input name="address" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">面积：</label>
<div class="col-sm-8">
<input name="area" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属片区：</label>
<div class="col-sm-8">
<input name="developmentId" class="form-control" type="text" required>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "developmentInfo/industrialLand"
$("#form-industrialLand-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-industrialLand-add').serialize());
}
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/developmentInfo/industrialLand/edit.html deleted 100644 → 0
View file @ cb0e068d
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改开发区产业用地信息')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-industrialLand-edit" th:object="${developmentIndustrialLandInfo}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">地块名称：</label>
<div class="col-sm-8">
<input name="name" th:field="*{name}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">位置信息：</label>
<div class="col-sm-8">
<input name="address" th:field="*{address}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">面积：</label>
<div class="col-sm-8">
<input name="area" th:field="*{area}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属片区：</label>
<div class="col-sm-8">
<input name="developmentId" th:field="*{developmentId}" class="form-control" type="text" required>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "developmentInfo/industrialLand";
$("#form-industrialLand-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-industrialLand-edit').serialize());
}
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html
View file @ face22b1
......@@ -582,7 +582,7 @@
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-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> ');
......
ruoyi-system/src/main/resources/templates/land/info/add.html 0 → 100644
View file @ face22b1
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增土地信息')" />
<th:block th:include="include :: bootstrap-fileinput-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-info-add">
<div class="form-group">
<label class="col-sm-3 control-label">地块名称：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">位置信息：</label>
<div class="col-sm-8">
<input name="address" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">地块面积：</label>
<div class="col-sm-8">
<input name="area" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">开发区id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="developmentId" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">土地类型：</label>
<div class="col-sm-8">
<input name="type" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">土地现状：</label>
<div class="col-sm-8">
<input name="landStatus" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">产业方向：</label>
<div class="col-sm-8">
<input name="industryDirection" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">招商联系人：</label>
<div class="col-sm-8">
<input name="contacterName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系方式：</label>
<div class="col-sm-8">
<input name="contacterPhone" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">价格：</label>
<div class="col-sm-8">
<input name="price" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">图片信息：</label>
<div class="col-sm-8">
<input type="hidden" name="imgUrl" >
<div class="file-loading">
<input class="form-control img-upload" id="imgUrl" name="file" type="file">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">容积率：</label>
<div class="col-sm-8">
<input name="ratio" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">土地证价格：</label>
<div class="col-sm-8">
<input name="landDeed" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出让年限：</label>
<div class="col-sm-8">
<input name="ageLimit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开发程度：</label>
<div class="col-sm-8">
<input name="developLevel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出让状态：</label>
<div class="col-sm-8">
<input name="shellState" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">总投资额：</label>
<div class="col-sm-8">
<input name="totalInvestment" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均年产值：</label>
<div class="col-sm-8">
<input name="outputValue" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均投资强度：</label>
<div class="col-sm-8">
<input name="investNum" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均税收：</label>
<div class="col-sm-8">
<input name="taxRevenue" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">建设周期：</label>
<div class="col-sm-8">
<input name="constructionCycle" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">能评要求：</label>
<div class="col-sm-8">
<input name="energyRequire" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">乐观锁：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="version" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-fileinput-js"/>
<script th:inline="javascript">
var prefix = ctx + "land/info"
$("#form-info-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-info-add').serialize());
}
}
$(".img-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({
// 'uploadUrl': ctx + 'common/upload',
'uploadUrl': ctx + 'sysFile/uploadImgHuawei',
initialPreviewAsData: true,
initialPreview: [val],
maxFileCount: 1,
autoReplace: true
}).on('fileuploaded', function (event, data, previewId, index) {
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
$(this).fileinput('_initFileActions');
});
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/land/info/edit.html 0 → 100644
View file @ face22b1
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改土地信息')" />
<th:block th:include="include :: bootstrap-fileinput-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-info-edit" th:object="${developmentIndustrialLandInfo}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">地块名称：</label>
<div class="col-sm-8">
<input name="name" th:field="*{name}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">位置信息：</label>
<div class="col-sm-8">
<input name="address" th:field="*{address}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">建筑面积：</label>
<div class="col-sm-8">
<input name="area" th:field="*{area}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">开发区id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="developmentId" th:field="*{developmentId}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">土地类型：</label>
<div class="col-sm-8">
<input name="type" th:field="*{type}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">土地现状：</label>
<div class="col-sm-8">
<input name="landStatus" th:field="*{landStatus}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">产业方向：</label>
<div class="col-sm-8">
<input name="industryDirection" th:field="*{industryDirection}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">招商联系人：</label>
<div class="col-sm-8">
<input name="contacterName" th:field="*{contacterName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系方式：</label>
<div class="col-sm-8">
<input name="contacterPhone" th:field="*{contacterPhone}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">价格：</label>
<div class="col-sm-8">
<input name="price" th:field="*{price}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">图片信息：</label>
<div class="col-sm-8">
<input type="hidden" name="imgUrl" th:field="*{imgUrl}">
<div class="file-loading">
<input class="form-control img-upload" id="imgUrl" name="file" type="file">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">容积率：</label>
<div class="col-sm-8">
<input name="ratio" th:field="*{ratio}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">土地证价格：</label>
<div class="col-sm-8">
<input name="landDeed" th:field="*{landDeed}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出让年限：</label>
<div class="col-sm-8">
<input name="ageLimit" th:field="*{ageLimit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开发程度：</label>
<div class="col-sm-8">
<input name="developLevel" th:field="*{developLevel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出让状态：</label>
<div class="col-sm-8">
<input name="shellState" th:field="*{shellState}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">总投资额：</label>
<div class="col-sm-8">
<input name="totalInvestment" th:field="*{totalInvestment}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均年产值：</label>
<div class="col-sm-8">
<input name="outputValue" th:field="*{outputValue}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均投资强度：</label>
<div class="col-sm-8">
<input name="investNum" th:field="*{investNum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">亩均税收：</label>
<div class="col-sm-8">
<input name="taxRevenue" th:field="*{taxRevenue}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">建设周期：</label>
<div class="col-sm-8">
<input name="constructionCycle" th:field="*{constructionCycle}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">能评要求：</label>
<div class="col-sm-8">
<input name="energyRequire" th:field="*{energyRequire}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">乐观锁：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="version" th:field="*{version}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-fileinput-js"/>
<script th:inline="javascript">
var prefix = ctx + "land/info";
$("#form-info-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
}
}
$(".img-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({
// 'uploadUrl': ctx + 'common/upload',
'uploadUrl': ctx + 'sysFile/uploadImgHuawei',
initialPreviewAsData: true,
initialPreview: [val],
maxFileCount: 1,
autoReplace: true
}).on('fileuploaded', function (event, data, previewId, index) {
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
$(this).fileinput('_initFileActions');
});
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/developmentInfo/industrialLand/industrialLand.html → ruoyi-system/src/main/resources/templates/land/info/info.html
View file @ face22b1
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('开发区产业用地信息列表')" />
<th:block th:include="include :: header('土地信息列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
......@@ -10,21 +10,17 @@
<form id="formId">
<div class="select-list">
<ul>
<!-- <li>-->
<!-- <label>地块名称：</label>-->
<!-- <input type="text" name="name"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>位置信息：</label>-->
<!-- <input type="text" name="address"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>面积：</label>-->
<!-- <input type="text" name="area"/>-->
<!-- </li>-->
<li style="display: none">
<label>所属开发区id：</label>
<input type="text" id="developmentId" name="developmentId" />
</li>
<li>
<label>所属开发区：</label>
<input type="text" id="developmentName" name="developmentName" onclick="selectType()"/>
</li>
<li>
<label>所属片区id：</label>
<input type="text" name="developmentId" readonly="readonly" th:value="${developmentId}"/>
<label>地块名称：</label>
<input type="text" name="name"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -36,16 +32,16 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="developmentInfo:industrialLand:add">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="land:info:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="developmentInfo:industrialLand:edit">
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="land:info:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="developmentInfo:industrialLand:remove">
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="land:info:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="developmentInfo:industrialLand:export">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="land:info:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
......@@ -56,9 +52,9 @@
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('developmentInfo:industrialLand:edit')}]];
var removeFlag = [[${@permission.hasPermi('developmentInfo:industrialLand:remove')}]];
var prefix = ctx + "developmentInfo/industrialLand";
var editFlag = [[${@permission.hasPermi('land:info:edit')}]];
var removeFlag = [[${@permission.hasPermi('land:info:remove')}]];
var prefix = ctx + "land/info";
$(function() {
var options = {
......@@ -67,7 +63,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "开发区产业用地信息",
modalName: "土地信息",
columns: [{
checkbox: true
},
......@@ -76,14 +72,14 @@
title: '主键id',
visible: false
},
{
field: 'type',
title: '持有方类别'
},
{
field: 'name',
title: '地块名称'
},
{
field: 'developmentId',
title: '所属开发区id'
},
{
field: 'address',
title: '位置信息'
......@@ -92,13 +88,21 @@
field: 'area',
title: '面积'
},
{
field: 'type',
title: '土地类型'
},
{
field: 'landStatus',
title: '土地现状'
},
{
field: 'developmentId',
title: '所属片区'
field: 'shellState',
title: '出让状态'
},
{
field: 'holderType',
title: '持有方类别'
},
{
title: '操作',
......@@ -113,6 +117,25 @@
};
$.table.init(options);
});
function selectType(){
var options = {
title: '选择',
url: "carousel/info" + "/selectType?type=1",
callBack: doSubmit2
};
$.modal.openOptions(options);
}
function doSubmit2(index, layero){
var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
$('#developmentName').val(rows.name);
$('#developmentId').val(rows.id);
$.modal.close(index);
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/parkInfo/info/info.html
View file @ face22b1
......@@ -402,13 +402,11 @@
var actions = [];
let id = row.id;
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'详情信息\',\'/parkInfo/info/detail/' + id + '\')"><i class="fa fa-edit"></i>详情信息</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.operate.edit(\'' + id + '\')"><i class="fa fa-edit"></i>编辑园区详情</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/parkinfo/traffic?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'污水处理能力\',\'/parkinfo/sewage?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑污水处理能力</a> <br>');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'物流资源信息\',\'/parkinfo/resources?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑物流资源信息</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'载体信息\',\'/carrier/info?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑载体</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'载体信息\',\'/carrier/info?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑载体</a> ');
actions.push('<a class="btn btn-defaule btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/parkinfo/investmentdirection?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑招商方向信息</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'政策信息\',\'/parkinfo/policy?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑政策信息</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.operate.remove(\'' + id + '\')"><i class="fa fa-remove"></i>删除</a>');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment