From 433a307c759489263f8c545aa077a205dca61fc6 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 13 Oct 2023 11:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-=E5=88=9B?= =?UTF-8?q?=E5=BB=BA/=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquCheckItem.java | 60 +++++++++---------- .../op/device/domain/EquCheckItemDetail.java | 48 +++++++-------- .../op/device/domain/EquItemEquipment.java | 48 +++++++-------- .../op/device/domain/dto/EquCheckItemDTO.java | 50 ++++++++-------- .../op/device/domain/vo/EquCheckItemVO.java | 40 ++++++------- .../service/impl/EquCheckItemServiceImpl.java | 52 ++++++++-------- .../device/EquCheckItemDetailMapper.xml | 46 +++++++------- .../mapper/device/EquCheckItemMapper.xml | 50 ++++++++-------- .../mapper/device/EquItemEquipmentMapper.xml | 44 +++++++------- 9 files changed, 219 insertions(+), 219 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java index 897791b3..de557fa7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java @@ -68,23 +68,23 @@ public class EquCheckItem extends BaseEntity { /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date createdTime; + private Date createTime; /** 创建人 */ @Excel(name = "创建人") - private String createdBy; + private String createBy; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date updatedTime; + private Date updateTime; /** 更新人 */ @Excel(name = "更新人") - private String updatedBy; + private String updateBy; // 创建日期范围list - private List createdTimeArray; + private List createTimeArray; // 更新日期范围list private List updateTimeArray; @@ -141,12 +141,12 @@ public class EquCheckItem extends BaseEntity { this.createTimeEnd = createTimeEnd; } - public List getCreatedTimeArray() { - return createdTimeArray; + public List getCreateTimeArray() { + return createTimeArray; } - public void setCreatedTimeArray(List createdTimeArray) { - this.createdTimeArray = createdTimeArray; + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; } public void setItemId(String itemId) { @@ -233,33 +233,33 @@ public class EquCheckItem extends BaseEntity { public String getDelFlag() { return delFlag; } - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public Date getCreatedTime() { - return createdTime; + public Date getCreateTime() { + return createTime; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public String getCreatedBy() { - return createdBy; + public String getCreateBy() { + return createBy; } - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } - public Date getUpdatedTime() { - return updatedTime; + public Date getUpdateTime() { + return updateTime; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() { + return updateBy; } @Override @@ -277,11 +277,11 @@ public class EquCheckItem extends BaseEntity { .append("attr2", getAttr2()) .append("attr3", getAttr3()) .append("delFlag", getDelFlag()) - .append("createdTime", getCreatedTime()) - .append("createdBy", getCreatedBy()) - .append("updatedTime", getUpdatedTime()) - .append("updatedBy", getUpdatedBy()) - .append("createdTimeArray",getCreatedTimeArray()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("createTimeArray",getCreateTimeArray()) .toString(); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java index 9a527c27..09358df4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java @@ -66,20 +66,20 @@ public class EquCheckItemDetail extends BaseEntity { /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date createdTime; + private Date createTime; /** 创建人 */ @Excel(name = "创建人") - private String createdBy; + private String createBy; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date updatedTime; + private Date updateTime; /** 更新人 */ @Excel(name = "更新人") - private String updatedBy; + private String updateBy; /** 详情编码 */ @Excel(name = "详情编码") @@ -177,33 +177,33 @@ public class EquCheckItemDetail extends BaseEntity { public String getDelFlag() { return delFlag; } - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public Date getCreatedTime() { - return createdTime; + public Date getCreateTime() { + return createTime; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public String getCreatedBy() { - return createdBy; + public String getCreateBy() { + return createBy; } - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } - public Date getUpdatedTime() { - return updatedTime; + public Date getUpdateTime() { + return updateTime; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() { + return updateBy; } @Override @@ -221,10 +221,10 @@ public class EquCheckItemDetail extends BaseEntity { .append("attr2", getAttr2()) .append("attr3", getAttr3()) .append("delFlag", getDelFlag()) - .append("createdTime", getCreatedTime()) - .append("createdBy", getCreatedBy()) - .append("updatedTime", getUpdatedTime()) - .append("updatedBy", getUpdatedBy()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) .append("detailCode", getDetailCode()) .toString(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java index 99f7d1f0..31328f1e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java @@ -52,21 +52,21 @@ public class EquItemEquipment extends BaseEntity { /** 创建人 */ @Excel(name = "创建人") - private String createdBy; + private String createBy; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date createdTime; + private Date createTime; /** 更新人 */ @Excel(name = "更新人") - private String updatedBy; + private String updateBy; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date updatedTime; + private Date updateTime; public void setId(String id) { this.id = id; @@ -131,33 +131,33 @@ public class EquItemEquipment extends BaseEntity { public String getDelFlag() { return delFlag; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public String getCreatedBy() { - return createdBy; + public String getCreateBy() { + return createBy; } - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public Date getCreatedTime() { - return createdTime; + public Date getCreateTime() { + return createTime; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() { + return updateBy; } - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } - public Date getUpdatedTime() { - return updatedTime; + public Date getUpdateTime() { + return updateTime; } @Override @@ -172,10 +172,10 @@ public class EquItemEquipment extends BaseEntity { .append("attr2", getAttr2()) .append("attr3", getAttr3()) .append("delFlag", getDelFlag()) - .append("createdBy", getCreatedBy()) - .append("createdTime", getCreatedTime()) - .append("updatedBy", getUpdatedBy()) - .append("updatedTime", getUpdatedTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) .toString(); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java index cdc9204f..8e74f792 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java @@ -32,17 +32,17 @@ public class EquCheckItemDTO { /** 删除标识 */ private String delFlag ; /** 创建时间 */ - private Date createdTime ; + private Date createTime ; /** 创建人 */ - private String createdBy ; + private String createBy ; /** 更新时间 */ - private Date updatedTime ; + private Date updateTime ; /** 更新人 */ - private String updatedBy ; + private String updateBy ; // 标准列表 private List formStandard; // 创建日期范围list - private List createdTimeArray; + private List createTimeArray; // 更新日期范围list private List updateTimeArray; @@ -70,12 +70,12 @@ public class EquCheckItemDTO { this.equipmentCodeList = equipmentCodeList; } - public List getCreatedTimeArray() { - return createdTimeArray; + public List getCreateTimeArray() { + return createTimeArray; } - public void setCreatedTimeArray(List createdTimeArray) { - this.createdTimeArray = createdTimeArray; + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; } public List getUpdateTimeArray() { @@ -214,36 +214,36 @@ public class EquCheckItemDTO { this.delFlag = delFlag; } - public Date getCreatedTime() { - return createdTime; + public Date getCreateTime() { + return createTime; } - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public String getCreatedBy() { - return createdBy; + public String getCreateBy() { + return createBy; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public Date getUpdatedTime() { - return updatedTime; + public Date getUpdateTime() { + return updateTime; } - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() { + return updateBy; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } public List getFormStandard() { diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java index 4c98a617..3f10a6d6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java @@ -32,13 +32,13 @@ public class EquCheckItemVO { /** 删除标识 */ private String delFlag ; /** 创建时间 */ - private Date createdTime ; + private Date createTime ; /** 创建人 */ - private String createdBy ; + private String createBy ; /** 更新时间 */ - private Date updatedTime ; + private Date updateTime ; /** 更新人 */ - private String updatedBy ; + private String updateBy ; // 标准列表 private List formStandard; // 设备名称 @@ -158,36 +158,36 @@ public class EquCheckItemVO { this.delFlag = delFlag; } - public Date getCreatedTime() { - return createdTime; + public Date getCreateTime() { + return createTime; } - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public String getCreatedBy() { - return createdBy; + public String getCreateBy() { + return createBy; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public Date getUpdatedTime() { - return updatedTime; + public Date getUpdateTime() { + return updateTime; } - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() { + return updateBy; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } public List getFormStandard() { diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index 2c496052..86afb64e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -74,12 +74,12 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { @Override @DS("#header.poolName") public List selectEquCheckItemList(EquCheckItem equCheckItem) { - if (equCheckItem.getCreatedTimeArray() != null) { + if (equCheckItem.getCreateTimeArray() != null) { // 设置创建日期开始和结束值 - if (equCheckItem.getCreatedTimeArray().size() == 2) { + if (equCheckItem.getCreateTimeArray().size() == 2) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - equCheckItem.setCreateTimeStart(formatter.format(equCheckItem.getCreatedTimeArray().get(0))); - equCheckItem.setCreateTimeEnd(formatter.format(equCheckItem.getCreatedTimeArray().get(1))); + equCheckItem.setCreateTimeStart(formatter.format(equCheckItem.getCreateTimeArray().get(0))); + equCheckItem.setCreateTimeEnd(formatter.format(equCheckItem.getCreateTimeArray().get(1))); } } if (equCheckItem.getUpdateTimeArray() != null) { @@ -126,10 +126,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { equCheckItem.setItemId(IdUtils.fastSimpleUUID()); equCheckItem.setFactoryCode(factory); equCheckItem.setItemCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum); - equCheckItem.setCreatedBy(SecurityContextHolder.getUserName()); - equCheckItem.setCreatedTime(DateUtils.getNowDate()); - equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); - equCheckItem.setUpdatedTime(DateUtils.getNowDate()); + equCheckItem.setCreateBy(SecurityContextHolder.getUserName()); + equCheckItem.setCreateTime(DateUtils.getNowDate()); + equCheckItem.setUpdateBy(SecurityContextHolder.getUserName()); + equCheckItem.setUpdateTime(DateUtils.getNowDate()); if (equCheckItem.getItemType().equals("spotInspection")) { equCheckItem.setItemTypeName("点检"); } @@ -152,10 +152,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { detail.setParentCode(equCheckItem.getItemCode()); detail.setFactoryCode(factory); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum); - detail.setCreatedBy(SecurityContextHolder.getUserName()); - detail.setCreatedTime(DateUtils.getNowDate()); - detail.setUpdatedBy(SecurityContextHolder.getUserName()); - detail.setUpdatedTime(DateUtils.getNowDate()); + detail.setCreateBy(SecurityContextHolder.getUserName()); + detail.setCreateTime(DateUtils.getNowDate()); + detail.setUpdateBy(SecurityContextHolder.getUserName()); + detail.setUpdateTime(DateUtils.getNowDate()); // 插入到数据库 equCheckItemDetailMapper.insertEquCheckItemDetail(detail); @@ -173,10 +173,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { equItemEquipment.setItemCode(equCheckItem.getItemCode()); equItemEquipment.setEquipmentCode(code); equItemEquipment.setFactoryCode(factory); - equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); - equItemEquipment.setCreatedTime(DateUtils.getNowDate()); - equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); - equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); + equItemEquipment.setCreateBy(SecurityContextHolder.getUserName()); + equItemEquipment.setCreateTime(DateUtils.getNowDate()); + equItemEquipment.setUpdateBy(SecurityContextHolder.getUserName()); + equItemEquipment.setUpdateTime(DateUtils.getNowDate()); // 插入数据库 equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); @@ -199,8 +199,8 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { BeanUtils.copyProperties(equCheckItemDTO, equCheckItem); // 处理检查项信息 - equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); - equCheckItem.setUpdatedTime(DateUtils.getNowDate()); + equCheckItem.setUpdateBy(SecurityContextHolder.getUserName()); + equCheckItem.setUpdateTime(DateUtils.getNowDate()); if (equCheckItem.getItemType().equals("spotInspection")) { equCheckItem.setItemTypeName("点检"); } @@ -225,10 +225,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { detail.setParentCode(equCheckItem.getItemCode()); detail.setFactoryCode(equCheckItem.getFactoryCode()); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum); - detail.setCreatedBy(SecurityContextHolder.getUserName()); - detail.setCreatedTime(DateUtils.getNowDate()); - detail.setUpdatedBy(SecurityContextHolder.getUserName()); - detail.setUpdatedTime(DateUtils.getNowDate()); + detail.setCreateBy(SecurityContextHolder.getUserName()); + detail.setCreateTime(DateUtils.getNowDate()); + detail.setUpdateBy(SecurityContextHolder.getUserName()); + detail.setUpdateTime(DateUtils.getNowDate()); // 插入到数据库 equCheckItemDetailMapper.insertEquCheckItemDetail(detail); @@ -249,10 +249,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { equItemEquipment.setItemCode(equCheckItem.getItemCode()); equItemEquipment.setEquipmentCode(code); equItemEquipment.setFactoryCode(equCheckItemDTO.getFactoryCode()); - equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); - equItemEquipment.setCreatedTime(DateUtils.getNowDate()); - equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); - equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); + equItemEquipment.setCreateBy(SecurityContextHolder.getUserName()); + equItemEquipment.setCreateTime(DateUtils.getNowDate()); + equItemEquipment.setUpdateBy(SecurityContextHolder.getUserName()); + equItemEquipment.setUpdateTime(DateUtils.getNowDate()); // 插入数据库 equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml index 0cb9d421..84360378 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml @@ -17,15 +17,15 @@ - - - - + + + + - select detail_id, parent_code, standard_type, standard_name, factory_code, detail_up_limit, detail_down_limit, detail_unit, attr1, attr2, attr3, del_flag, created_time, created_by, updated_time, updated_by, detail_code from equ_check_item_detail + select detail_id, parent_code, standard_type, standard_name, factory_code, detail_up_limit, detail_down_limit, detail_unit, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by, detail_code from equ_check_item_detail SELECT COUNT(detail_id)+1 AS serialNum FROM equ_check_item_detail - WHERE CONVERT(date, GETDATE()) = CONVERT(date,created_time) and parent_code = #{itemCode} and del_flag = '0' + WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and parent_code = #{itemCode} and del_flag = '0' @@ -82,10 +82,10 @@ attr2, attr3, del_flag, - created_time, - created_by, - updated_time, - updated_by, + create_time, + create_by, + update_time, + update_by, detail_code, @@ -101,10 +101,10 @@ #{attr2}, #{attr3}, #{delFlag}, - #{createdTime}, - #{createdBy}, - #{updatedTime}, - #{updatedBy}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, #{detailCode}, @@ -123,10 +123,10 @@ attr2 = #{attr2}, attr3 = #{attr3}, del_flag = #{delFlag}, - created_time = #{createdTime}, - created_by = #{createdBy}, - updated_time = #{updatedTime}, - updated_by = #{updatedBy}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, detail_code = #{detailCode}, where detail_id = #{detailId} and del_flag = '0' diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index 5439d400..a6e56013 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - + + + + - 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 + select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by from equ_check_item @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -34,10 +34,10 @@ and attr1 = #{attr1} and attr2 = #{attr2} and attr3 = #{attr3} - and created_by = #{createdBy} - and created_time = #{createdTime} - and updated_by = #{updatedBy} - and updated_time = #{updatedTime} + and create_by = #{createBy} + and create_time = #{createTime} + and update_by = #{updateBy} + and update_time = #{updateTime} and del_flag = '0' @@ -50,7 +50,7 @@