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

设备管理-创建/更新字段BUG

Browse Source
highway
wws 1 year ago
parent 25b5fbe636
commit 433a307c75
9 changed files with 219 additions and 219 deletions
Show Stats Download Patch File Download Diff File

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

@ -68,23 +68,23 @@ public class EquCheckItem extends BaseEntity {
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createTime;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") @Excel(name = "创建人")
private String createdBy; private String createBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedTime; private Date updateTime;
/** 更新人 */ /** 更新人 */
@Excel(name = "更新人") @Excel(name = "更新人")
private String updatedBy; private String updateBy;
// 创建日期范围list // 创建日期范围list
private List<Date> createdTimeArray; private List<Date> createTimeArray;
// 更新日期范围list // 更新日期范围list
private List<Date> updateTimeArray; private List<Date> updateTimeArray;
@ -141,12 +141,12 @@ public class EquCheckItem extends BaseEntity {
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
public List<Date> getCreatedTimeArray() { public List<Date> getCreateTimeArray() {
return createdTimeArray; return createTimeArray;
} }
public void setCreatedTimeArray(List<Date> createdTimeArray) { public void setCreateTimeArray(List<Date> createTimeArray) {
this.createdTimeArray = createdTimeArray; this.createTimeArray = createTimeArray;
} }
public void setItemId(String itemId) { public void setItemId(String itemId) {
@ -233,33 +233,33 @@ public class EquCheckItem extends BaseEntity {
public String getDelFlag() { public String getDelFlag() {
return delFlag; return delFlag;
} }
public void setCreatedTime(Date createdTime) { public void setCreateTime(Date createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public Date getCreatedTime() { public Date getCreateTime() {
return createdTime; return createTime;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy) {
this.createdBy = createdBy; this.createBy = createBy;
} }
public String getCreatedBy() { public String getCreateBy() {
return createdBy; return createBy;
} }
public void setUpdatedTime(Date updatedTime) { public void setUpdateTime(Date updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public Date getUpdatedTime() { public Date getUpdateTime() {
return updatedTime; return updateTime;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy) {
this.updatedBy = updatedBy; this.updateBy = updateBy;
} }
public String getUpdatedBy() { public String getUpdateBy() {
return updatedBy; return updateBy;
} }
@Override @Override
@ -277,11 +277,11 @@ public class EquCheckItem extends BaseEntity {
.append("attr2", getAttr2()) .append("attr2", getAttr2())
.append("attr3", getAttr3()) .append("attr3", getAttr3())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createdTime", getCreatedTime()) .append("createTime", getCreateTime())
.append("createdBy", getCreatedBy()) .append("createBy", getCreateBy())
.append("updatedTime", getUpdatedTime()) .append("updateTime", getUpdateTime())
.append("updatedBy", getUpdatedBy()) .append("updateBy", getUpdateBy())
.append("createdTimeArray",getCreatedTimeArray()) .append("createTimeArray",getCreateTimeArray())
.toString(); .toString();
} }
} }

48
op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java
Unescape Escape View File

@ -66,20 +66,20 @@ public class EquCheckItemDetail extends BaseEntity {
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createTime;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") @Excel(name = "创建人")
private String createdBy; private String createBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedTime; private Date updateTime;
/** 更新人 */ /** 更新人 */
@Excel(name = "更新人") @Excel(name = "更新人")
private String updatedBy; private String updateBy;
/** 详情编码 */ /** 详情编码 */
@Excel(name = "详情编码") @Excel(name = "详情编码")
@ -177,33 +177,33 @@ public class EquCheckItemDetail extends BaseEntity {
public String getDelFlag() { public String getDelFlag() {
return delFlag; return delFlag;
} }
public void setCreatedTime(Date createdTime) { public void setCreateTime(Date createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public Date getCreatedTime() { public Date getCreateTime() {
return createdTime; return createTime;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy) {
this.createdBy = createdBy; this.createBy = createBy;
} }
public String getCreatedBy() { public String getCreateBy() {
return createdBy; return createBy;
} }
public void setUpdatedTime(Date updatedTime) { public void setUpdateTime(Date updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public Date getUpdatedTime() { public Date getUpdateTime() {
return updatedTime; return updateTime;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy) {
this.updatedBy = updatedBy; this.updateBy = updateBy;
} }
public String getUpdatedBy() { public String getUpdateBy() {
return updatedBy; return updateBy;
} }
@Override @Override
@ -221,10 +221,10 @@ public class EquCheckItemDetail extends BaseEntity {
.append("attr2", getAttr2()) .append("attr2", getAttr2())
.append("attr3", getAttr3()) .append("attr3", getAttr3())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createdTime", getCreatedTime()) .append("createTime", getCreateTime())
.append("createdBy", getCreatedBy()) .append("createBy", getCreateBy())
.append("updatedTime", getUpdatedTime()) .append("updateTime", getUpdateTime())
.append("updatedBy", getUpdatedBy()) .append("updateBy", getUpdateBy())
.append("detailCode", getDetailCode()) .append("detailCode", getDetailCode())
.toString(); .toString();
} }

48
op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java
Unescape Escape View File

@ -52,21 +52,21 @@ public class EquItemEquipment extends BaseEntity {
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") @Excel(name = "创建人")
private String createdBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createTime;
/** 更新人 */ /** 更新人 */
@Excel(name = "更新人") @Excel(name = "更新人")
private String updatedBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedTime; private Date updateTime;
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
@ -131,33 +131,33 @@ public class EquItemEquipment extends BaseEntity {
public String getDelFlag() { public String getDelFlag() {
return delFlag; return delFlag;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy) {
this.createdBy = createdBy; this.createBy = createBy;
} }
public String getCreatedBy() { public String getCreateBy() {
return createdBy; return createBy;
} }
public void setCreatedTime(Date createdTime) { public void setCreateTime(Date createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public Date getCreatedTime() { public Date getCreateTime() {
return createdTime; return createTime;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy) {
this.updatedBy = updatedBy; this.updateBy = updateBy;
} }
public String getUpdatedBy() { public String getUpdateBy() {
return updatedBy; return updateBy;
} }
public void setUpdatedTime(Date updatedTime) { public void setUpdateTime(Date updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public Date getUpdatedTime() { public Date getUpdateTime() {
return updatedTime; return updateTime;
} }
@Override @Override
@ -172,10 +172,10 @@ public class EquItemEquipment extends BaseEntity {
.append("attr2", getAttr2()) .append("attr2", getAttr2())
.append("attr3", getAttr3()) .append("attr3", getAttr3())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createdBy", getCreatedBy()) .append("createBy", getCreateBy())
.append("createdTime", getCreatedTime()) .append("createTime", getCreateTime())
.append("updatedBy", getUpdatedBy()) .append("updateBy", getUpdateBy())
.append("updatedTime", getUpdatedTime()) .append("updateTime", getUpdateTime())
.toString(); .toString();
} }
} }

50
op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java
Unescape Escape View File

@ -32,17 +32,17 @@ public class EquCheckItemDTO {
/** 删除标识 */ /** 删除标识 */
private String delFlag ; 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<EquCheckItemDetail> formStandard; private List<EquCheckItemDetail> formStandard;
// 创建日期范围list // 创建日期范围list
private List<Date> createdTimeArray; private List<Date> createTimeArray;
// 更新日期范围list // 更新日期范围list
private List<Date> updateTimeArray; private List<Date> updateTimeArray;
@ -70,12 +70,12 @@ public class EquCheckItemDTO {
this.equipmentCodeList = equipmentCodeList; this.equipmentCodeList = equipmentCodeList;
} }
public List<Date> getCreatedTimeArray() { public List<Date> getCreateTimeArray() {
return createdTimeArray; return createTimeArray;
} }
public void setCreatedTimeArray(List<Date> createdTimeArray) { public void setCreateTimeArray(List<Date> createTimeArray) {
this.createdTimeArray = createdTimeArray; this.createTimeArray = createTimeArray;
} }
public List<Date> getUpdateTimeArray() { public List<Date> getUpdateTimeArray() {
@ -214,36 +214,36 @@ public class EquCheckItemDTO {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
public Date getCreatedTime() { public Date getCreateTime() {
return createdTime; return createTime;
} }
public void setCreatedTime(Date createdTime) { public void setCreateTime(Date createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public String getCreatedBy() { public String getCreateBy() {
return createdBy; return createBy;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy) {
this.createdBy = createdBy; this.createBy = createBy;
} }
public Date getUpdatedTime() { public Date getUpdateTime() {
return updatedTime; return updateTime;
} }
public void setUpdatedTime(Date updatedTime) { public void setUpdateTime(Date updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public String getUpdatedBy() { public String getUpdateBy() {
return updatedBy; return updateBy;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy) {
this.updatedBy = updatedBy; this.updateBy = updateBy;
} }
public List<EquCheckItemDetail> getFormStandard() { public List<EquCheckItemDetail> getFormStandard() {

40
op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java
Unescape Escape View File

@ -32,13 +32,13 @@ public class EquCheckItemVO {
/** 删除标识 */ /** 删除标识 */
private String delFlag ; 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<EquCheckItemDetail> formStandard; private List<EquCheckItemDetail> formStandard;
// 设备名称 // 设备名称
@ -158,36 +158,36 @@ public class EquCheckItemVO {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
public Date getCreatedTime() { public Date getCreateTime() {
return createdTime; return createTime;
} }
public void setCreatedTime(Date createdTime) { public void setCreateTime(Date createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public String getCreatedBy() { public String getCreateBy() {
return createdBy; return createBy;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy) {
this.createdBy = createdBy; this.createBy = createBy;
} }
public Date getUpdatedTime() { public Date getUpdateTime() {
return updatedTime; return updateTime;
} }
public void setUpdatedTime(Date updatedTime) { public void setUpdateTime(Date updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public String getUpdatedBy() { public String getUpdateBy() {
return updatedBy; return updateBy;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy) {
this.updatedBy = updatedBy; this.updateBy = updateBy;
} }
public List<EquCheckItemDetail> getFormStandard() { public List<EquCheckItemDetail> getFormStandard() {

52
op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
Unescape Escape View File

@ -74,12 +74,12 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public List<EquCheckItem> selectEquCheckItemList(EquCheckItem equCheckItem) { public List<EquCheckItem> 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"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
equCheckItem.setCreateTimeStart(formatter.format(equCheckItem.getCreatedTimeArray().get(0))); equCheckItem.setCreateTimeStart(formatter.format(equCheckItem.getCreateTimeArray().get(0)));
equCheckItem.setCreateTimeEnd(formatter.format(equCheckItem.getCreatedTimeArray().get(1))); equCheckItem.setCreateTimeEnd(formatter.format(equCheckItem.getCreateTimeArray().get(1)));
} }
} }
if (equCheckItem.getUpdateTimeArray() != null) { if (equCheckItem.getUpdateTimeArray() != null) {
@ -126,10 +126,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
equCheckItem.setItemId(IdUtils.fastSimpleUUID()); equCheckItem.setItemId(IdUtils.fastSimpleUUID());
equCheckItem.setFactoryCode(factory); equCheckItem.setFactoryCode(factory);
equCheckItem.setItemCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum); equCheckItem.setItemCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum);
equCheckItem.setCreatedBy(SecurityContextHolder.getUserName()); equCheckItem.setCreateBy(SecurityContextHolder.getUserName());
equCheckItem.setCreatedTime(DateUtils.getNowDate()); equCheckItem.setCreateTime(DateUtils.getNowDate());
equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); equCheckItem.setUpdateBy(SecurityContextHolder.getUserName());
equCheckItem.setUpdatedTime(DateUtils.getNowDate()); equCheckItem.setUpdateTime(DateUtils.getNowDate());
if (equCheckItem.getItemType().equals("spotInspection")) { if (equCheckItem.getItemType().equals("spotInspection")) {
equCheckItem.setItemTypeName("点检"); equCheckItem.setItemTypeName("点检");
} }
@ -152,10 +152,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
detail.setParentCode(equCheckItem.getItemCode()); detail.setParentCode(equCheckItem.getItemCode());
detail.setFactoryCode(factory); detail.setFactoryCode(factory);
detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum);
detail.setCreatedBy(SecurityContextHolder.getUserName()); detail.setCreateBy(SecurityContextHolder.getUserName());
detail.setCreatedTime(DateUtils.getNowDate()); detail.setCreateTime(DateUtils.getNowDate());
detail.setUpdatedBy(SecurityContextHolder.getUserName()); detail.setUpdateBy(SecurityContextHolder.getUserName());
detail.setUpdatedTime(DateUtils.getNowDate()); detail.setUpdateTime(DateUtils.getNowDate());
// 插入到数据库 // 插入到数据库
equCheckItemDetailMapper.insertEquCheckItemDetail(detail); equCheckItemDetailMapper.insertEquCheckItemDetail(detail);
@ -173,10 +173,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
equItemEquipment.setItemCode(equCheckItem.getItemCode()); equItemEquipment.setItemCode(equCheckItem.getItemCode());
equItemEquipment.setEquipmentCode(code); equItemEquipment.setEquipmentCode(code);
equItemEquipment.setFactoryCode(factory); equItemEquipment.setFactoryCode(factory);
equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); equItemEquipment.setCreateBy(SecurityContextHolder.getUserName());
equItemEquipment.setCreatedTime(DateUtils.getNowDate()); equItemEquipment.setCreateTime(DateUtils.getNowDate());
equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); equItemEquipment.setUpdateBy(SecurityContextHolder.getUserName());
equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); equItemEquipment.setUpdateTime(DateUtils.getNowDate());
// 插入数据库 // 插入数据库
equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment);
@ -199,8 +199,8 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
BeanUtils.copyProperties(equCheckItemDTO, equCheckItem); BeanUtils.copyProperties(equCheckItemDTO, equCheckItem);
// 处理检查项信息 // 处理检查项信息
equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); equCheckItem.setUpdateBy(SecurityContextHolder.getUserName());
equCheckItem.setUpdatedTime(DateUtils.getNowDate()); equCheckItem.setUpdateTime(DateUtils.getNowDate());
if (equCheckItem.getItemType().equals("spotInspection")) { if (equCheckItem.getItemType().equals("spotInspection")) {
equCheckItem.setItemTypeName("点检"); equCheckItem.setItemTypeName("点检");
} }
@ -225,10 +225,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
detail.setParentCode(equCheckItem.getItemCode()); detail.setParentCode(equCheckItem.getItemCode());
detail.setFactoryCode(equCheckItem.getFactoryCode()); detail.setFactoryCode(equCheckItem.getFactoryCode());
detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum);
detail.setCreatedBy(SecurityContextHolder.getUserName()); detail.setCreateBy(SecurityContextHolder.getUserName());
detail.setCreatedTime(DateUtils.getNowDate()); detail.setCreateTime(DateUtils.getNowDate());
detail.setUpdatedBy(SecurityContextHolder.getUserName()); detail.setUpdateBy(SecurityContextHolder.getUserName());
detail.setUpdatedTime(DateUtils.getNowDate()); detail.setUpdateTime(DateUtils.getNowDate());
// 插入到数据库 // 插入到数据库
equCheckItemDetailMapper.insertEquCheckItemDetail(detail); equCheckItemDetailMapper.insertEquCheckItemDetail(detail);
@ -249,10 +249,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
equItemEquipment.setItemCode(equCheckItem.getItemCode()); equItemEquipment.setItemCode(equCheckItem.getItemCode());
equItemEquipment.setEquipmentCode(code); equItemEquipment.setEquipmentCode(code);
equItemEquipment.setFactoryCode(equCheckItemDTO.getFactoryCode()); equItemEquipment.setFactoryCode(equCheckItemDTO.getFactoryCode());
equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); equItemEquipment.setCreateBy(SecurityContextHolder.getUserName());
equItemEquipment.setCreatedTime(DateUtils.getNowDate()); equItemEquipment.setCreateTime(DateUtils.getNowDate());
equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); equItemEquipment.setUpdateBy(SecurityContextHolder.getUserName());
equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); equItemEquipment.setUpdateTime(DateUtils.getNowDate());
// 插入数据库 // 插入数据库
equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment);

46
op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml
Unescape Escape View File

@ -17,15 +17,15 @@
<result property="attr2" column="attr2" /> <result property="attr2" column="attr2" />
<result property="attr3" column="attr3" /> <result property="attr3" column="attr3" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createdTime" column="created_time" /> <result property="createTime" column="create_time" />
<result property="createdBy" column="created_by" /> <result property="createBy" column="create_by" />
<result property="updatedTime" column="updated_time" /> <result property="updateTime" column="update_time" />
<result property="updatedBy" column="updated_by" /> <result property="updateBy" column="update_by" />
<result property="detailCode" column="detail_code" /> <result property="detailCode" column="detail_code" />
</resultMap> </resultMap>
<sql id="selectEquCheckItemDetailVo"> <sql id="selectEquCheckItemDetailVo">
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
</sql> </sql>
<select id="selectEquCheckItemDetailList" parameterType="EquCheckItemDetail" resultMap="EquCheckItemDetailResult"> <select id="selectEquCheckItemDetailList" parameterType="EquCheckItemDetail" resultMap="EquCheckItemDetailResult">
@ -41,10 +41,10 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if> <if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if> <if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if> <if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if> <if test="createTime != null "> and create_time = #{createTime}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if> <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="detailCode != null and detailCode != ''"> and detail_code = #{detailCode}</if> <if test="detailCode != null and detailCode != ''"> and detail_code = #{detailCode}</if>
</where> </where>
and del_flag = '0' and del_flag = '0'
@ -58,13 +58,13 @@
<select id="selectSerialNumber" resultType="java.lang.Integer"> <select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(detail_id)+1 AS serialNum SELECT COUNT(detail_id)+1 AS serialNum
FROM equ_check_item_detail 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'
</select> </select>
<select id="selectEquCheckItemDetailByParentCode" parameterType="String" resultMap="EquCheckItemDetailResult"> <select id="selectEquCheckItemDetailByParentCode" parameterType="String" resultMap="EquCheckItemDetailResult">
<include refid="selectEquCheckItemDetailVo"/> <include refid="selectEquCheckItemDetailVo"/>
where parent_code = #{parentCode} and del_flag = '0' where parent_code = #{parentCode} and del_flag = '0'
ORDER BY created_time ORDER BY create_time
</select> </select>
<insert id="insertEquCheckItemDetail" parameterType="EquCheckItemDetail"> <insert id="insertEquCheckItemDetail" parameterType="EquCheckItemDetail">
@ -82,10 +82,10 @@
<if test="attr2 != null">attr2,</if> <if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if> <if test="attr3 != null">attr3,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createdTime != null">created_time,</if> <if test="createTime != null">create_time,</if>
<if test="createdBy != null and createdBy != ''">created_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updateTime != null">update_time,</if>
<if test="updatedBy != null and updatedBy != ''">updated_by,</if> <if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="detailCode != null and detailCode != ''">detail_code,</if> <if test="detailCode != null and detailCode != ''">detail_code,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@ -101,10 +101,10 @@
<if test="attr2 != null">#{attr2},</if> <if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if> <if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createdBy != null and createdBy != ''">#{createdBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if> <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="detailCode != null and detailCode != ''">#{detailCode},</if> <if test="detailCode != null and detailCode != ''">#{detailCode},</if>
</trim> </trim>
</insert> </insert>
@ -123,10 +123,10 @@
<if test="attr2 != null">attr2 = #{attr2},</if> <if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if> <if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="createdBy != null and createdBy != ''">created_by = #{createdBy},</if> <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updatedBy != null and updatedBy != ''">updated_by = #{updatedBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="detailCode != null and detailCode != ''">detail_code = #{detailCode},</if> <if test="detailCode != null and detailCode != ''">detail_code = #{detailCode},</if>
</trim> </trim>
where detail_id = #{detailId} and del_flag = '0' where detail_id = #{detailId} and del_flag = '0'

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

@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="attr2" column="attr2" /> <result property="attr2" column="attr2" />
<result property="attr3" column="attr3" /> <result property="attr3" column="attr3" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createdTime" column="created_time" /> <result property="createTime" column="create_time" />
<result property="createdBy" column="created_by" /> <result property="createBy" column="create_by" />
<result property="updatedTime" column="updated_time" /> <result property="updateTime" column="update_time" />
<result property="updatedBy" column="updated_by" /> <result property="updateBy" column="update_by" />
</resultMap> </resultMap>
<sql id="selectEquCheckItemVo"> <sql id="selectEquCheckItemVo">
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
</sql> </sql>
<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult"> <select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
@ -41,14 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if> <if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if> <if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if> <if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
<if test="createTimeStart != null "> and CONVERT(date,created_time) >= #{createTimeStart}</if> <if test="createTimeStart != null "> and CONVERT(date,create_time) >= #{createTimeStart}</if>
<if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,created_time)</if> <if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,create_time)</if>
<if test="createdBy != null and createdBy != ''"> and created_by like concat('%', #{createdBy}, '%')</if> <if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="updateTimeStart != null "> and CONVERT(date,updated_time) >= #{updateTimeStart}</if> <if test="updateTimeStart != null "> and CONVERT(date,update_time) >= #{updateTimeStart}</if>
<if test="updateTimeEnd != null "> and #{updateTimeEnd} >= CONVERT(date,updated_time)</if> <if test="updateTimeEnd != null "> and #{updateTimeEnd} >= CONVERT(date,update_time)</if>
<if test="updatedBy != null and updatedBy != ''"> and updated_by like concat('%', #{updatedBy}, '%')</if> <if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
and del_flag = '0' and del_flag = '0'
ORDER BY created_time DESC ORDER BY create_time DESC
</where> </where>
</select> </select>
@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSerialNumber" resultType="java.lang.Integer"> <select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(item_id)+1 AS serialNum SELECT COUNT(item_id)+1 AS serialNum
FROM equ_check_item FROM equ_check_item
WHERE CONVERT(date, GETDATE()) = CONVERT(date,created_time) and del_flag = '0' WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
</select> </select>
<select id="selectAllEquipmentList" resultType="com.op.device.domain.vo.EquCheckItemVO"> <select id="selectAllEquipmentList" resultType="com.op.device.domain.vo.EquCheckItemVO">
@ -87,10 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr2 != null">attr2,</if> <if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if> <if test="attr3 != null">attr3,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createdTime != null">created_time,</if> <if test="createTime != null">create_time,</if>
<if test="createdBy != null and createdBy != ''">created_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updateTime != null">update_time,</if>
<if test="updatedBy != null and updatedBy != ''">updated_by,</if> <if test="updateBy != null and updateBy != ''">update_by,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="itemId != null">#{itemId},</if> <if test="itemId != null">#{itemId},</if>
@ -105,10 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr2 != null">#{attr2},</if> <if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if> <if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createdBy != null and createdBy != ''">#{createdBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if> <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
</trim> </trim>
</insert> </insert>
@ -126,10 +126,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr2 != null">attr2 = #{attr2},</if> <if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if> <if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="createdBy != null and createdBy != ''">created_by = #{createdBy},</if> <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updatedBy != null and updatedBy != ''">updated_by = #{updatedBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
</trim> </trim>
where item_id = #{itemId} and del_flag = '0' where item_id = #{itemId} and del_flag = '0'
</update> </update>

44
op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml
Unescape Escape View File

@ -14,14 +14,14 @@
<result property="attr2" column="attr2" /> <result property="attr2" column="attr2" />
<result property="attr3" column="attr3" /> <result property="attr3" column="attr3" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createdBy" column="created_by" /> <result property="createBy" column="create_by" />
<result property="createdTime" column="created_time" /> <result property="createTime" column="create_time" />
<result property="updatedBy" column="updated_by" /> <result property="updateBy" column="update_by" />
<result property="updatedTime" column="updated_time" /> <result property="updateTime" column="update_time" />
</resultMap> </resultMap>
<sql id="selectEquItemEquipmentVo"> <sql id="selectEquItemEquipmentVo">
select id, conn_code, item_code, equipment_code, factory_code, attr1, attr2, attr3, del_flag, created_by, created_time, updated_by, updated_time from equ_item_equipment select id, conn_code, item_code, equipment_code, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_item_equipment
</sql> </sql>
<select id="selectEquItemEquipmentList" parameterType="EquItemEquipment" resultMap="EquItemEquipmentResult"> <select id="selectEquItemEquipmentList" parameterType="EquItemEquipment" resultMap="EquItemEquipmentResult">
@ -34,10 +34,10 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if> <if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if> <if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if> <if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if> <if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if> <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
</where> </where>
and del_flag = '0' and del_flag = '0'
</select> </select>
@ -50,7 +50,7 @@
<select id="selectSerialNumber" resultType="java.lang.Integer"> <select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(id)+1 AS serialNum SELECT COUNT(id)+1 AS serialNum
FROM equ_item_equipment FROM equ_item_equipment
WHERE CONVERT(date, GETDATE()) = CONVERT(date,created_time) and del_flag = '0' WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
</select> </select>
<select id="selectEquipmentCodeList" resultType="java.lang.String"> <select id="selectEquipmentCodeList" resultType="java.lang.String">
@ -69,10 +69,10 @@
<if test="attr2 != null">attr2,</if> <if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if> <if test="attr3 != null">attr3,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createdBy != null and createdBy != ''">created_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="createdTime != null">created_time,</if> <if test="createTime != null">create_time,</if>
<if test="updatedBy != null and updatedBy != ''">updated_by,</if> <if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updateTime != null">update_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@ -84,10 +84,10 @@
<if test="attr2 != null">#{attr2},</if> <if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if> <if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createdBy != null and createdBy != ''">#{createdBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if> <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updateTime != null">#{updateTime},</if>
</trim> </trim>
</insert> </insert>
@ -102,10 +102,10 @@
<if test="attr2 != null">attr2 = #{attr2},</if> <if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if> <if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createdBy != null and createdBy != ''">created_by = #{createdBy},</if> <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updatedBy != null and updatedBy != ''">updated_by = #{updatedBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
</trim> </trim>
where id = #{id} and del_flag = '0' where id = #{id} and del_flag = '0'
</update> </update>

Write Preview
Loading…
Cancel
Save