“linengliang”
2023-10-24 3a75aff8c1dea47564393877d4f71adbb318e013
1.设备台账大全
已修改7个文件
76 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -62,10 +62,10 @@
    @Autowired
    private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
     @Autowired
    @Autowired
    private IEquipmentProcessParametersService equipmentProcessParametersService;
     @Autowired
    @Autowired
    private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
     @Autowired
@@ -761,6 +761,17 @@
         }
         return Result.error("文件导入失败!");
     }
     @GetMapping(value = "/getEquipmentStansdardList")
     @PermissionData
     public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                      HttpServletRequest req) {
         QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
         Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
         IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
         return Result.OK(pageList);
     }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
@@ -1,11 +1,13 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -25,7 +27,6 @@
@ApiModel(value="mom_eam_daily_inspection_standard_detail对象", description="mom_eam_daily_inspection_standard_detail")
public class DailyInspectionStandardDetail extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;
    /**日常点检标准id*/
    @Excel(name = "日常点检标准id", width = 15)
@@ -94,4 +95,16 @@
    @ApiModelProperty(value = "上次点检时间")
    private String lastInspectionTime;
    @TableField(exist = false)
    private String projectName;
    @TableField(exist = false)
    private String standard;
    @TableField(exist = false)
    @Dict(dicCode = "all_maintenance_type")
    private String type;
    @TableField(exist = false)
    private String cycleName;
    @TableField(exist = false)
    private String equipmentId;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -246,6 +246,7 @@
    private String  securityConfiguration;
    @ApiModelProperty(value = "冷却系统")
    @Excel(name = "冷却系统", width = 15,orderNum = "10")
    @Dict(dicCode = "cooling_system")
    private String  coolingSystem;
    @Excel(name = "灭火器", width = 15,orderNum = "11")
    @ApiModelProperty(value = "灭火器")
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.model.DepartVo;
@@ -79,4 +80,5 @@
                                       @Param("warrantyEnd")Date warrantyEnd,
                                       @Param("sql")String sql
    );
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -295,5 +295,40 @@
        </if>
        order by t1.create_time desc
    </select>
    <select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
        select t9.* from ( select
           t1.id id,
           t5.name projectName,
           t5.detection_standard standard,
           '1' as type,
           t6.name cycleName,
           t2.equipment_id equipmentId
           from mom_eam_daily_inspection_standard_detail t1
           left join mom_eam_daily_inspection_standard t2
           on t2.id = t1.daily_inspection_standard_id
           left join mom_eam_inspection_project t5
           on t5.id = t1.inspection_project_id
           left join mom_eam_maintenance_cycle t6
           on t6.id = t1.inspection_cycle_id
           where  t2.version_status = '2'
           union all
           select
           t3.id id,
           t7.name projectName,
           t7.standard standard,
           t8.maintenance_type type,
           t8.name cycleName,
           t4.equipment_id equipmentId
           from mom_eam_maintenance_standard_detail t3
           left join mom_eam_maintenance_standard t4
           on t4.id = t3.maintenance_standard_id
           left join mom_eam_maintenance_project t7
           on t7.id = t3.maintenance_project_id
           left join mom_eam_maintenance_cycle t8
           on t8.id = t3.maintenance_cycle_id
           where  t4.version_status = '2') t9 where
           t9.equipmentId = #{mainId}
           order by t9.type
    </select>
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.model.DepartVo;
@@ -60,4 +61,5 @@
    public IPage<Equipment> pageEquipment(Integer pageNo, Integer pageSize, Map<String, Object> params);
    Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment);
    IPage<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page, String mainId);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentCategory;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
@@ -117,4 +118,9 @@
                sql
        ));
    }
    @Override
    public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId) {
        return page.setRecords(baseMapper.getStandardList(page,mainId));
    }
}