diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java index dedc2ea..5c9a6ec 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.base.domain; import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -132,6 +133,20 @@ public class BmProjectLot { @ApiModelProperty(value = "费用指标") private BigDecimal costIndicators; + /** + * 开工日期 + */ + @ApiModelProperty(value = "开工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String startDate; + /** + /** + * 竣工日期 + */ + @ApiModelProperty(value = "竣工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String completionDate; + @ApiModelProperty(value = "经度") private String longitude; @ApiModelProperty(value = "纬度") diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml index 6205506..56225b3 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml @@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -44,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share, a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.cost_indicators, - a.longitude, a.latitude, a.address, a.province,a.details_address + a.longitude, a.latitude, a.address, a.province,a.details_address,a.completion_date,a.start_date from bm_project_lot a left join sys_dept b on a.dept_id = b.dept_id left join sys_dic c on a.type_id = c.id @@ -123,6 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, company_id, cost_indicators, + start_date, + completion_date, longitude, latitude, address, @@ -144,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{companyId}, #{costIndicators}, + #{startDate}, + #{completionDate}, #{longitude}, #{latitude}, #{address}, @@ -241,6 +247,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, company_id = #{companyId}, cost_indicators = #{costIndicators}, + longitude = #{longitude}, + latitude = #{latitude}, + address = #{address}, + province = #{province}, + details_address = #{detailsAddress} , + completion_date = #{completionDate}, + start_date = #{startDate} , update_time = sysdate() where lot_id = #{lotId}