From 447943c12cb90c5af600ec97cfd73b919a7f89d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <2405973191@qq.com> Date: Sat, 24 Aug 2024 01:02:30 +0800 Subject: [PATCH] jx-03 --- .../DriveSchoolTeachingJournalController.java | 25 +-- .../yudao/module/jx/core/page/BaseEntity.java | 31 ++-- .../module/jx/domain/DriveContractTest.java | 42 +---- .../module/jx/domain/DriveSchoolCar.java | 161 ------------------ .../module/jx/domain/DriveSchoolCheck.java | 111 ------------ .../module/jx/domain/DriveSchoolContract.java | 60 ------- .../module/jx/domain/DriveSchoolDeduct.java | 51 ------ .../module/jx/domain/DriveSchoolDial.java | 70 -------- .../module/jx/domain/DriveSchoolDynamic.java | 63 +------ .../module/jx/domain/DriveSchoolExamPass.java | 151 ---------------- .../module/jx/domain/DriveSchoolFacility.java | 2 - .../module/jx/domain/DriveSchoolFile.java | 41 ----- .../jx/domain/DriveSchoolInsurance.java | 81 --------- .../module/jx/domain/DriveSchoolNews.java | 63 +------ .../module/jx/domain/DriveSchoolNotice.java | 53 +----- .../module/jx/domain/DriveSchoolPhone.java | 63 +------ .../jx/domain/DriveSchoolReimbursement.java | 73 +------- .../module/jx/domain/DriveSchoolSeparate.java | 51 ------ .../jx/domain/DriveSchoolTeachingJournal.java | 73 ++------ .../yudao/module/jx/dto/RegionDto.java | 46 +---- .../DriveSchoolTeachingJournalMapper.java | 6 +- .../jx/payment/entity/DriveSchoolBooking.java | 67 +------- .../jx/payment/entity/DriveSchoolPay.java | 127 -------------- .../IDriveSchoolTeachingJournalService.java | 5 +- ...DriveSchoolTeachingJournalServiceImpl.java | 13 +- .../mapper/jx/DriveCarBindMapper.xml | 14 +- .../mapper/jx/DriveContractTestMapper.xml | 14 +- .../mapper/jx/DriveSchoolCarMapper.xml | 12 +- .../mapper/jx/DriveSchoolCarRepairMapper.xml | 14 +- .../mapper/jx/DriveSchoolCheckMapper.xml | 14 +- .../mapper/jx/DriveSchoolCoachMapper.xml | 14 +- .../mapper/jx/DriveSchoolContractMapper.xml | 14 +- .../mapper/jx/DriveSchoolCourseMapper.xml | 14 +- .../jx/DriveSchoolCourseOrderMapper.xml | 14 +- .../jx/DriveSchoolCredentialsMapper.xml | 14 +- .../jx/DriveSchoolDailyManagementMapper.xml | 14 +- .../mapper/jx/DriveSchoolDeductMapper.xml | 14 +- .../mapper/jx/DriveSchoolDialMapper.xml | 14 +- .../mapper/jx/DriveSchoolDynamicMapper.xml | 14 +- .../mapper/jx/DriveSchoolExamPassMapper.xml | 18 +- .../mapper/jx/DriveSchoolFacilityMapper.xml | 14 +- .../mapper/jx/DriveSchoolFileMapper.xml | 14 +- .../mapper/jx/DriveSchoolInfoMapper.xml | 18 +- .../mapper/jx/DriveSchoolInsuranceMapper.xml | 14 +- .../mapper/jx/DriveSchoolNewsMapper.xml | 14 +- .../mapper/jx/DriveSchoolNoticeMapper.xml | 14 +- .../mapper/jx/DriveSchoolPhoneMapper.xml | 14 +- .../jx/DriveSchoolReimbursementMapper.xml | 14 +- .../jx/DriveSchoolReservationCourseMapper.xml | 14 +- .../mapper/jx/DriveSchoolSeparateMapper.xml | 14 +- .../mapper/jx/DriveSchoolSwiperMapper.xml | 14 +- .../jx/DriveSchoolTeachingJournalMapper.xml | 25 +-- .../mapper/jx/DriveSchoolTextMapper.xml | 14 +- .../mapper/jx/DriveSchoolUpkeepMapper.xml | 14 +- .../resources/mapper/jx/SopeNessMapper.xml | 14 +- 55 files changed, 290 insertions(+), 1676 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java index cc02956d..e0550e72 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java @@ -6,6 +6,9 @@ import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.service.IDriveSchoolTeachingJournalService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,24 +32,24 @@ public class DriveSchoolTeachingJournalController extends BaseController * 查询教学日志列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolTeachingJournal driveSchoolTeachingJournal) + public CommonResult> list(DriveSchoolTeachingJournal driveSchoolTeachingJournal) { - startPage(); - List list = driveSchoolTeachingJournalService.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal); - return getDataTable(list); + Page page = new Page<>(driveSchoolTeachingJournal.getPageNum(), driveSchoolTeachingJournal.getPageSize()); + return success(driveSchoolTeachingJournalService.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal,page)); } /** * 导出教学日志列表 */ //@Log(title = "教学日志", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolTeachingJournal driveSchoolTeachingJournal) - { - List list = driveSchoolTeachingJournalService.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal); - ExcelUtil util = new ExcelUtil(DriveSchoolTeachingJournal.class); - util.exportExcel(response, list, "教学日志数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolTeachingJournal driveSchoolTeachingJournal) +// { +// Page page = new Page<>(driveSchoolTeachingJournal.getPageNum(), driveSchoolTeachingJournal.getPageSize()); +// List list = driveSchoolTeachingJournalService.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal,page); +// ExcelUtil util = new ExcelUtil(DriveSchoolTeachingJournal.class); +// util.exportExcel(response, list, "教学日志数据"); +// } /** * 获取教学日志详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java index f2ae17eb..e3a57c84 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -16,6 +17,7 @@ import java.util.Map; * * @author ruoyi */ +@Data public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -26,7 +28,7 @@ public class BaseEntity implements Serializable private String searchValue; /** 创建者 */ - private String createBy; + private String creator; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -34,7 +36,13 @@ public class BaseEntity implements Serializable private Date createTime; /** 更新者 */ - private String updateBy; + private String updater; + + /** 当前记录起始索引 */ + private Integer pageNum; + + /** 每页显示记录数 */ + private Integer pageSize; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -59,15 +67,6 @@ public class BaseEntity implements Serializable this.searchValue = searchValue; } - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } public Date getCreateTime() { @@ -79,16 +78,6 @@ public class BaseEntity implements Serializable this.createTime = createTime; } - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - public Date getUpdateTime() { return updateTime; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java index efe9a3ae..8a42f40c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-25 */ +@Data public class DriveContractTest extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,44 +28,4 @@ public class DriveContractTest extends BaseEntity @Excel(name = "合同内容") private String content; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("content", getContent()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java index a00ee32a..909777f6 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java @@ -89,165 +89,4 @@ public class DriveSchoolCar extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "二维日期", width = 30, dateFormat = "yyyy-MM-dd") private Date repairDate; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setBrand(String brand) - { - this.brand = brand; - } - - public String getBrand() - { - return brand; - } - public void setCarModel(String carModel) - { - this.carModel = carModel; - } - - public String getCarModel() - { - return carModel; - } - public void setCarNo(String carNo) - { - this.carNo = carNo; - } - - public String getCarNo() - { - return carNo; - } - public void setCarPhoto(String carPhoto) - { - this.carPhoto = carPhoto; - } - - public String getCarPhoto() - { - return carPhoto; - } - public void setCarRegisterDate(Date carRegisterDate) - { - this.carRegisterDate = carRegisterDate; - } - - public Date getCarRegisterDate() - { - return carRegisterDate; - } - public void setInspectionDate(Date inspectionDate) - { - this.inspectionDate = inspectionDate; - } - - public Date getInspectionDate() - { - return inspectionDate; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setUserPhone(String userPhone) - { - this.userPhone = userPhone; - } - - public String getUserPhone() - { - return userPhone; - } - public void setCarBlong(String carBlong) - { - this.carBlong = carBlong; - } - - public String getCarBlong() - { - return carBlong; - } - public void setDrivingLicence(String drivingLicence) - { - this.drivingLicence = drivingLicence; - } - - public String getDrivingLicence() - { - return drivingLicence; - } - public void setOperationCertificate(String operationCertificate) - { - this.operationCertificate = operationCertificate; - } - - public String getOperationCertificate() - { - return operationCertificate; - } - public void setOutlineDate(Date outlineDate) - { - this.outlineDate = outlineDate; - } - - public Date getOutlineDate() - { - return outlineDate; - } - public void setRepairDate(Date repairDate) - { - this.repairDate = repairDate; - } - - public Date getRepairDate() - { - return repairDate; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("brand", getBrand()) - .append("carModel", getCarModel()) - .append("carNo", getCarNo()) - .append("carPhoto", getCarPhoto()) - .append("carRegisterDate", getCarRegisterDate()) - .append("inspectionDate", getInspectionDate()) - .append("userName", getUserName()) - .append("userPhone", getUserPhone()) - .append("carBlong", getCarBlong()) - .append("drivingLicence", getDrivingLicence()) - .append("operationCertificate", getOperationCertificate()) - .append("outlineDate", getOutlineDate()) - .append("repairDate", getRepairDate()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java index 2018a0eb..0acb78b5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java @@ -67,115 +67,4 @@ public class DriveSchoolCheck extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "报名日期") private Date checkTime; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setCarId(Long carId) - { - this.carId = carId; - } - - public Long getCarId() - { - return carId; - } - public void setCarNo(String carNo) - { - this.carNo = carNo; - } - - public String getCarNo() - { - return carNo; - } - public void setProblem(String problem) - { - this.problem = problem; - } - - public String getProblem() - { - return problem; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setMoney(BigDecimal money) - { - this.money = money; - } - - public BigDecimal getMoney() - { - return money; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("phone", getPhone()) - .append("carId", getCarId()) - .append("carNo", getCarNo()) - .append("problem", getProblem()) - .append("content", getContent()) - .append("money", getMoney()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java index 37618b30..95d44676 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java @@ -35,64 +35,4 @@ public class DriveSchoolContract extends BaseEntity private String userName; private String address; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("content", getContent()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("userName", getUserName()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java index 2bcb342a..850865bc 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java @@ -34,55 +34,4 @@ public class DriveSchoolDeduct extends BaseEntity /** 科目 */ @Excel(name = "科目") private String courseSubject; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setDeduct(BigDecimal deduct) - { - this.deduct = deduct; - } - - public BigDecimal getDeduct() - { - return deduct; - } - public void setCourseSubject(String courseSubject) - { - this.courseSubject = courseSubject; - } - - public String getCourseSubject() - { - return courseSubject; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("deduct", getDeduct()) - .append("courseSubject", getCourseSubject()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java index 15751a22..e818fa32 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java @@ -44,74 +44,4 @@ public class DriveSchoolDial extends BaseEntity @Excel(name = "来源") private String type; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setTitle(String title) - { - this.title = title; - } - - public String getTitle() - { - return title; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setPhoto(String photo) - { - this.photo = photo; - } - - public String getPhoto() - { - return photo; - } - public void setType(String type) - { - this.type = type; - } - - public String getType() - { - return type; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("title", getTitle()) - .append("content", getContent()) - .append("photo", getPhoto()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("type", getType()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java index e3173f17..466304f6 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-10 */ +@Data public class DriveSchoolDynamic extends BaseEntity { private static final long serialVersionUID = 1L; @@ -34,65 +36,4 @@ public class DriveSchoolDynamic extends BaseEntity /** 内容 */ @Excel(name = "内容") private String content; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setCover(String cover) - { - this.cover = cover; - } - - public String getCover() - { - return cover; - } - public void setTitle(String title) - { - this.title = title; - } - - public String getTitle() - { - return title; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("cover", getCover()) - .append("title", getTitle()) - .append("content", getContent()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java index f07681e0..f387f61c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java @@ -107,155 +107,4 @@ public class DriveSchoolExamPass extends BaseEntity /** 考试通过截图 */ @Excel(name = "考试通过截图") private String photo; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setJxId(Long jxId) - { - this.jxId = jxId; - } - - public Long getJxId() - { - return jxId; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setJlId(Long jlId) - { - this.jlId = jlId; - } - - public Long getJlId() - { - return jlId; - } - public void setCourseSubject(String courseSubject) - { - this.courseSubject = courseSubject; - } - - public String getCourseSubject() - { - return courseSubject; - } - public void setJlName(String jlName) - { - this.jlName = jlName; - } - - public String getJlName() - { - return jlName; - } - public void setDeduct(BigDecimal deduct) - { - this.deduct = deduct; - } - - public BigDecimal getDeduct() - { - return deduct; - } - public void setPayTime(Date payTime) - { - this.payTime = payTime; - } - - public Date getPayTime() - { - return payTime; - } - public void setCourseId(Long courseId) - { - this.courseId = courseId; - } - - public Long getCourseId() - { - return courseId; - } - public void setCoursePrice(BigDecimal coursePrice) - { - this.coursePrice = coursePrice; - } - - public BigDecimal getCoursePrice() - { - return coursePrice; - } - public void setOrderNumber(String orderNumber) - { - this.orderNumber = orderNumber; - } - - public String getOrderNumber() - { - return orderNumber; - } - public void setPhoto(String photo) - { - this.photo = photo; - } - - public String getPhoto() - { - return photo; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("jxId", getJxId()) - .append("name", getName()) - .append("phone", getPhone()) - .append("userId", getUserId()) - .append("jlId", getJlId()) - .append("courseSubject", getCourseSubject()) - .append("jlName", getJlName()) - .append("deduct", getDeduct()) - .append("payTime", getPayTime()) - .append("courseId", getCourseId()) - .append("coursePrice", getCoursePrice()) - .append("orderNumber", getOrderNumber()) - .append("photo", getPhoto()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java index 3e4b41ee..8a957073 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java @@ -68,6 +68,4 @@ public class DriveSchoolFacility extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "年检时间") private Date yearcheckTime; - - } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java index d1f9e741..ffe9647c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java @@ -28,45 +28,4 @@ public class DriveSchoolFile extends BaseEntity /** 上传PDF */ @Excel(name = "上传PDF") private String fileAddress; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setFileType(String fileType) - { - this.fileType = fileType; - } - - public String getFileType() - { - return fileType; - } - public void setFileAddress(String fileAddress) - { - this.fileAddress = fileAddress; - } - - public String getFileAddress() - { - return fileAddress; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("fileType", getFileType()) - .append("fileAddress", getFileAddress()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java index 0884f3aa..84b75413 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java @@ -57,85 +57,4 @@ public class DriveSchoolInsurance extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "保险到期时间", width = 30, dateFormat = "yyyy-MM-dd") private Date insuranceTime; - - public String getCarNo() { - return carNo; - } - - public void setCarNo(String carNo) { - this.carNo = carNo; - } - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setCarId(Long carId) - { - this.carId = carId; - } - - public Long getCarId() - { - return carId; - } - public void setCompany(String company) - { - this.company = company; - } - - public String getCompany() - { - return company; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setMoney(BigDecimal money) - { - this.money = money; - } - - public BigDecimal getMoney() - { - return money; - } - public void setInsuranceTime(Date insuranceTime) - { - this.insuranceTime = insuranceTime; - } - - public Date getInsuranceTime() - { - return insuranceTime; - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java index 20ed9f9c..f364ff8d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-10 */ +@Data public class DriveSchoolNews extends BaseEntity { private static final long serialVersionUID = 1L; @@ -34,65 +36,4 @@ public class DriveSchoolNews extends BaseEntity /** 内容 */ @Excel(name = "内容") private String content; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setCover(String cover) - { - this.cover = cover; - } - - public String getCover() - { - return cover; - } - public void setTitle(String title) - { - this.title = title; - } - - public String getTitle() - { - return title; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("cover", getCover()) - .append("title", getTitle()) - .append("content", getContent()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java index 1724e392..cad348c7 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-28 */ +@Data public class DriveSchoolNotice extends BaseEntity { private static final long serialVersionUID = 1L; @@ -30,55 +32,4 @@ public class DriveSchoolNotice extends BaseEntity /** 内容 */ @Excel(name = "内容") private String content; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setTitle(String title) - { - this.title = title; - } - - public String getTitle() - { - return title; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("title", getTitle()) - .append("content", getContent()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java index c2650c89..01947cde 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-10 */ +@Data public class DriveSchoolPhone extends BaseEntity { private static final long serialVersionUID = 1L; @@ -34,65 +36,4 @@ public class DriveSchoolPhone extends BaseEntity /** 客服电话 */ @Excel(name = "客服电话") private String phone; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("phone", getPhone()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java index 8c57758e..d4c3dce9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-19 */ +@Data public class DriveSchoolReimbursement extends BaseEntity { private static final long serialVersionUID = 1L; @@ -38,75 +40,4 @@ public class DriveSchoolReimbursement extends BaseEntity /** 审核状态 */ @Excel(name = "审核状态") private String state; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setState(String state) - { - this.state = state; - } - - public String getState() - { - return state; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("content", getContent()) - .append("state", getState()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java index 93b05ef1..5d78015d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java @@ -32,55 +32,4 @@ public class DriveSchoolSeparate extends BaseEntity /** 分账金额 */ @Excel(name = "分账金额") private Double money; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getDeptName() - { - return deptName; - } - public void setMoney(Double money) - { - this.money = money; - } - - public Double getMoney() - { - return money; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("money", getMoney()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java index 47c2623d..9de5e78e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,7 +15,14 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2024-05-19 */ -public class DriveSchoolTeachingJournal extends BaseEntity +@TableName("drive_school_teaching_journal") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DriveSchoolTeachingJournal extends TenantBaseDO { private static final long serialVersionUID = 1L; @@ -35,64 +45,11 @@ public class DriveSchoolTeachingJournal extends BaseEntity @Excel(name = "日志内容") private String content; - public void setId(Long id) - { - this.id = id; - } + /** 当前记录起始索引 */ + private Integer pageNum; - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } + /** 每页显示记录数 */ + private Integer pageSize; - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - public Long getUserId() - { - return userId; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("content", getContent()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/dto/RegionDto.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/dto/RegionDto.java index 1bdaf753..f15d3369 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/dto/RegionDto.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/dto/RegionDto.java @@ -1,10 +1,13 @@ package cn.iocoder.yudao.module.jx.dto; +import lombok.Data; + import java.util.List; /** * 地区实体类 * */ +@Data public class RegionDto { private Integer id; @@ -20,47 +23,4 @@ public class RegionDto { private List city; private List region; - - public Integer getId(){ - return id; - } - public void setId(Integer id){ - this.id=id; - } - public String getName(){ - return name; - } - public void setName(String name){ - this.name=name; - } - public Integer getPid(){ - return pid; - } - public void setPid(Integer pid){ - this.pid=pid; - } - public String getCode(){ - return code; - } - public void setCode(String code){ - this.code=code; - } - public String getLevel(){ - return level; - } - public void setLevel(String level){ - this.level=level; - } - public List getCity() { - return city; - } - public void setCity(List city) { - this.city = city; - } - public List getRegion() { - return region; - } - public void setRegion(List region) { - this.region = region; - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTeachingJournalMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTeachingJournalMapper.java index 1359fb03..cbbdb638 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTeachingJournalMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTeachingJournalMapper.java @@ -2,7 +2,11 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +33,7 @@ public interface DriveSchoolTeachingJournalMapper * @param driveSchoolTeachingJournal 教学日志 * @return 教学日志集合 */ - public List selectDriveSchoolTeachingJournalList(DriveSchoolTeachingJournal driveSchoolTeachingJournal); + public IPage selectDriveSchoolTeachingJournalList(@Param("entity") DriveSchoolTeachingJournal driveSchoolTeachingJournal, Page page); /** * 新增教学日志 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java index 11e2d4af..dfc8bd45 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.payment.entity; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.module.jx.core.page.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +15,7 @@ import java.util.Date; * @author ruoyi * @date 2024-04-25 */ +@Data public class DriveSchoolBooking extends BaseEntity { private static final long serialVersionUID = 1L; @@ -38,69 +40,4 @@ public class DriveSchoolBooking extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "预约日期", width = 30, dateFormat = "yyyy-MM-dd") private Date bookingTime; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setJlId(Long jlId) - { - this.jlId = jlId; - } - - public Long getJlId() - { - return jlId; - } - public void setJxId(Long jxId) - { - this.jxId = jxId; - } - - public Long getJxId() - { - return jxId; - } - public void setIsMorning(Long isMorning) - { - this.isMorning = isMorning; - } - - public Long getIsMorning() - { - return isMorning; - } - public void setBookingTime(Date bookingTime) - { - this.bookingTime = bookingTime; - } - - public Date getBookingTime() - { - return bookingTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("jlId", getJlId()) - .append("jxId", getJxId()) - .append("isMorning", getIsMorning()) - .append("bookingTime", getBookingTime()) - .toString(); - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java index 8c169813..b64a4c97 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java @@ -174,131 +174,4 @@ public class DriveSchoolPay extends BaseEntity private DriveSchoolCourse driveSchoolCourse; -// public void setId(Long id) -// { -// this.id = id; -// } -// -// public Long getId() -// { -// return id; -// } -// public void setName(String name) -// { -// this.name = name; -// } -// -// public String getName() -// { -// return name; -// } -// public void setPhone(String phone) -// { -// this.phone = phone; -// } -// -// public String getPhone() -// { -// return phone; -// } -// public void setIdentity(String identity) -// { -// this.identity = identity; -// } -// -// public String getIdentity() -// { -// return identity; -// } -// public void setState(Long state) -// { -// this.state = state; -// } -// -// public Long getState() -// { -// return state; -// } -// public void setUserId(Long userId) -// { -// this.userId = userId; -// } -// -// public Long getUserId() -// { -// return userId; -// } -// public void setJlId(Long jlId) -// { -// this.jlId = jlId; -// } -// -// public Long getJlId() -// { -// return jlId; -// } -// public void setJxId(Long jxId) -// { -// this.jxId = jxId; -// } -// -// public Long getJxId() -// { -// return jxId; -// } -// public void setCourseId(Long courseId) -// { -// this.courseId = courseId; -// } -// -// public Long getCourseId() -// { -// return courseId; -// } -// public void setStartPay(Long startPay) -// { -// this.startPay = startPay; -// } -// -// public Long getStartPay() -// { -// return startPay; -// } -// public void setOrderNumber(String orderNumber) -// { -// this.orderNumber = orderNumber; -// } -// -// public String getOrderNumber() -// { -// return orderNumber; -// } -// public void setAfternoon(Long afternoon) -// { -// this.afternoon = afternoon; -// } -// -// public Long getAfternoon() -// { -// return afternoon; -// } -// -// @Override -// public String toString() { -// return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -// .append("id", getId()) -// .append("name", getName()) -// .append("phone", getPhone()) -// .append("identity", getIdentity()) -// .append("state", getState()) -// .append("userId", getUserId()) -// .append("jlId", getJlId()) -// .append("jxId", getJxId()) -// .append("courseId", getCourseId()) -// .append("startPay", getStartPay()) -// .append("createTime", getCreateTime()) -// .append("orderNumber", getOrderNumber()) -// .append("afternoon", getAfternoon()) -// .toString(); -// } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTeachingJournalService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTeachingJournalService.java index f147bb14..74508951 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTeachingJournalService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTeachingJournalService.java @@ -1,6 +1,9 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +29,7 @@ public interface IDriveSchoolTeachingJournalService * @param driveSchoolTeachingJournal 教学日志 * @return 教学日志集合 */ - public List selectDriveSchoolTeachingJournalList(DriveSchoolTeachingJournal driveSchoolTeachingJournal); + public IPage selectDriveSchoolTeachingJournalList(DriveSchoolTeachingJournal driveSchoolTeachingJournal, Page page); /** * 新增教学日志 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTeachingJournalServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTeachingJournalServiceImpl.java index 88be3ee5..6b2051f2 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTeachingJournalServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTeachingJournalServiceImpl.java @@ -7,7 +7,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolTeachingJournalMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolTeachingJournalService; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,13 +54,11 @@ public class DriveSchoolTeachingJournalServiceImpl implements IDriveSchoolTeachi * @return 教学日志 */ @Override - public List selectDriveSchoolTeachingJournalList(DriveSchoolTeachingJournal driveSchoolTeachingJournal) + public IPage selectDriveSchoolTeachingJournalList(DriveSchoolTeachingJournal driveSchoolTeachingJournal, Page page) { - Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); + Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); driveSchoolTeachingJournal.setDeptId(deptId); - return driveSchoolTeachingJournalMapper.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal); + return driveSchoolTeachingJournalMapper.selectDriveSchoolTeachingJournalList(driveSchoolTeachingJournal,page); } /** @@ -92,7 +91,7 @@ public class DriveSchoolTeachingJournalServiceImpl implements IDriveSchoolTeachi @Override public int updateDriveSchoolTeachingJournal(DriveSchoolTeachingJournal driveSchoolTeachingJournal) { - driveSchoolTeachingJournal.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolTeachingJournal.setUpdateTime(DateUtils.getNowDate()); return driveSchoolTeachingJournalMapper.updateDriveSchoolTeachingJournal(driveSchoolTeachingJournal); } diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml index 7a813b6e..d5cb1da7 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml @@ -12,13 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, car_id, drive_school_coach_id, user_name, drive_license, create_time, create_by, update_time, update_by from drive_car_bind + select id, dept_id, car_id, drive_school_coach_id, user_name, drive_license, create_time, creator, update_time, updater from drive_car_bind @@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, content, create_time, - create_by, + creator, update_time, - update_by, + updater, #{deptId}, @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, content = #{content}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml index 7248cc39..56f14cc3 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outline_date, repair_date, create_time, - create_by, + creator, update_time, - update_by, + updater, baoxian_sttime, baoxian_entime, company, @@ -130,9 +130,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outline_date = #{outlineDate}, repair_date = #{repairDate}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, baoxian_sttime = #{baoxianSttime}, baoxian_entime = #{baoxianEntime}, company = #{company}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml index 4a47b76e..0cb15a6d 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml @@ -16,9 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, out_time,carBian,photo,carExpert,carCheck,carExchange,carRepaired,carRepair,carLong,carsId,dept_id, user_id, car_id,car_no, user_name,problem, content, money, create_time, create_by, update_time, update_by from drive_school_car_repair + select id, out_time,carBian,photo,carExpert,carCheck,carExchange,carRepaired,carRepair,carLong,carsId,dept_id, user_id, car_id,car_no, user_name,problem, content, money, create_time, creator, update_time, updater from drive_school_car_repair @@ -64,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, money, create_time, - create_by, + creator, update_time, - update_by, + updater, checkTime, @@ -104,9 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, money = #{money}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, checkTime = #{checkTime}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml index 2f1cfb08..2aa5bcb1 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml @@ -21,16 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id,address, carId,indenty,dept_id, image, drive_license,instructor_name, phone, student,age, sex, average_star, experience_year, instructor_desc, driving_year, drive_card_type,subject_type, create_time, create_by, update_time, update_by from drive_school_coach + select id,address, carId,indenty,dept_id, image, drive_license,instructor_name, phone, student,age, sex, average_star, experience_year, instructor_desc, driving_year, drive_card_type,subject_type, create_time, creator, update_time, updater from drive_school_coach @@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id, content, create_time, - create_by, + creator, update_time, - update_by, + updater, user_name, @@ -68,9 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id = #{userId}, content = #{content}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, user_name = #{userName}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseMapper.xml index 01389c22..2c5e25bb 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseMapper.xml @@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, favour,type, name, automatic, license, day_start, day_end, price,reserve_money, photo, describ, create_time, create_by, update_time, update_by from drive_school_course + select id, dept_id, favour,type, name, automatic, license, day_start, day_end, price,reserve_money, photo, describ, create_time, creator, update_time, updater from drive_school_course @@ -70,9 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rest_money, payment_status, create_time, - create_by, + creator, update_time, - update_by, + updater, #{orderNo}, @@ -112,9 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rest_money = #{restMoney}, payment_status = #{paymentStatus}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml index bb4fedf5..de41eacc 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml @@ -20,16 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, school_name, business_license_number, legal_representative, legal_id_number, bank_account_name, bank_account_number, bank_name, bank_branch, license_issue_date, license_expiry_date, registration_certificate_number, registration_certificate_issue_date, registration_certificate_expiry_date, create_time, create_by, update_time, update_by, filing_cover, business_icense_cover, dept_id from drive_school_credentials + select id, school_name, business_license_number, legal_representative, legal_id_number, bank_account_name, bank_account_number, bank_name, bank_branch, license_issue_date, license_expiry_date, registration_certificate_number, registration_certificate_issue_date, registration_certificate_expiry_date, create_time, creator, update_time, updater, filing_cover, business_icense_cover, dept_id from drive_school_credentials @@ -56,9 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instructor_log, permission_control, create_time, - create_by, + creator, update_time, - update_by, + updater, dept_id, log_type, @@ -90,9 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instructor_log = #{instructorLog}, permission_control = #{permissionControl}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, dept_id = #{deptId}, log_type = #{logType}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml index 8b546a2e..ef380778 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml @@ -10,13 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, deduct, course_subject, create_time, create_by, update_time, update_by from drive_school_deduct + select id, dept_id, deduct, course_subject, create_time, creator, update_time, updater from drive_school_deduct @@ -49,9 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, photo, create_time, - create_by, + creator, update_time, - update_by, + updater, type, jlId, name, @@ -79,9 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, photo = #{photo}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, type = #{type}, jlId = #{jlId}, type = #{name}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml index 490ac06c..42d7f2a0 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml @@ -10,14 +10,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, cover, title, content, create_by, create_time, update_by, update_time from drive_school_dynamic + select id, dept_id, cover, title, content, creator, create_time, updater, update_time from drive_school_dynamic @@ -76,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber, photo, create_time, - create_by, + creator, update_time, - update_by, + updater, status, @@ -122,9 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber = #{orderNumber}, photo = #{photo}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, status = #{status}, where id = #{id} @@ -239,9 +239,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber = #{orderNumber}, photo = #{photo}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, status = #{status}, where jlId = #{jlId} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml index b0544a86..f04e28a4 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select phone,price,byinTime,yearcheckTime,id, dept_id, facility_name, facility_number, facility_des, create_time, create_by, update_time, update_by, location, land_leasing_company, equipment_list_cover, custodian from drive_school_facility + select phone,price,byinTime,yearcheckTime,id, dept_id, facility_name, facility_number, facility_des, create_time, creator, update_time, updater, location, land_leasing_company, equipment_list_cover, custodian from drive_school_facility @@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, file_address, create_time, - create_by, + creator, update_time, - update_by, + updater, #{fileType}, @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, file_address = #{fileAddress}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml index 73b65b2a..c2e43627 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml @@ -18,9 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,14 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, school_name,leader_name, region, phone, photo, announcement, address, lat, lgt, business_start_time, business_end_time,sort, create_time, create_by, update_time, update_by from drive_school_info + select id, dept_id, school_name,leader_name, region, phone, photo, announcement, address, lat, lgt, business_start_time, business_end_time,sort, create_time, creator, update_time, updater from drive_school_info @@ -61,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money, insurance_time, create_time, - create_by, + creator, update_time, - update_by, + updater, #{deptId}, @@ -97,9 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money = #{money}, insurance_time = #{insuranceTime}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml index c66c469f..88a706ef 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml @@ -10,14 +10,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, cover, title, content, create_by, create_time, update_by, update_time from drive_school_news + select id, dept_id, cover, title, content, creator, create_time, updater, update_time from drive_school_news @@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title, content, create_time, - create_by, + creator, update_time, - update_by, + updater, #{deptId}, @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title = #{title}, content = #{content}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml index 5a652bd2..3533abe5 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml @@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, user_id, user_name, phone, create_time, create_by, update_time, update_by from drive_school_phone + select id, dept_id, user_id, user_name, phone, create_time, creator, update_time, updater from drive_school_phone @@ -48,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, state, create_time, - create_by, + creator, update_time, - update_by, + updater, #{id}, @@ -75,9 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, state = #{state}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml index 59fb980e..c76f39be 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml @@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, dept_id, user_id,type, user_name,drive_time,stu_sign_state,coach_sign_state,stu_signin_time, stu_signout_time,coach_signin_time,coach_signout_time,order_time, time_period, coach_id, coach_name, account_type, create_time, create_by, update_time, update_by from drive_school_reservation_course + select id, dept_id, user_id,type, user_name,drive_time,stu_sign_state,coach_sign_state,stu_signin_time, stu_signout_time,coach_signin_time,coach_signout_time,order_time, time_period, coach_id, coach_name, account_type, create_time, creator, update_time, updater from drive_school_reservation_course @@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name, money, create_time, - create_by, + creator, update_time, - update_by, + updater, #{deptId}, @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name = #{deptName}, money = #{money}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml index 810c2937..ee009226 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml @@ -11,14 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, swiper_name, dept_id,swiper_picture, jump_url, list_order, create_by, create_time, update_by, update_time from drive_school_swiper + select id, swiper_name, dept_id,swiper_picture, jump_url, list_order, creator, create_time, updater, update_time from drive_school_swiper + @@ -44,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name, content, create_time, - create_by, + creator, update_time, - update_by, + updater, #{deptId}, @@ -68,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name = #{userName}, content = #{content}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml index 8e1dbf80..3ce06e84 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml @@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - select id, content, title, cover, dept_id, create_time, create_by, update_time, update_by from drive_school_text + select id, content, title, cover, dept_id, create_time, creator, update_time, updater from drive_school_text @@ -52,9 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" next_maintenance_date, next_maintenance_mileage, create_time, - create_by, + creator, update_time, - update_by, + updater, #{carId}, @@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" next_maintenance_date = #{nextMaintenanceDate}, next_maintenance_mileage = #{nextMaintenanceMileage}, create_time = #{createTime}, - create_by = #{createBy}, + creator = #{createBy}, update_time = #{updateTime}, - update_by = #{updateBy}, + updater = #{updateBy}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml index b2c3250e..d39e5283 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml @@ -8,9 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dept_id, create_time, create_by, update_time, update_by, business_type, description, license_number, license_issue_date, license_expiry_date, price, duration, notes, license_cover from sope_ness + select id, dept_id, create_time, creator, update_time, updater, business_type, description, license_number, license_issue_date, license_expiry_date, price, duration, notes, license_cover from sope_ness