lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java

@@ -466,10 +466,6 @@
    @ApiModelProperty(value = "三保生成标记 1 已生成 0 未生成")
    @TableField(exist = false)
    private String thirdMaintenanceGenerateFlag;
    /** 二保生成标记 1 已生成 0 未生成 */
    @ApiModelProperty(value = "二保生成标记 1 已生成 0 未生成")
    @TableField(exist = false)
    private String secondMaintenanceGenerateFlag;

    /**
     * 保养规范名称

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java

@@ -97,7 +97,4 @@
    /** 三保生成标记 1 已生成 0 未生成 */
    @ApiModelProperty(value = "三保生成标记 1 已生成 0 未生成")
    private String thirdMaintenanceGenerateFlag;
    /** 二保生成标记 1 已生成 0 未生成 */
    @ApiModelProperty(value = "二保生成标记 1 已生成 0 未生成")
    private String secondMaintenanceGenerateFlag;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -96,7 +96,7 @@
        tc.total_count AS "total"
        FROM sys_dict c
        LEFT JOIN sys_dict_item item ON c.id = item.dict_id
        LEFT JOIN eam_equipment_extend t ON t.technology_status = item.item_value
        LEFT JOIN eam_equipment_extend t ON t.technology_status = item.item_value COLLATE Chinese_PRC_CI_AS
        <if test="ids != null and ids != ''">
            AND t.id IN
            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamFactorySecondMaintPlanServiceImpl.java

@@ -38,7 +38,8 @@
     */
    @Override
    public List<EamFactorySecondMaintPlan> queryAllList(){
        return this.baseMapper.queryAllList();
//        return this.baseMapper.queryAllList();
        return this.list();
    }

    /**