From 42866633a20dc39799d56ad38da22fc73d07c12a Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Fri, 12 Jul 2024 16:29:51 +0800 Subject: [PATCH 1/2] =?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/OperationItemController.java | 5 - .../controller/OperationTicketController.java | 98 ++++++++++++++++++- .../modules/smart/entity/OperationTicket.java | 2 +- .../smart/mapper/OperationTicketMapper.java | 7 ++ .../smart/mapper/OperationTicketMapper.xml | 21 ++++ .../service/IOperationTicketService.java | 7 ++ .../impl/OperationTicketServiceImpl.java | 10 ++ 7 files changed, 143 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/energy/modules/smart/controller/OperationItemController.java b/src/main/java/org/energy/modules/smart/controller/OperationItemController.java index 5773cc9..64ae0b3 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationItemController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationItemController.java @@ -134,11 +134,6 @@ public class OperationItemController extends DafController { @ApiOperationSupport(order = 8) @ApiOperation(value = "列表", notes = "传入OperationItem") public R> getList(OperationItem operationItem) { -// QueryWrapper qw = new QueryWrapper<>(); -// qw.orderByAsc("eq_ledger_code"); -// if (StringUtil.isNotEmpty(operationItem.getOperationTicketNo())) { -// qw.lambda().eq(OperationItem::getOperationTicketNo, operationItem.getOperationTicketNo()); -// } List list = operationItemService.list(Condition.getQueryWrapper(operationItem)); return R.data(list); } 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 dd6aeae..efe3fb7 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java @@ -16,6 +16,7 @@ package org.energy.modules.smart.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.tool.constant.DafConstant; import com.xkcoding.http.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -28,6 +29,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.inspection.entity.InspectionRoute; import org.energy.modules.leger.entity.EquipmentLedger; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; @@ -37,6 +39,9 @@ import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.service.IOperationTicketService; import com.dayu.daf.core.boot.ctrl.DafController; +import java.util.ArrayList; +import java.util.List; + /** * 操作票一览 控制器 * @@ -80,7 +85,40 @@ public class OperationTicketController extends DafController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入operationTicket") public R> page(OperationTicketVO operationTicket, Query query) { - IPage pages = operationTicketService.selectOperationTicketPage(Condition.getPage(query), operationTicket); + QueryWrapper qw = new QueryWrapper<>(); + //场站 + if (null != operationTicket.getStation()) { + qw.lambda().eq(OperationTicketVO::getStation, operationTicket.getStation()); + } + //操作票编号 + if (StringUtil.isNotEmpty(operationTicket.getOperationTicketNo())) { + qw.lambda().like(OperationTicketVO::getOperationTicketNo, operationTicket.getOperationTicketNo()); + } + //操作票类型 + if (StringUtil.isNotEmpty(operationTicket.getOperationTicketType())){ + qw.lambda().like(OperationTicketVO::getOperationTicketType, operationTicket.getOperationTicketType()); + } + //工作负责人 + if (StringUtil.isNotEmpty(operationTicket.getWorkLeader())) { + qw.lambda().like(OperationTicketVO::getWorkLeader, operationTicket.getWorkLeader()); + } + //作业风险等级 + if (StringUtil.isNotEmpty(operationTicket.getJobRiskLevel())) { + qw.lambda().like(OperationTicketVO::getJobRiskLevel, operationTicket.getJobRiskLevel()); + } + //控制等级 + if (StringUtil.isNotEmpty(operationTicket.getControlLevel())) { + qw.lambda().like(OperationTicketVO::getControlLevel, operationTicket.getControlLevel()); + } + //计划开始时间 + if (StringUtil.isNotEmpty(operationTicket.getPlannedStartTime())) { + qw.lambda().like(OperationTicketVO::getPlannedStartTime, operationTicket.getPlannedStartTime()); + } + //状态 + if (null != operationTicket.getSts()) { + qw.lambda().eq(OperationTicketVO::getSts, operationTicket.getSts()); + } + IPage pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), qw); return R.data(pages); } @@ -125,5 +163,63 @@ public class OperationTicketController extends DafController { return R.status(operationTicketService.deleteLogic(Func.toLongList(ids))); } + /** + * 审核 操作票一览 + */ + @PostMapping("/auditing") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "更新", notes = "传入ids") + public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.approve("2",ids); + } + + /** + * 驳回 操作票一览 + */ + @PostMapping("/reject") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "更新", notes = "传入ids") + public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) + { + return this.approve("3",ids); + } + + /** + * 驳回OR审核 操作票一览 + */ + public R approve(String status, String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + OperationTicket operationTicket = new OperationTicket(); + operationTicket.setId(Long.parseLong(id)); + operationTicket.setReviewStatus(status); + list.add(operationTicket); + } + return R.status(operationTicketService.updateBatchById(list)); + } + /** + * 失效 + */ + @PostMapping("/closeticket") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "失效", notes = "传入ids") + public R lapse(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "是否合格", required = true) @RequestParam Integer isQuakified,@RequestParam String riskControlEvaluation) { + return this.updateInspectionRoute(3, isQuakified, ids , riskControlEvaluation); + } + /** + * 生效OR失效 + */ + public R updateInspectionRoute(Integer status, Integer isQuakified, String ids , String riskControlEvaluation) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + OperationTicket operationTicket = new OperationTicket(); + operationTicket.setId(Long.parseLong(id)); + operationTicket.setIsQuakified(isQuakified); + operationTicket.setRiskControlEvaluation(riskControlEvaluation); + operationTicket.setSts(status); + list.add(operationTicket); + } + return R.status(operationTicketService.updateBatchById(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 6aba9a5..8fe1417 100644 --- a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java +++ b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java @@ -160,7 +160,7 @@ public class OperationTicket extends BaseEntity { * 状态 */ @ApiModelProperty(value = "状态") - private String sts; + private Integer sts; /** * 是否合格 */ 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 40506dd..d83e530 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java @@ -1,5 +1,9 @@ package org.energy.modules.smart.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.vo.OperationTicketVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,4 +27,7 @@ public interface OperationTicketMapper extends BaseMapper { */ List selectOperationTicketPage(IPage page, OperationTicketVO operationTicket); + List exportData(@Param("ew") Wrapper queryWrapper); + + 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 22ab300..576397a 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml @@ -97,4 +97,25 @@ , 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 d3f30e1..810ba06 100644 --- a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java +++ b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java @@ -1,10 +1,15 @@ 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.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import com.dayu.daf.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + /** * 操作票一览 服务类 * @@ -22,4 +27,6 @@ public interface IOperationTicketService extends BaseService { */ IPage selectOperationTicketPage(IPage page, OperationTicketVO operationTicket); + IPage selectOperationTicketPageExt(IPage page, Wrapper wrapper); + } 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 1cd535f..0a3e073 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,5 +1,8 @@ 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.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.mapper.OperationTicketMapper; @@ -8,6 +11,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 +27,9 @@ public class OperationTicketServiceImpl extends BaseServiceImpl selectOperationTicketPageExt(IPage page, Wrapper wrapper) { + return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper)); + } + } From c0c5ccf1daf63b6fd6d372de6516849d2c232610 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Fri, 12 Jul 2024 16:55:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96KKS=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquipmentLedgerController.java | 23 +++++++++++++++++++ .../leger/mapper/EquipmentLedgerMapper.java | 10 ++++++++ .../leger/mapper/EquipmentLedgerMapper.xml | 7 ++++++ .../service/IEquipmentLedgerService.java | 10 ++++++++ .../impl/EquipmentLedgerServiceImpl.java | 12 ++++++++++ 5 files changed, 62 insertions(+) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 1d7edf4..55efdfc 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -33,6 +33,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.inspection.entity.InspectionObject; import org.energy.modules.leger.service.IInventoryDocumentService; import org.energy.modules.leger.service.ITechParametersService; import lombok.SneakyThrows; @@ -234,4 +235,26 @@ public class EquipmentLedgerController extends DafController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); EasyExcel.write(response.getOutputStream(), EquipmentLedgerExcel.class).sheet("静态台账").doWrite(list); } + + /** + * 获取对象编号 + */ + @GetMapping("/getKksList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取kks编号", notes = "获取kks编号") + public R> getKksNoList() { + List kksList = equipmentLedgerService.getKksNoList(); + return R.data(kksList); + } + + /** + * 获取对象编号 + */ + @GetMapping("/getDetailList") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取kks信息", notes = "获取kks信息") + public R getDetailList(String KksNo) { + EquipmentLedger DetailList = equipmentLedgerService.getDetailList("'" + KksNo + "'"); + return R.data(DetailList); + } } diff --git a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java index 30ef4fa..8c9fe52 100644 --- a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java @@ -2,6 +2,7 @@ package org.energy.modules.leger.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.apache.ibatis.annotations.Param; +import org.energy.modules.inspection.entity.InspectionObject; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.vo.EquipmentLedgerVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -29,4 +30,13 @@ public interface EquipmentLedgerMapper extends BaseMapper { List exportData(@Param("ew") Wrapper queryWrapper); + /** + * 获取kks编号 + */ + List getKksNoList(); + /** + * 获取kks的信息 + */ + EquipmentLedger getDetailList(String kksNo); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml index 645ca6a..9acd27e 100644 --- a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml @@ -69,4 +69,11 @@ FROM l_equipment_ledger ${ew.customSqlSegment} + + + diff --git a/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java b/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java index 6fa9d56..c6fc476 100644 --- a/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java +++ b/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java @@ -1,6 +1,7 @@ package org.energy.modules.leger.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.entity.InspectionObject; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.vo.EquipmentLedgerVO; import com.dayu.daf.core.mp.base.BaseService; @@ -34,4 +35,13 @@ public interface IEquipmentLedgerService extends BaseService { */ List export(Wrapper queryWrapper); + /** + * 获取路线编号 + */ + List getKksNoList(); + /** + * 获取路线的信息 + */ + EquipmentLedger getDetailList(String objectNo); + } diff --git a/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java index 0998ddf..5ecd523 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java @@ -1,6 +1,7 @@ package org.energy.modules.leger.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.inspection.entity.InspectionObject; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.vo.EquipmentLedgerVO; import org.energy.modules.leger.mapper.EquipmentLedgerMapper; @@ -32,4 +33,15 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl getKksNoList() { + List list = baseMapper.getKksNoList(); + return list; + } + + @Override + public EquipmentLedger getDetailList(String KkstNo) { + EquipmentLedger DetailList = baseMapper.getDetailList(KkstNo); + return DetailList; + } }