Compare commits

..

No commits in common. "51452ce3a3bdd7698d9a440baafb39962d6b8e5c" and "99627bab6fdda319ee4da779b3f545c1af761e16" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -149,8 +149,6 @@ public class BmProjectLot {
private String address; private String address;
@ApiModelProperty(value = "省份") @ApiModelProperty(value = "省份")
private String province; private String province;
@ApiModelProperty(value = "省份后地址")
private String detailsAddress;
/** 导出选中列表 */ /** 导出选中列表 */
private List<Long> dataCondition; private List<Long> dataCondition;

View File

@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--<include refid="bmProjectInfo"/>--> <!--<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, 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.start_date,a.completion_date, a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date,
a.longitude,a.latitude,a.address,a.province,a.details_address a.longitude,a.latitude,a.address,a.province
from bm_project_lot a from bm_project_lot a
left join sys_dept b on a.dept_id = b.dept_id left join sys_dept b on a.dept_id = b.dept_id
left join sys_dic c on a.type_id = c.id left join sys_dic c on a.type_id = c.id
@ -122,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null and latitude != ''">latitude,</if> <if test="latitude != null and latitude != ''">latitude,</if>
<if test="address != null and address != ''">address,</if> <if test="address != null and address != ''">address,</if>
<if test="province != null and province != ''">province,</if> <if test="province != null and province != ''">province,</if>
<if test="detailsAddress != null and detailsAddress != ''">details_address,</if>
create_time create_time
)values( )values(
<if test="lotName != null and lotName != ''">#{lotName},</if> <if test="lotName != null and lotName != ''">#{lotName},</if>
@ -144,7 +143,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null and latitude != ''">#{latitude},</if> <if test="latitude != null and latitude != ''">#{latitude},</if>
<if test="address != null and address != ''">#{address},</if> <if test="address != null and address != ''">#{address},</if>
<if test="province != null and province != ''">#{province},</if> <if test="province != null and province != ''">#{province},</if>
<if test="detailsAddress != null and detailsAddress != ''">#{detailsAddress},</if>
sysdate() sysdate()
) )
</insert> </insert>
@ -169,7 +167,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="longitude != null and longitude != ''">longitude = #{longitude},</if> <if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
<if test="latitude != null and latitude != ''">latitude = #{latitude},</if> <if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
<if test="address != null and address != ''">address = #{address},</if> <if test="address != null and address != ''">address = #{address},</if>
<if test="detailsAddress != null and detailsAddress != ''">details_address = #{detailsAddress},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where lot_id = #{lotId} where lot_id = #{lotId}