From bb8975657f59813a0e8b71c1079d381b29d178d8 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Tue, 16 Jul 2024 11:21:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A5=A8=EF=BC=88?= =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OperationTicketController.java | 44 +++- .../modules/smart/entity/OperationTicket.java | 2 +- .../smart/excel/OperationTicketExcel.java | 202 ++++++++++++++++++ .../smart/mapper/OperationTicketMapper.java | 3 +- .../smart/mapper/OperationTicketMapper.xml | 41 ++++ .../service/IOperationTicketService.java | 10 +- .../impl/OperationTicketServiceImpl.java | 8 +- 7 files changed, 299 insertions(+), 11 deletions(-) create mode 100644 src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java diff --git a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java index efe3fb7..9c11e39 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java @@ -15,7 +15,9 @@ */ package org.energy.modules.smart.controller; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.log.annotation.ApiLog; import com.dayu.daf.core.tool.constant.DafConstant; import com.xkcoding.http.util.StringUtil; import io.swagger.annotations.Api; @@ -23,14 +25,18 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; + +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.leger.entity.EquipmentLedger; +import lombok.SneakyThrows; +import org.apache.commons.codec.Charsets; +import org.energy.modules.smart.excel.OperationTicketExcel; +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; @@ -38,9 +44,12 @@ import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.service.IOperationTicketService; import com.dayu.daf.core.boot.ctrl.DafController; +import springfox.documentation.annotations.ApiIgnore; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 操作票一览 控制器 @@ -170,7 +179,7 @@ public class OperationTicketController extends DafController { @ApiOperationSupport(order = 8) @ApiOperation(value = "更新", notes = "传入ids") public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("2",ids); + return this.approve(2,ids); } /** @@ -181,13 +190,13 @@ public class OperationTicketController extends DafController { @ApiOperation(value = "更新", notes = "传入ids") public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("3",ids); + return this.approve(3,ids); } /** * 驳回OR审核 操作票一览 */ - public R approve(String status, String ids) { + public R approve(Integer status, String ids) { List list = new ArrayList<>(); for (String id : ids.split(",")) { OperationTicket operationTicket = new OperationTicket(); @@ -222,4 +231,29 @@ public class OperationTicketController extends DafController { } return R.status(operationTicketService.updateBatchById(list)); } + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "导出", notes = "传入") + @ApiLog + public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"station".equals(key) && !"isQuakified".equals(key) && !"sts".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); + OperationTicket vo = DataUtils.mapToEntity(entity, OperationTicket::new); + + List list = operationTicketService.export(vo); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(Charsets.UTF_8.name()); + String fileName = URLEncoder.encode("操作票数据导出", Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), OperationTicketExcel.class).sheet("操作票").doWrite(list); + } } diff --git a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java index 8fe1417..0f902c4 100644 --- a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java +++ b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java @@ -170,7 +170,7 @@ public class OperationTicket extends BaseEntity { * 审核状态 */ @ApiModelProperty(value = "审核状态") - private String reviewStatus; + private Integer reviewStatus; } diff --git a/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java b/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java new file mode 100644 index 0000000..8ef5d7b --- /dev/null +++ b/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java @@ -0,0 +1,202 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.smart.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * EquipmentLedge model export + * @author edwong + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(16) +public class OperationTicketExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * KKS编码 + */ + @ColumnWidth(20) + @ExcelProperty(value = "KKS编码") + private String kksEncoding; + /** + * KSS描述 + */ + @ColumnWidth(20) + @ExcelProperty(value ="KSS描述") + private String kksDescription; + /** + * 场站 + */ + @ColumnWidth(20) + @ExcelProperty(value = "场站") + private String stationName; + /** + * 操作票编号 + */ + @ColumnWidth(20) + @ExcelProperty(value ="操作票编号") + private String operationTicketNo; + + /** + * 工作班组 + */ + @ColumnWidth(20) + @ExcelProperty(value = "工作班组") + private String workTeam; + /** + * 工作负责人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "工作负责人") + private String workLeader; + /** + * 监护人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "监护人") + private String guardian; + /** + * 发令人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "发令人") + private String givingOrdersUser; + /** + * 作业风险等级 + */ + @ColumnWidth(20) + @ExcelProperty(value ="作业风险等级") + private String jobRiskLevel; + /** + * 控制等级 + */ + @ColumnWidth(20) + @ExcelProperty(value = "控制等级") + private String controlLevel; + /** + * 计划开始时间 + */ + @ColumnWidth(20) + @ExcelProperty(value = "计划开始时间") + private String plannedStartTime; + /** + * 计划结束时间 + */ + @ColumnWidth(20) + @ExcelProperty(value = "计划结束时间") + private String plannedEndTime; + /** + * 工作签发时间 + */ + @ColumnWidth(20) + @ExcelProperty(value ="工作签发时间") + private String workIssuanceTime; + /** + * 人员资格 + */ + @ColumnWidth(20) + @ExcelProperty(value ="人员资格") + private String personnelQualification; + /** + * 人员状态 + */ + @ColumnWidth(20) + @ExcelProperty(value = "人员状态") + private String personnelState; + /** + * 人员防护 + */ + @ColumnWidth(20) + @ExcelProperty(value = "人员防护") + private String personnelPritection; + /** + * 安全距离 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全距离") + private String safeDistance; + /** + * 走错间隔 + */ + @ColumnWidth(20) + @ExcelProperty(value = "走错间隔") + private String wrongInterval; + /** + * 安全措施落实 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全措施落实") + private String securityMeasuresImplement; + /** + * 开展过程检查 + */ + @ColumnWidth(20) + @ExcelProperty(value = "开展过程检查") + private String conductProcessInspections; + /** + * 安全培训落实 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全培训落实") + private String securityTrainingImplement; + /** + * 其他 + */ + @ColumnWidth(20) + @ExcelProperty(value = "其他") + private String other; + /** + * 安全技术措施交底 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全技术措施交底") + private String securityMeasuresDisclosure; + /** + * 作业后风险管控情况评价 + */ + @ColumnWidth(20) + @ExcelProperty(value ="作业后风险管控情况评价") + private String riskControlEvaluation; + /** + * 状态 + */ + @ColumnWidth(20) + @ExcelProperty(value ="状态") + private String stsName; + /** + * 是否合格 + */ + @ColumnWidth(20) + @ExcelProperty(value = "是否合格") + private String isQuakifiedName; + /** + * 审核状态 + */ + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String reviewStatus; + +} diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java index d83e530..10583d3 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.excel.EquipmentLedgerExcel; import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.vo.OperationTicketVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,7 +28,7 @@ public interface OperationTicketMapper extends BaseMapper { */ List selectOperationTicketPage(IPage page, OperationTicketVO operationTicket); - List exportData(@Param("ew") Wrapper queryWrapper); + List exportData(@Param("entity")OperationTicket operationTicket); List selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper queryWrapper); } diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml index 576397a..295a063 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml @@ -118,4 +118,45 @@ , a.id + + + + + + diff --git a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java index 810ba06..32a9c5b 100644 --- a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java +++ b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java @@ -1,8 +1,7 @@ package org.energy.modules.smart.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import com.dayu.daf.core.mp.base.BaseService; @@ -29,4 +28,11 @@ public interface IOperationTicketService extends BaseService { IPage selectOperationTicketPageExt(IPage page, Wrapper wrapper); + /** + * 获取导出数据 + * + * @param operationTicket + * @return + */ + List export(OperationTicket operationTicket); } diff --git a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java index 0a3e073..5edad37 100644 --- a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java +++ b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java @@ -1,8 +1,7 @@ package org.energy.modules.smart.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.mapper.OperationTicketMapper; @@ -32,4 +31,9 @@ public class OperationTicketServiceImpl extends BaseServiceImpl export(OperationTicket operationTicket) { + List list = baseMapper.exportData(operationTicket); + return list; + } } From 8c6d7759dafa31abd807cc36f85038f86a902490 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 16 Jul 2024 13:47:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionTasksController.java | 21 +++++---- .../mapper/InspectionTasksMapper.java | 2 +- .../mapper/InspectionTasksMapper.xml | 47 +++++++++++-------- .../service/IInspectionTasksService.java | 7 ++- .../impl/InspectionTasksServiceImpl.java | 4 +- 5 files changed, 46 insertions(+), 35 deletions(-) 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 @@ - 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/service/IMaterialService.java b/src/main/java/org/energy/modules/spares/service/IMaterialService.java index 0cdc23f..557c6ff 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,6 @@ public interface IMaterialService extends BaseService { /** * 获取物资的信息 */ - Material getDetailList(String materialNo); + MaterialVO getDetailList(String materialNo); } 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/impl/MaterialServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java index aa7b4d5..984957c 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 @@ -29,8 +29,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,8 +47,8 @@ public class MaterialServiceImpl extends BaseServiceImpl Date: Tue, 16 Jul 2024 16:32:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=89=A9=E8=B5=84=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spares/controller/InboundController.java | 6 +++++ .../ManufacturerInfoController.java | 22 +++++++++++++++++++ .../MaterialClassCodeController.java | 13 +++++++++++ .../spares/controller/OutboundController.java | 7 +++++- .../controller/SupplierInfoController.java | 22 +++++++++++++++++++ .../controller/WarehouseController.java | 12 +++++++++- .../energy/modules/spares/entity/Inbound.java | 4 ++++ .../modules/spares/entity/Outbound.java | 4 ++++ .../spares/mapper/ManufacturerInfoMapper.java | 4 ++++ .../spares/mapper/ManufacturerInfoMapper.xml | 8 +++++++ .../mapper/MaterialClassCodeMapper.java | 5 +++++ .../spares/mapper/MaterialClassCodeMapper.xml | 4 ++++ .../spares/mapper/SupplierInfoMapper.java | 3 +++ .../spares/mapper/SupplierInfoMapper.xml | 8 +++++++ .../spares/mapper/WarehouseMapper.java | 2 ++ .../modules/spares/mapper/WarehouseMapper.xml | 4 ++++ .../service/IManufacturerInfoService.java | 10 +++++++++ .../service/IMaterialClassCodeService.java | 7 ++++++ .../spares/service/IMaterialService.java | 2 ++ .../spares/service/ISupplierInfoService.java | 10 +++++++++ .../spares/service/IWarehouseService.java | 2 ++ .../impl/ManufacturerInfoServiceImpl.java | 13 ++++++++++- .../impl/MaterialClassCodeServiceImpl.java | 10 +++++++++ .../service/impl/MaterialServiceImpl.java | 10 +++++++++ .../service/impl/SupplierInfoServiceImpl.java | 12 ++++++++++ .../service/impl/WarehouseServiceImpl.java | 5 +++++ 26 files changed, 206 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/controller/InboundController.java b/src/main/java/org/energy/modules/spares/controller/InboundController.java index a6b0f55..11f0c76 100644 --- a/src/main/java/org/energy/modules/spares/controller/InboundController.java +++ b/src/main/java/org/energy/modules/spares/controller/InboundController.java @@ -29,6 +29,7 @@ import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; import lombok.Data; import org.energy.modules.leger.entity.TechParameters; +import org.energy.modules.spares.service.IMaterialService; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -54,6 +55,7 @@ import java.util.List; public class InboundController extends DafController { private IInboundService inboundService; + private IMaterialService materialService; /** * 详情 @@ -105,6 +107,10 @@ public class InboundController extends DafController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入inbound") public R update(@Valid @RequestBody Inbound inbound) { + if (inbound.getIstatus() == 2) + { + materialService.updateNum(inbound.getMaterialNo(), inbound.getInboundCount()); + } return R.status(inboundService.updateById(inbound)); } diff --git a/src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java b/src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java index 0a0ba02..4791031 100644 --- a/src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java +++ b/src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java @@ -201,4 +201,26 @@ public class ManufacturerInfoController extends DafController { EasyExcel.write(response.getOutputStream(), ManufacturerInfoExcel.class).sheet("制造商信息管理").doWrite(list); } + /** + * 获取制造商 + */ + @GetMapping("/getNoList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取编号", notes = "获取编号") + public R> getNoList() { + List noList = manufacturerInfoService.getNoList(); + return R.data(noList); + } + + /** + * 获取制造商信息 + */ + @GetMapping("/getDetail") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取制造商信息", notes = "获取制造商信息") + public R getDetail(String creditCode) { + ManufacturerInfo detail = manufacturerInfoService.getDetail(creditCode); + return R.data(detail); + } + } diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java index 7f901ab..7887d22 100644 --- a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java +++ b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java @@ -34,6 +34,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO; import org.energy.modules.spares.service.IMaterialClassCodeService; import com.dayu.daf.core.boot.ctrl.DafController; +import java.util.List; + /** * 物资分类码 控制器 * @@ -122,5 +124,16 @@ public class MaterialClassCodeController extends DafController { return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids))); } + /** + * 分页 物资分类码 + */ + @GetMapping("/getMaterialClassCodeList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "获取物资分类码", notes = "获取物资分类码") + public R> getMaterialClassCodeList() { + List list = materialClassCodeService.getMaterialClassCodeList(); + return R.data(list); + } + } diff --git a/src/main/java/org/energy/modules/spares/controller/OutboundController.java b/src/main/java/org/energy/modules/spares/controller/OutboundController.java index 290ca18..569b498 100644 --- a/src/main/java/org/energy/modules/spares/controller/OutboundController.java +++ b/src/main/java/org/energy/modules/spares/controller/OutboundController.java @@ -27,7 +27,7 @@ import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; -import org.energy.modules.spares.entity.Inbound; +import org.energy.modules.spares.service.IMaterialService; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -53,6 +53,7 @@ import java.util.List; public class OutboundController extends DafController { private IOutboundService outboundService; + private IMaterialService materialService; /** * 详情 @@ -104,6 +105,10 @@ public class OutboundController extends DafController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入outbound") public R update(@Valid @RequestBody Outbound outbound) { + if (outbound.getIstatus() == 2) + { + materialService.updateNum(outbound.getMaterialNo(), Math.negateExact(outbound.getOutboundCount())); + } return R.status(outboundService.updateById(outbound)); } diff --git a/src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java b/src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java index f57bf4b..29e0d91 100644 --- a/src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java +++ b/src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java @@ -201,5 +201,27 @@ public class SupplierInfoController extends DafController { EasyExcel.write(response.getOutputStream(), SupplierInfoExcel.class).sheet("供应商信息管理").doWrite(list); } + /** + * 获取供应商 + */ + @GetMapping("/getNoList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取编号", notes = "获取编号") + public R> getNoList() { + List noList = supplierInfoService.getNoList(); + return R.data(noList); + } + + /** + * 获取供应商信息 + */ + @GetMapping("/getDetail") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取供应商信息", notes = "获取供应商信息") + public R getDetail(String creditCode) { + SupplierInfo detail = supplierInfoService.getDetail(creditCode); + return R.data(detail); + } + } diff --git a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java index 415798a..c34bf84 100644 --- a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java +++ b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java @@ -35,7 +35,6 @@ 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.spares.entity.ManufacturerInfo; import org.energy.modules.spares.excel.WarehouseExcel; import org.energy.modules.system.util.DataUtils; import org.springframework.web.bind.annotation.*; @@ -208,4 +207,15 @@ public class WarehouseController extends DafController { EasyExcel.write(response.getOutputStream(), WarehouseExcel.class).sheet("仓库").doWrite(list); } + /** + * 获取仓库信息 + */ + @GetMapping("/getWarehouseList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取仓库信息", notes = "获取仓库信息") + public R> getWarehouseList() { + List noList = warehouseService.getWarehouseList(); + return R.data(noList); + } + } diff --git a/src/main/java/org/energy/modules/spares/entity/Inbound.java b/src/main/java/org/energy/modules/spares/entity/Inbound.java index f0d20b0..fdea393 100644 --- a/src/main/java/org/energy/modules/spares/entity/Inbound.java +++ b/src/main/java/org/energy/modules/spares/entity/Inbound.java @@ -3,6 +3,9 @@ package org.energy.modules.spares.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,6 +28,7 @@ public class Inbound extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") private Long id; /** diff --git a/src/main/java/org/energy/modules/spares/entity/Outbound.java b/src/main/java/org/energy/modules/spares/entity/Outbound.java index cfea945..91b72a6 100644 --- a/src/main/java/org/energy/modules/spares/entity/Outbound.java +++ b/src/main/java/org/energy/modules/spares/entity/Outbound.java @@ -3,6 +3,9 @@ package org.energy.modules.spares.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; @@ -25,6 +28,7 @@ public class Outbound extends BaseEntity { /** * 主键 */ + @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") private Long id; /** diff --git a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java index f1f1784..f6e549e 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java @@ -27,4 +27,8 @@ public interface ManufacturerInfoMapper extends BaseMapper { List selectManufacturerInfoPage(IPage page, ManufacturerInfoVO manufacturerInfo); List exportData(@Param("vo") ManufacturerInfoVO manufacturerInfo); + + List getNoList(); + + ManufacturerInfo getDetail(String creditCode); } diff --git a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml index b9a40e0..0790f0e 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml @@ -48,4 +48,12 @@ order by a.update_time desc + + + + 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/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 557c6ff..4b90001 100644 --- a/src/main/java/org/energy/modules/spares/service/IMaterialService.java +++ b/src/main/java/org/energy/modules/spares/service/IMaterialService.java @@ -47,4 +47,6 @@ public interface IMaterialService extends BaseService { */ MaterialVO getDetailList(String materialNo); + void updateNum(String materialNo, long num); + } 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 984957c..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; @@ -52,4 +53,13 @@ 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; + } } From c760a93f78d4e6bf77ec053f549e400d5d082062 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Wed, 17 Jul 2024 10:12:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A5=A8=EF=BC=88?= =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/energy/modules/smart/entity/OperationTicket.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java index 0f902c4..d9fa31e 100644 --- a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java +++ b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java @@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; @@ -164,6 +165,7 @@ public class OperationTicket extends BaseEntity { /** * 是否合格 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否合格") private Integer isQuakified; /** From 4dea0d94fc1b8161c450359fc3fc34ecafca353e Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:19:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/controller/InspectionPlanController.java | 5 +---- .../inspection/controller/InspectionRouteController.java | 5 +---- .../modules/inspection/excel/InspectionPlanExcel.java | 4 ---- .../modules/inspection/excel/InspectionRouteExcel.java | 4 ---- .../modules/inspection/mapper/InspectionPlanMapper.xml | 6 +----- .../modules/inspection/mapper/InspectionRouteMapper.xml | 6 +----- 6 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java index 9c08b2b..a330d47 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -91,9 +91,6 @@ public class InspectionPlanController extends DafController { if (StringUtil.isNotEmpty(inspectionPlan.getPlanName())) { qw.lambda().like(InspectionPlan::getPlanName, inspectionPlan.getPlanName()); } - if (null != inspectionPlan.getStation()) { - qw.lambda().eq(InspectionPlan::getStation, inspectionPlan.getStation()); - } if (StringUtil.isNotEmpty(inspectionPlan.getPeriodType())) { qw.lambda().like(InspectionPlan::getPeriodType, inspectionPlan.getPeriodType()); } @@ -217,7 +214,7 @@ public class InspectionPlanController extends DafController { public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); entity.forEach((key, value) -> { - if (!"station".equals(key) && !"planStatus".equals(key)) + if (!"planStatus".equals(key)) { entity.put(key, "%" + value + "%"); } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index 0a24905..86532af 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -91,9 +91,6 @@ public class InspectionRouteController extends DafController { if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) { qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName()); } - if (null != inspectionRoute.getStations()) { - qw.lambda().eq(InspectionRoute::getStations, inspectionRoute.getStations()); - } if (StringUtil.isNotEmpty(inspectionRoute.getType())) { qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType()); } @@ -218,7 +215,7 @@ public class InspectionRouteController extends DafController { public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); entity.forEach((key, value) -> { - if (!"stations".equals(key) && !"istatus".equals(key)) + if (!"istatus".equals(key)) { entity.put(key, "%" + value + "%"); } diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java index 3bae5fb..03a97ca 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java @@ -42,10 +42,6 @@ public class InspectionPlanExcel implements Serializable { @ExcelProperty(value = "计划名称") private String planName; - @ColumnWidth(15) - @ExcelProperty(value = "场站") - private String stationName; - @ColumnWidth(15) @ExcelProperty(value = "计划类型") private String planType; diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java index 1a59383..f0809ef 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java @@ -42,10 +42,6 @@ public class InspectionRouteExcel implements Serializable { @ExcelProperty(value = "路线名称") private String routeName; - @ColumnWidth(15) - @ExcelProperty(value = "场站") - private String stationsName; - @ColumnWidth(15) @ExcelProperty(value = "类型") private String type; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index cc148a8..2d2e15b 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -30,9 +30,8 @@ SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason - ,dic1.dict_value AS stations_name, dic2.dict_value AS istatus_name + , dic2.dict_value AS istatus_name FROM i_inspection_route a - LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.stations AND dic1.is_deleted = '0' LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 @@ -38,9 +37,6 @@ AND a.route_name LIKE #{entity.routeName} - - AND a.stations = #{entity.stations} - AND a.type LIKE #{entity.type}