Merge remote-tracking branch 'origin/master'

highway
zhaoxiaolin 1 year ago
commit c7c00e0d72

@ -88,6 +88,46 @@ public class EquOrderStandard extends BaseEntity {
private String errorFlag;
private String faultType;
private String repairReach;
private BigDecimal repairValue;
private String repairPicture;
public String getRepairPicture() {
return repairPicture;
}
public void setRepairPicture(String repairPicture) {
this.repairPicture = repairPicture;
}
public BigDecimal getRepairValue() {
return repairValue;
}
public void setRepairValue(BigDecimal repairValue) {
this.repairValue = repairValue;
}
public String getRepairReach() {
return repairReach;
}
public void setRepairReach(String repairReach) {
this.repairReach = repairReach;
}
public String getFaultType() {
return faultType;
}
public void setFaultType(String faultType) {
this.faultType = faultType;
}
public String getErrorFlag() {
return errorFlag;
}

@ -28,10 +28,14 @@
<result property="updateTime" column="update_time" />
<result property="picturePath" column="picture_path" />
<result property="errorFlag" column="error_flag" />
<result property="faultType" column="fault_type" />
<result property="repairReach" column="repair_reach" />
<result property="repairValue" column="repair_value" />
<result property="repairPicture" column="repair_picture" />
</resultMap>
<sql id="selectEquOrderStandardVo">
select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path,error_flag from equ_order_standard
select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path,error_flag,fault_type,repair_reach,repair_value,repair_picture from equ_order_standard
</sql>
<select id="selectEquOrderStandardList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
@ -54,6 +58,10 @@
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="picturePath != null and picturePath != ''"> and picture_path = #{picturePath}</if>
<if test="errorFlag != null and errorFlag != ''"> and error_flag = #{errorFlag}</if>
<if test="faultType != null and faultType != ''"> and fault_type = #{faultType}</if>
<if test="repairReach != null and repairReach != ''"> and repair_reach = #{repairReach}</if>
<if test="repairValue != null and repairValue != ''"> and repair_value = #{repairValue}</if>
<if test="repairPicture != null and repairPicture != ''"> and repair_picture = #{repairPicture}</if>
</where>
</select>
@ -93,6 +101,10 @@
<if test="updateTime != null">update_time,</if>
<if test="picturePath != null">picture_path,</if>
<if test="errorFlag != null">error_flag,</if>
<if test="faultType != null">fault_type,</if>
<if test="repairReach != null">repair_reach,</if>
<if test="repairValue != null">repair_value,</if>
<if test="repairPicture != null">repair_picture,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -118,6 +130,10 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="picturePath != null">#{picturePath},</if>
<if test="errorFlag != null">#{errorFlag},</if>
<if test="faultType != null">#{faultType},</if>
<if test="repairReach != null">#{repairReach},</if>
<if test="repairValue != null">#{repairValue},</if>
<if test="repairPicture != null">#{repairPicture},</if>
</trim>
</insert>
@ -162,6 +178,10 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="picturePath != null">picture_path = #{picturePath},</if>
<if test="errorFlag != null">error_flag = #{errorFlag},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="repairReach != null">repair_reach = #{repairReach},</if>
<if test="repairValue != null">repair_value = #{repairValue},</if>
<if test="repairPicture != null">repair_picture = #{repairPicture},</if>
</trim>
where id = #{id}
</update>

Loading…
Cancel
Save