Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理-检查项维护(工厂factory->factoryCode)

Browse Source
highway
wws 1 year ago
parent 59ed4122cb
commit 54c39cb2b8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

10
op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class EquCheckItem extends BaseEntity {
/** 工厂 */
@Excel(name = "工厂")
private String factory;
private String factoryCode;
/** 备用字段1 */
@Excel(name = "备用字段1")
@ -198,12 +198,12 @@ public class EquCheckItem extends BaseEntity {
public String getItemRemark() {
return itemRemark;
}
public void setFactory(String factory) {
this.factory = factory;
public void setFactory(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactory() {
return factory;
return factoryCode;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
@ -272,7 +272,7 @@ public class EquCheckItem extends BaseEntity {
.append("itemType", getItemType())
.append("itemTypeName", getItemTypeName())
.append("itemRemark", getItemRemark())
.append("factory", getFactory())
.append("factoryCode", getFactory())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())

12
op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
Unescape Escape View File

@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemType" column="item_type" />
<result property="itemTypeName" column="item_type_name" />
<result property="itemRemark" column="item_remark" />
<result property="factory" column="factory" />
<result property="factoryCode" column="factoryCode" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEquCheckItemVo">
select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory, attr1, attr2, attr3, del_flag, created_time, created_by, updated_time, updated_by from equ_check_item
select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, created_time, created_by, updated_time, updated_by from equ_check_item
</sql>
<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemType != null and itemType != ''"> and item_type = #{itemType}</if>
<if test="itemTypeName != null and itemTypeName != ''"> and item_type_name like concat('%', #{itemTypeName}, '%')</if>
<if test="itemRemark != null and itemRemark != ''"> and item_remark = #{itemRemark}</if>
<if test="factory != null and factory != ''"> and factory = #{factory}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemType != null and itemType != ''">item_type,</if>
<if test="itemTypeName != null and itemTypeName != ''">item_type_name,</if>
<if test="itemRemark != null and itemRemark != ''">item_remark,</if>
<if test="factory != null">factory,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemType != null and itemType != ''">#{itemType},</if>
<if test="itemTypeName != null and itemTypeName != ''">#{itemTypeName},</if>
<if test="itemRemark != null and itemRemark != ''">#{itemRemark},</if>
<if test="factory != null">#{factory},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemType != null and itemType != ''">item_type = #{itemType},</if>
<if test="itemTypeName != null and itemTypeName != ''">item_type_name = #{itemTypeName},</if>
<if test="itemRemark != null and itemRemark != ''">item_remark = #{itemRemark},</if>
<if test="factory != null">factory = #{factory},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>

Write Preview
Loading…
Cancel
Save