bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-05 14:21:48 +08:00
parent 3ace077b37
commit 84ff331b66
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/DevInfo.java
View File

@ -98,6 +98,10 @@ public class DevInfo extends BaseEntity
@Excel(name = "创建人")
private Long creator;
/** 设备规格 */
@Excel(name = "设备规格")
private String specification;
/** 订金 */
@Excel(name = "订金")
private BigDecimal deposit;

19
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ownCo" column="own_co" />
<result property="createTime" column="create_time" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="specification" column="specification" />
<result property="deposit" column="deposit" />
<result property="isOperator" column="is_operator" />
<result property="isActive" column="is_active" />
@ -33,7 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDevInfoVo">
select ma_id, code, type_id, ma_status, lease_scope, location, brand, model_name, production_date, working_hours, serial_number, month_lease_price, day_lease_price, pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, creator, deposit, is_operator, is_active, update_time, update_by from ma_dev_info
select ma_id, code, type_id, ma_status, lease_scope, location, brand, model_name, production_date, working_hours, serial_number,
month_lease_price, day_lease_price, pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time,
creator, update_time, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info
</sql>
<select id="selectDevInfoList" parameterType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
@ -64,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="gpsCode != null and gpsCode != ''"> and d.gps_code = #{gpsCode}</if>
<if test="ownCo != null "> and d.own_co = #{ownCo}</if>
<if test="creator != null "> and d.creator = #{creator}</if>
<if test="updateBy != null "> and d.update_by = #{updateBy}</if>
<if test="specification != null "> and d.specification = #{specification}</if>
<if test="deposit != null "> and d.deposit = #{deposit}</if>
<if test="isActive != null and isActive != ''"> and d.is_active = #{isActive}</if>
<if test="keyWord != null and keyWord != ''">
@ -72,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or locate(#{companyName},c.company_name) > 0
or locate(#{maId},d.ma_id) > 0
or locate(#{modelName},d.model_name) > 0
or locate(#{specification},d.specification) > 0
or locate(#{serialNumber},d.serial_number) > 0
or locate(#{description},d.description) > 0
)
@ -127,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ownCo != null">own_co,</if>
<if test="createTime != null">create_time,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="specification != null">specification,</if>
<if test="deposit != null">deposit,</if>
<if test="isOperator != null">is_operator,</if>
<if test="isActive != null">is_active,</if>
@ -155,6 +166,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ownCo != null">#{ownCo},</if>
<if test="createTime != null">#{createTime},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{update_time},</if>
<if test="updateBy != null">#{update_by},</if>
<if test="specification != null">#{specification},</if>
<if test="deposit != null">#{deposit},</if>
<if test="isOperator != null">#{isOperator},</if>
<if test="isActive != null">#{isActive},</if>
@ -186,6 +200,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ownCo != null">own_co = #{ownCo},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="deposit != null">deposit = #{deposit},</if>
<if test="isOperator != null">is_active = #{isOperator},</if>
<if test="isActive != null">is_active = #{isActive},</if>