森林防火 供应商管理

rentaiming

2024-07-20 d1bf6cf8234a9010a901131787344a6f9b10373b

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java

@@ -38,8 +38,12 @@
    public PageDTO<SlEquipmentVO> getSlEquipmentList(SlEquipmentQuery slEquipmentQuery) {
        Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());
        LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
        if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){
            wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
        }
        if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getType()!=0){
        wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType());
        }
        wrapper.eq( SlEquipment::getDelFlag,0);
        wrapper.orderByDesc(SlEquipment::getCreateTime);
        Page<SlEquipment> page1 = this.page(page, wrapper);
@@ -67,6 +71,7 @@
            slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
            slEquipment.setType(slEquipmentDTO.getType());
            slEquipment.setManagementId(slEquipmentDTO.getManagementId());
            this.save(slEquipment);
        }else{
            SlEquipment byId = this.getById(slEquipmentDTO.getId());
            if (slEquipmentDTO.getEquipmentName()!=null){
@@ -89,10 +94,10 @@
    public SlEquipmentVO getSlEquipmentOne(SlEquipmentDTO slEquipmentDTO) {
        SlEquipment byId = this.getById(slEquipmentDTO.getId());
        SlEquipmentVO slEquipmentVO=new SlEquipmentVO();
        slEquipmentVO.setEquipmentName(slEquipmentDTO.getEquipmentName());
        slEquipmentVO.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
        slEquipmentVO.setType(slEquipmentDTO.getType());
        slEquipmentVO.setManagementId(slEquipmentDTO.getManagementId());
        slEquipmentVO.setEquipmentName(byId.getEquipmentName());
        slEquipmentVO.setEquipmentNum(byId.getEquipmentNum());
        slEquipmentVO.setType(byId.getType());
        slEquipmentVO.setManagementId(byId.getManagementId());

        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());