diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index d0294bf..d2951d5 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -35,9 +35,12 @@ import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; import lombok.SneakyThrows; import org.apache.commons.codec.Charsets; +import org.energy.modules.inspection.entity.InspectionRoute; +import org.energy.modules.inspection.excel.InspectionRouteExcel; import org.energy.modules.inspection.excel.InspectionTasksExcel; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.excel.EquipmentLedgerExcel; +import org.energy.modules.system.util.DataUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -228,15 +231,15 @@ public class InspectionTasksController extends DafController { @ApiOperation(value = "导出", notes = "传入") @ApiLog public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { - if (entity.containsKey("station_equal")) { - entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal"))); - } - if (entity.containsKey("taskStatus_equal")) { - entity.put("taskStatus_equal", Integer.parseInt((String) entity.get("taskStatus_equal"))); - } - QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, InspectionTasks.class); - queryWrapper.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); - List list = inspectionTasksService.export(queryWrapper); + entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"station".equals(key) && !"taskStatus".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); + InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new); + List list = inspectionTasksService.export(vo); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding(Charsets.UTF_8.name()); String fileName = URLEncoder.encode("巡检任务数据导出", Charsets.UTF_8.name()); diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java index a113ec5..f5ce492 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java @@ -32,7 +32,7 @@ public interface InspectionTasksMapper extends BaseMapper { /** * 导出 */ - List exportData(@Param("ew") Wrapper queryWrapper); + List exportData(@Param("entity") InspectionTasks inspectionTasks); /** * 获取最大任务编号 diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml index bf9e0b9..a90d53c 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -36,25 +36,34 @@ + + + + diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java index 290dda2..ae393c1 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java @@ -23,4 +23,9 @@ public interface MaterialClassCodeMapper extends BaseMapper { */ List selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode); + /** + * 获取物资分类码 + */ + List getMaterialClassCodeList(); + } diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml index 9a74954..0194c55 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml @@ -20,4 +20,8 @@ select * from s_material_class_code where is_deleted = 0 + + diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java index 2b87eda..a360e6e 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java @@ -33,7 +33,7 @@ public interface MaterialMapper extends BaseMapper { /** * 导出 */ - List exportData(@Param("ew") Wrapper queryWrapper); + List exportData(@Param("entity") Material material); /** * 获取物资编号 @@ -48,6 +48,6 @@ public interface MaterialMapper extends BaseMapper { /** * 获取物资的信息 */ - Material getDetailList(String materialNo); + MaterialVO getDetailList(String materialNo); } diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml index f9c713b..1013526 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml @@ -16,7 +16,7 @@ - + @@ -37,31 +37,42 @@ select material_no from s_material where is_deleted = 0 - select material_name, model --- ,b.warehouse_name + ,b.name as warehouse_name + ,inventory_count from s_material --- inner join ( --- select warehouse_name --- ,warehouse --- from warehouse --- where warehouse in (select warehouse from s_material where material_no = ${materialNo} and is_deleted = 0) --- ) as b --- on b.warehouse = s_material.warehouse - where material_no = ${materialNo} and is_deleted = 0 + inner join ( + select code + ,name + from spt_warehouse + where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0) + ) as b + on b.code = s_material.warehouse + where material_no = #{materialNo} and is_deleted = 0 diff --git a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java index d9a5d3b..36d71b5 100644 --- a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java @@ -23,4 +23,9 @@ public interface OutboundMapper extends BaseMapper { */ List selectOutboundPage(IPage page, OutboundVO outbound); + /** + * 获取最大编号 + */ + String getMaxNo(String materialNo); + } diff --git a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml index b1f5680..297e4ab 100644 --- a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml @@ -25,4 +25,8 @@ select * from s_outbound where is_deleted = 0 + + diff --git a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java index aa94acb..9047a98 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java @@ -28,4 +28,7 @@ public interface SupplierInfoMapper extends BaseMapper { List exportData(@Param("vo") SupplierInfoVO supplierInfo); + List getNoList(); + + SupplierInfo getDetail(String creditCode); } diff --git a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml index 514bf1e..a480ce3 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml @@ -51,4 +51,12 @@ order by a.update_time desc + + + + diff --git a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java index 0d2d4de..93c9d62 100644 --- a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java @@ -27,4 +27,6 @@ public interface WarehouseMapper extends BaseMapper { List exportData(@Param("vo") WarehouseVO warehouseVO); + List getWarehouseList(); + } diff --git a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml index 3330ed9..8bf98ea 100644 --- a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml @@ -53,4 +53,8 @@ order by a.update_time desc + + diff --git a/src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java b/src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java index 8fa394d..65c147b 100644 --- a/src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java +++ b/src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java @@ -26,4 +26,14 @@ public interface IManufacturerInfoService extends BaseService IPage selectManufacturerInfoPage(IPage page, ManufacturerInfoVO manufacturerInfo); List export(ManufacturerInfoVO manufacturerInfoVO); + + /** + * 获取制造商 + */ + List getNoList(); + + /** + * 获取制造商信息 + */ + ManufacturerInfo getDetail(String creditCode); } diff --git a/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java b/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java index 9ab8c24..fc2961c 100644 --- a/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java +++ b/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java @@ -5,6 +5,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO; import com.dayu.daf.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + /** * 物资分类码 服务类 * @@ -22,4 +24,9 @@ public interface IMaterialClassCodeService extends BaseService selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode); + /** + * 获取物资分类码 + */ + List getMaterialClassCodeList(); + } diff --git a/src/main/java/org/energy/modules/spares/service/IMaterialService.java b/src/main/java/org/energy/modules/spares/service/IMaterialService.java index 0cdc23f..4b90001 100644 --- a/src/main/java/org/energy/modules/spares/service/IMaterialService.java +++ b/src/main/java/org/energy/modules/spares/service/IMaterialService.java @@ -30,7 +30,7 @@ public interface IMaterialService extends BaseService { /** * 导出 */ - List exportData(Wrapper queryWrapper); + List exportData(Material material); /** * 获取物资编号 @@ -45,6 +45,8 @@ public interface IMaterialService extends BaseService { /** * 获取物资的信息 */ - Material getDetailList(String materialNo); + MaterialVO getDetailList(String materialNo); + + void updateNum(String materialNo, long num); } diff --git a/src/main/java/org/energy/modules/spares/service/IOutboundService.java b/src/main/java/org/energy/modules/spares/service/IOutboundService.java index 4790ea1..4c6f0bf 100644 --- a/src/main/java/org/energy/modules/spares/service/IOutboundService.java +++ b/src/main/java/org/energy/modules/spares/service/IOutboundService.java @@ -22,4 +22,9 @@ public interface IOutboundService extends BaseService { */ IPage selectOutboundPage(IPage page, OutboundVO outbound); + /** + * 获取最大编号 + */ + String getMaxNo(String materialNo); + } diff --git a/src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java b/src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java index 8c44d09..352c39f 100644 --- a/src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java +++ b/src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java @@ -26,4 +26,14 @@ public interface ISupplierInfoService extends BaseService { IPage selectSupplierInfoPage(IPage page, SupplierInfoVO supplierInfo); List export(SupplierInfoVO supplierInfo); + + /** + * 获取制造商 + */ + List getNoList(); + + /** + * 获取制造商信息 + */ + SupplierInfo getDetail(String creditCode); } diff --git a/src/main/java/org/energy/modules/spares/service/IWarehouseService.java b/src/main/java/org/energy/modules/spares/service/IWarehouseService.java index fec7262..15ae11c 100644 --- a/src/main/java/org/energy/modules/spares/service/IWarehouseService.java +++ b/src/main/java/org/energy/modules/spares/service/IWarehouseService.java @@ -27,4 +27,6 @@ public interface IWarehouseService extends BaseService { List export(WarehouseVO warehouseVO); + List getWarehouseList(); + } diff --git a/src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java index 51c9053..0af2c82 100644 --- a/src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java +++ b/src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java @@ -3,7 +3,6 @@ package org.energy.modules.spares.service.impl; import io.micrometer.core.instrument.util.StringUtils; import org.energy.modules.spares.entity.ManufacturerInfo; import org.energy.modules.spares.excel.ManufacturerInfoExcel; -import org.energy.modules.spares.excel.MaterialClassExcel; import org.energy.modules.spares.vo.ManufacturerInfoVO; import org.energy.modules.spares.mapper.ManufacturerInfoMapper; import org.energy.modules.spares.service.IManufacturerInfoService; @@ -42,4 +41,16 @@ public class ManufacturerInfoServiceImpl extends BaseServiceImpl getNoList() { + List list = baseMapper.getNoList(); + return list; + } + + @Override + public ManufacturerInfo getDetail(String creditCode) { + ManufacturerInfo detail = baseMapper.getDetail(creditCode); + return detail; + } + } diff --git a/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java index 1368cce..598d053 100644 --- a/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java +++ b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java @@ -8,6 +8,8 @@ import com.dayu.daf.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + /** * 物资分类码 服务实现类 * @@ -22,4 +24,12 @@ public class MaterialClassCodeServiceImpl extends BaseServiceImpl getMaterialClassCodeList() { + return baseMapper.getMaterialClassCodeList(); + } + } diff --git a/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java index aa7b4d5..f5ff856 100644 --- a/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java +++ b/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java @@ -1,6 +1,7 @@ package org.energy.modules.spares.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.dayu.daf.core.mp.support.Condition; import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.inspection.excel.InspectionRouteExcel; import org.energy.modules.spares.entity.Material; @@ -29,8 +30,8 @@ public class MaterialServiceImpl extends BaseServiceImpl exportData(Wrapper queryWrapper) { - List list = baseMapper.exportData(queryWrapper); + public List exportData(Material material) { + List list = baseMapper.exportData(material); return list; } @@ -47,9 +48,18 @@ public class MaterialServiceImpl extends BaseServiceImpl getNoList() { + List list = baseMapper.getNoList(); + return list; + } + + @Override + public SupplierInfo getDetail(String creditCode) { + SupplierInfo detail = baseMapper.getDetail(creditCode); + return detail; + } + } diff --git a/src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java index 486ed4e..e691e95 100644 --- a/src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java +++ b/src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java @@ -42,4 +42,9 @@ public class WarehouseServiceImpl extends BaseServiceImpl getWarehouseList() { + List list = baseMapper.getWarehouseList(); + return list; + } } diff --git a/src/main/java/org/energy/modules/spares/vo/MaterialVO.java b/src/main/java/org/energy/modules/spares/vo/MaterialVO.java index 48339dd..cb6199b 100644 --- a/src/main/java/org/energy/modules/spares/vo/MaterialVO.java +++ b/src/main/java/org/energy/modules/spares/vo/MaterialVO.java @@ -17,14 +17,8 @@ import io.swagger.annotations.ApiModel; public class MaterialVO extends Material { private static final long serialVersionUID = 1L; - // 物资名称 - private static final String materialName = ""; - - // 规格模型 - private static final String model = ""; - // 仓库名 - private static final String warehouseName = ""; + private String warehouseName;