工程管理

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 = "纬度")

sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml

@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="latitude"    column="latitude"    />
         <result property="longitude"    column="longitude"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="completionDate"    column="completion_date"    />
     </resultMap>
 
     <sql id="bmProjectInfo">
@@ -44,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--<include refid="bmProjectInfo"/>-->
         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"
             <if test="remark != null and remark != ''">remark,</if>
             <if test="companyId != null and companyId != ''">company_id,</if>
             <if test="costIndicators != null and costIndicators != ''">cost_indicators,</if>
+            <if test="startDate != null and startDate != ''">start_date,</if>
+            <if test="completionDate != null and completionDate != ''">completion_date,</if>
             <if test="longitude != null and longitude != ''">longitude,</if>
             <if test="latitude != null and latitude != ''">latitude,</if>
             <if test="address != null and address != ''">address,</if>
@@ -144,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="costIndicators != null and costIndicators != ''">#{costIndicators},</if>
+            <if test="startDate != null and startDate != ''">#{startDate},</if>
+            <if test="completionDate != null and completionDate != ''">#{completionDate},</if>
             <if test="longitude != null and longitude != ''">#{longitude},</if>
             <if test="latitude != null and latitude != ''">#{latitude},</if>
             <if test="address != null and address != ''">#{address},</if>
@@ -241,6 +247,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
             <if test="costIndicators != null and costIndicators != ''">cost_indicators = #{costIndicators},</if>
+            <if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
+            <if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="province != null and province != ''">province = #{province},</if>
+            <if test="detailsAddress != null and detailsAddress != ''">details_address  = #{detailsAddress} ,</if>
+            <if test="completionDate != null and completionDate != ''">completion_date = #{completionDate},</if>
+            <if test="startDate != null and startDate != ''">start_date  = #{startDate} ,</if>
             update_time = sysdate()
         </set>
         where lot_id = #{lotId}