update

lius

2023-09-01 233c7122b0fe27b0edc6e987225c1ccf236c5ca9

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,10 +9,8 @@
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml

@@ -5,6 +5,7 @@
    <!--分页查询-->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentOvertime">
        SELECT
            t1.id
            t2.equipment_id equipmentId,
            t4.equipment_name equipmentName,
            t2.effective_date effectiveDate,
@@ -12,7 +13,11 @@
            t3.end_date endDate,
            t1.start_time startTime,
            t1.end_time endTime,
            t1.remark remark
            t1.remark remark,
            t1.create_by createBy,
            t1.create_time createTime,
            t1.update_by updateBy,
            t1.update_time updateTime
        FROM
            mdc_equipment_overtime t1
            LEFT JOIN mdc_device_calendar t2 ON t1.calendar_id = t2.id