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 11:21:09 +08:00
parent 32dfc0b0de
commit 4873995fc8
2 changed files with 9 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

@ -102,6 +102,10 @@ public class DevInfo extends BaseEntity
@Excel(name = "订金")
private BigDecimal deposit;
/** 是否删除 */
@Excel(name = "是否配备机手")
private String isOperator;
/** 是否删除 */
@Excel(name = "是否删除")
private String isActive;

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

@ -26,13 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="creator" column="creator" />
<result property="deposit" column="deposit" />
<result property="isOperator" column="is_operator" />
<result property="isActive" column="is_active" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
</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_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, 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">
@ -118,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="creator != null">creator,</if>
<if test="deposit != null">deposit,</if>
<if test="isOperator != null">is_operator,</if>
<if test="isActive != null">is_active,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
@ -145,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="creator != null">#{creator},</if>
<if test="deposit != null">#{deposit},</if>
<if test="isOperator != null">#{isOperator},</if>
<if test="isActive != null">#{isActive},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@ -175,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="deposit != null">deposit = #{deposit},</if>
<if test="isOperator != null">is_active = #{isOperator},</if>
<if test="isActive != null">is_active = #{isActive},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>