From c2c912ca8ed3c5a8a97a1369d3343006b8b30504 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 14 Dec 2020 12:06:38 +0800 Subject: [PATCH] =?UTF-8?q?20201214=E5=88=A0=E9=99=A4=E6=80=A5=E6=95=91?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/wisdomcar/bean/po/FirstAid.java | 35 ++-- .../wisdomcar/bean/po/FirstAidExample.java | 156 ++++++++++++------ .../wisdomcar/bean/po/FirstAidRecord.java | 23 +-- .../bean/po/FirstAidRecordExample.java | 108 +++--------- .../resources/mapper_raw/FirstAidMapper.xml | 73 ++++---- .../mapper_raw/FirstAidRecordMapper.xml | 49 ++---- 6 files changed, 221 insertions(+), 223 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAid.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAid.java index 68f116dd..638e6afb 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAid.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAid.java @@ -8,9 +8,11 @@ public class FirstAid implements Serializable { private Long carId; - private Long begintime; + private Long hospitalId; - private Long endtime; + private Long beginTime; + + private Long endTime; private Date createdAt; @@ -36,20 +38,28 @@ public class FirstAid implements Serializable { this.carId = carId; } - public Long getBegintime() { - return begintime; + public Long getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Long hospitalId) { + this.hospitalId = hospitalId; + } + + public Long getBeginTime() { + return beginTime; } - public void setBegintime(Long begintime) { - this.begintime = begintime; + public void setBeginTime(Long beginTime) { + this.beginTime = beginTime; } - public Long getEndtime() { - return endtime; + public Long getEndTime() { + return endTime; } - public void setEndtime(Long endtime) { - this.endtime = endtime; + public void setEndTime(Long endTime) { + this.endTime = endTime; } public Date getCreatedAt() { @@ -84,8 +94,9 @@ public class FirstAid implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", carId=").append(carId); - sb.append(", begintime=").append(begintime); - sb.append(", endtime=").append(endtime); + sb.append(", hospitalId=").append(hospitalId); + sb.append(", beginTime=").append(beginTime); + sb.append(", endTime=").append(endTime); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidExample.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidExample.java index f3b0fc76..b52e5114 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidExample.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidExample.java @@ -225,123 +225,183 @@ public class FirstAidExample { return (Criteria) this; } - public Criteria andBegintimeIsNull() { - addCriterion("beginTime is null"); + public Criteria andHospitalIdIsNull() { + addCriterion("hospital_id is null"); return (Criteria) this; } - public Criteria andBegintimeIsNotNull() { - addCriterion("beginTime is not null"); + public Criteria andHospitalIdIsNotNull() { + addCriterion("hospital_id is not null"); return (Criteria) this; } - public Criteria andBegintimeEqualTo(Long value) { - addCriterion("beginTime =", value, "begintime"); + public Criteria andHospitalIdEqualTo(Long value) { + addCriterion("hospital_id =", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeNotEqualTo(Long value) { - addCriterion("beginTime <>", value, "begintime"); + public Criteria andHospitalIdNotEqualTo(Long value) { + addCriterion("hospital_id <>", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeGreaterThan(Long value) { - addCriterion("beginTime >", value, "begintime"); + public Criteria andHospitalIdGreaterThan(Long value) { + addCriterion("hospital_id >", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeGreaterThanOrEqualTo(Long value) { - addCriterion("beginTime >=", value, "begintime"); + public Criteria andHospitalIdGreaterThanOrEqualTo(Long value) { + addCriterion("hospital_id >=", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeLessThan(Long value) { - addCriterion("beginTime <", value, "begintime"); + public Criteria andHospitalIdLessThan(Long value) { + addCriterion("hospital_id <", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeLessThanOrEqualTo(Long value) { - addCriterion("beginTime <=", value, "begintime"); + public Criteria andHospitalIdLessThanOrEqualTo(Long value) { + addCriterion("hospital_id <=", value, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeIn(List values) { - addCriterion("beginTime in", values, "begintime"); + public Criteria andHospitalIdIn(List values) { + addCriterion("hospital_id in", values, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeNotIn(List values) { - addCriterion("beginTime not in", values, "begintime"); + public Criteria andHospitalIdNotIn(List values) { + addCriterion("hospital_id not in", values, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeBetween(Long value1, Long value2) { - addCriterion("beginTime between", value1, value2, "begintime"); + public Criteria andHospitalIdBetween(Long value1, Long value2) { + addCriterion("hospital_id between", value1, value2, "hospitalId"); return (Criteria) this; } - public Criteria andBegintimeNotBetween(Long value1, Long value2) { - addCriterion("beginTime not between", value1, value2, "begintime"); + public Criteria andHospitalIdNotBetween(Long value1, Long value2) { + addCriterion("hospital_id not between", value1, value2, "hospitalId"); return (Criteria) this; } - public Criteria andEndtimeIsNull() { - addCriterion("endTime is null"); + public Criteria andBeginTimeIsNull() { + addCriterion("begin_time is null"); return (Criteria) this; } - public Criteria andEndtimeIsNotNull() { - addCriterion("endTime is not null"); + public Criteria andBeginTimeIsNotNull() { + addCriterion("begin_time is not null"); return (Criteria) this; } - public Criteria andEndtimeEqualTo(Long value) { - addCriterion("endTime =", value, "endtime"); + public Criteria andBeginTimeEqualTo(Long value) { + addCriterion("begin_time =", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeNotEqualTo(Long value) { - addCriterion("endTime <>", value, "endtime"); + public Criteria andBeginTimeNotEqualTo(Long value) { + addCriterion("begin_time <>", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeGreaterThan(Long value) { - addCriterion("endTime >", value, "endtime"); + public Criteria andBeginTimeGreaterThan(Long value) { + addCriterion("begin_time >", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeGreaterThanOrEqualTo(Long value) { - addCriterion("endTime >=", value, "endtime"); + public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { + addCriterion("begin_time >=", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeLessThan(Long value) { - addCriterion("endTime <", value, "endtime"); + public Criteria andBeginTimeLessThan(Long value) { + addCriterion("begin_time <", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeLessThanOrEqualTo(Long value) { - addCriterion("endTime <=", value, "endtime"); + public Criteria andBeginTimeLessThanOrEqualTo(Long value) { + addCriterion("begin_time <=", value, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeIn(List values) { - addCriterion("endTime in", values, "endtime"); + public Criteria andBeginTimeIn(List values) { + addCriterion("begin_time in", values, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeNotIn(List values) { - addCriterion("endTime not in", values, "endtime"); + public Criteria andBeginTimeNotIn(List values) { + addCriterion("begin_time not in", values, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeBetween(Long value1, Long value2) { - addCriterion("endTime between", value1, value2, "endtime"); + public Criteria andBeginTimeBetween(Long value1, Long value2) { + addCriterion("begin_time between", value1, value2, "beginTime"); return (Criteria) this; } - public Criteria andEndtimeNotBetween(Long value1, Long value2) { - addCriterion("endTime not between", value1, value2, "endtime"); + public Criteria andBeginTimeNotBetween(Long value1, Long value2) { + addCriterion("begin_time not between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); return (Criteria) this; } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecord.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecord.java index fb4e4a13..ca75bb38 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecord.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecord.java @@ -12,9 +12,7 @@ public class FirstAidRecord implements Serializable { private String value; - private Long begintime; - - private Long endtime; + private Long beginTime; private Date createdAt; @@ -56,20 +54,12 @@ public class FirstAidRecord implements Serializable { this.value = value == null ? null : value.trim(); } - public Long getBegintime() { - return begintime; - } - - public void setBegintime(Long begintime) { - this.begintime = begintime; - } - - public Long getEndtime() { - return endtime; + public Long getBeginTime() { + return beginTime; } - public void setEndtime(Long endtime) { - this.endtime = endtime; + public void setBeginTime(Long beginTime) { + this.beginTime = beginTime; } public Date getCreatedAt() { @@ -106,8 +96,7 @@ public class FirstAidRecord implements Serializable { sb.append(", firstAidId=").append(firstAidId); sb.append(", type=").append(type); sb.append(", value=").append(value); - sb.append(", begintime=").append(begintime); - sb.append(", endtime=").append(endtime); + sb.append(", beginTime=").append(beginTime); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecordExample.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecordExample.java index e5ca1b76..19b035fb 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecordExample.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecordExample.java @@ -355,123 +355,63 @@ public class FirstAidRecordExample { return (Criteria) this; } - public Criteria andBegintimeIsNull() { - addCriterion("beginTime is null"); + public Criteria andBeginTimeIsNull() { + addCriterion("begin_time is null"); return (Criteria) this; } - public Criteria andBegintimeIsNotNull() { - addCriterion("beginTime is not null"); + public Criteria andBeginTimeIsNotNull() { + addCriterion("begin_time is not null"); return (Criteria) this; } - public Criteria andBegintimeEqualTo(Long value) { - addCriterion("beginTime =", value, "begintime"); + public Criteria andBeginTimeEqualTo(Long value) { + addCriterion("begin_time =", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeNotEqualTo(Long value) { - addCriterion("beginTime <>", value, "begintime"); + public Criteria andBeginTimeNotEqualTo(Long value) { + addCriterion("begin_time <>", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeGreaterThan(Long value) { - addCriterion("beginTime >", value, "begintime"); + public Criteria andBeginTimeGreaterThan(Long value) { + addCriterion("begin_time >", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeGreaterThanOrEqualTo(Long value) { - addCriterion("beginTime >=", value, "begintime"); + public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { + addCriterion("begin_time >=", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeLessThan(Long value) { - addCriterion("beginTime <", value, "begintime"); + public Criteria andBeginTimeLessThan(Long value) { + addCriterion("begin_time <", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeLessThanOrEqualTo(Long value) { - addCriterion("beginTime <=", value, "begintime"); + public Criteria andBeginTimeLessThanOrEqualTo(Long value) { + addCriterion("begin_time <=", value, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeIn(List values) { - addCriterion("beginTime in", values, "begintime"); + public Criteria andBeginTimeIn(List values) { + addCriterion("begin_time in", values, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeNotIn(List values) { - addCriterion("beginTime not in", values, "begintime"); + public Criteria andBeginTimeNotIn(List values) { + addCriterion("begin_time not in", values, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeBetween(Long value1, Long value2) { - addCriterion("beginTime between", value1, value2, "begintime"); + public Criteria andBeginTimeBetween(Long value1, Long value2) { + addCriterion("begin_time between", value1, value2, "beginTime"); return (Criteria) this; } - public Criteria andBegintimeNotBetween(Long value1, Long value2) { - addCriterion("beginTime not between", value1, value2, "begintime"); - return (Criteria) this; - } - - public Criteria andEndtimeIsNull() { - addCriterion("endTime is null"); - return (Criteria) this; - } - - public Criteria andEndtimeIsNotNull() { - addCriterion("endTime is not null"); - return (Criteria) this; - } - - public Criteria andEndtimeEqualTo(Long value) { - addCriterion("endTime =", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeNotEqualTo(Long value) { - addCriterion("endTime <>", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeGreaterThan(Long value) { - addCriterion("endTime >", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeGreaterThanOrEqualTo(Long value) { - addCriterion("endTime >=", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeLessThan(Long value) { - addCriterion("endTime <", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeLessThanOrEqualTo(Long value) { - addCriterion("endTime <=", value, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeIn(List values) { - addCriterion("endTime in", values, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeNotIn(List values) { - addCriterion("endTime not in", values, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeBetween(Long value1, Long value2) { - addCriterion("endTime between", value1, value2, "endtime"); - return (Criteria) this; - } - - public Criteria andEndtimeNotBetween(Long value1, Long value2) { - addCriterion("endTime not between", value1, value2, "endtime"); + public Criteria andBeginTimeNotBetween(Long value1, Long value2) { + addCriterion("begin_time not between", value1, value2, "beginTime"); return (Criteria) this; } diff --git a/wisdomcar/src/main/resources/mapper_raw/FirstAidMapper.xml b/wisdomcar/src/main/resources/mapper_raw/FirstAidMapper.xml index 985b1dee..a8a0b65b 100644 --- a/wisdomcar/src/main/resources/mapper_raw/FirstAidMapper.xml +++ b/wisdomcar/src/main/resources/mapper_raw/FirstAidMapper.xml @@ -4,8 +4,9 @@ - - + + + @@ -69,7 +70,7 @@ - id, car_id, beginTime, endTime, created_at, updated_at, rec_status + id, car_id, hospital_id, begin_time, end_time, created_at, updated_at, rec_status select @@ -105,13 +104,11 @@ insert into t_first_aid_record (id, first_aid_id, type, - value, beginTime, endTime, - created_at, updated_at, rec_status - ) + value, begin_time, created_at, + updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{firstAidId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, - #{value,jdbcType=VARCHAR}, #{begintime,jdbcType=BIGINT}, #{endtime,jdbcType=BIGINT}, - #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} - ) + #{value,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) insert into t_first_aid_record @@ -128,11 +125,8 @@ value, - - beginTime, - - - endTime, + + begin_time, created_at, @@ -157,11 +151,8 @@ #{value,jdbcType=VARCHAR}, - - #{begintime,jdbcType=BIGINT}, - - - #{endtime,jdbcType=BIGINT}, + + #{beginTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, @@ -195,11 +186,8 @@ value = #{record.value,jdbcType=VARCHAR}, - - beginTime = #{record.begintime,jdbcType=BIGINT}, - - - endTime = #{record.endtime,jdbcType=BIGINT}, + + begin_time = #{record.beginTime,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -221,8 +209,7 @@ first_aid_id = #{record.firstAidId,jdbcType=BIGINT}, type = #{record.type,jdbcType=TINYINT}, value = #{record.value,jdbcType=VARCHAR}, - beginTime = #{record.begintime,jdbcType=BIGINT}, - endTime = #{record.endtime,jdbcType=BIGINT}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -242,11 +229,8 @@ value = #{value,jdbcType=VARCHAR}, - - beginTime = #{begintime,jdbcType=BIGINT}, - - - endTime = #{endtime,jdbcType=BIGINT}, + + begin_time = #{beginTime,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -265,8 +249,7 @@ set first_aid_id = #{firstAidId,jdbcType=BIGINT}, type = #{type,jdbcType=TINYINT}, value = #{value,jdbcType=VARCHAR}, - beginTime = #{begintime,jdbcType=BIGINT}, - endTime = #{endtime,jdbcType=BIGINT}, + begin_time = #{beginTime,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}