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 15a2c64..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()); } @@ -144,7 +141,7 @@ public class InspectionPlanController extends DafController { public R submit(@Valid @RequestBody InspectionPlan inspectionPlan) { inspectionPlan.setPlanStatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionPlanService.getMaxNo(date); + String maxNo = inspectionPlanService.getMaxNo("'%" + date + "%'"); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -216,6 +213,12 @@ public class InspectionPlanController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"planStatus".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new); List list = inspectionPlanService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -243,7 +246,7 @@ public class InspectionPlanController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetail(String planNo) { - InspectionPlan detail = inspectionPlanService.getDetail(planNo); + InspectionPlan detail = inspectionPlanService.getDetail("'" + planNo + "'"); return R.data(detail); } } 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 9847cad..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()); } @@ -144,7 +141,7 @@ public class InspectionRouteController extends DafController { public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { inspectionRoute.setIstatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionRouteService.getMaxNo(date); + String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -217,6 +214,12 @@ public class InspectionRouteController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"istatus".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new); List list = inspectionRouteService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -244,7 +247,7 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetailList(String routeNo) { - InspectionRoute DetailList = inspectionRouteService.getDetailList(routeNo); + InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'"); return R.data(DetailList); } 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 5ffb0ae..c26f7e1 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 CONCAT('%', #{entity.routeName}, '%') - - AND a.stations = #{entity.stations} - AND a.type LIKE CONCAT('%', #{entity.type}, '%') diff --git a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java index 476ea7e..7f40435 100644 --- a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java +++ b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.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; @@ -99,6 +100,7 @@ public class ToolInventoryRecord extends BaseEntity { /** * 是否检验周期内 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否检验周期内") private Integer isInspectionPeriod; /** diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitAttachmentController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitAttachmentController.java new file mode 100644 index 0000000..7392346 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitAttachmentController.java @@ -0,0 +1,142 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * 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.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +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.leger.entity.TechParameters; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestParam; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.energy.modules.smart.entity.WorkPermitAttachment; +import org.energy.modules.smart.vo.WorkPermitAttachmentVO; +import org.energy.modules.smart.service.IWorkPermitAttachmentService; +import com.dayu.daf.core.boot.ctrl.DafController; + +import java.util.List; + +/** + * 工作票附票一览 控制器 + * + * @author Daf + * @since 2024-07-15 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/smart/workpermitattachment") +@Api(value = "工作票附票一览", tags = "工作票附票一览接口") +public class WorkPermitAttachmentController extends DafController { + + private IWorkPermitAttachmentService workPermitAttachmentService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入workPermitAttachment") + public R detail(WorkPermitAttachment workPermitAttachment) { + WorkPermitAttachment detail = workPermitAttachmentService.getOne(Condition.getQueryWrapper(workPermitAttachment)); + return R.data(detail); + } + + /** + * 分页 工作票附票一览 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入workPermitAttachment") + public R> list(WorkPermitAttachment workPermitAttachment, Query query) { + IPage pages = workPermitAttachmentService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermitAttachment)); + return R.data(pages); + } + + /** + * 自定义分页 工作票附票一览 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入workPermitAttachment") + public R> page(WorkPermitAttachmentVO workPermitAttachment, Query query) { + IPage pages = workPermitAttachmentService.selectWorkPermitAttachmentPage(Condition.getPage(query), workPermitAttachment); + return R.data(pages); + } + + /** + * 新增 工作票附票一览 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入workPermitAttachment") + public R save(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) { + return R.status(workPermitAttachmentService.save(workPermitAttachment)); + } + + /** + * 修改 工作票附票一览 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入workPermitAttachment") + public R update(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) { + return R.status(workPermitAttachmentService.updateById(workPermitAttachment)); + } + + /** + * 新增或修改 工作票附票一览 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入workPermitAttachment") + public R submit(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) { + String ticketNo =workPermitAttachment.getTicketCode(); + Integer ticketType =workPermitAttachment.getTicketType(); + Integer maxNo= workPermitAttachmentService.getCount(workPermitAttachment.getWorkTicketNo())+1; + String ticketIndex =String.format("%02d", maxNo); + workPermitAttachment.setTicketCode(ticketNo + ticketType.toString() + ticketIndex); + return R.status(workPermitAttachmentService.saveOrUpdate(workPermitAttachment)); + } + + /** + * 删除 工作票附票一览 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(workPermitAttachmentService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 列表 技术参数一览 + */ + @GetMapping("/getList") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "列表", notes = "workPermitAttachment") + public R> getList(WorkPermitAttachment workPermitAttachment) { + List list = workPermitAttachmentService.list(Condition.getQueryWrapper(workPermitAttachment)); + return R.data(list); + } +} diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java new file mode 100644 index 0000000..b0d39eb --- /dev/null +++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java @@ -0,0 +1,253 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * 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.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; +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 lombok.SneakyThrows; +import org.apache.commons.codec.Charsets; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; +import org.energy.modules.smart.excel.WorkOrderExcel; +import org.energy.modules.smart.excel.WorkPermitExcel; +import org.energy.modules.smart.service.IWorkPermitAttachmentService; +import org.energy.modules.smart.vo.WorkOrderVO; +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; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.vo.WorkPermitVO; +import org.energy.modules.smart.service.IWorkPermitService; +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; + +/** + * 工作票一览 控制器 + * + * @author Daf + * @since 2024-07-15 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/smart/workpermit") +@Api(value = "工作票一览", tags = "工作票一览接口") +public class WorkPermitController extends DafController { + + private IWorkPermitService workPermitService; + private IWorkPermitAttachmentService workPermitAttachmentService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入workPermit") + public R detail(WorkPermit workPermit) { + WorkPermit detail = workPermitService.getOne(Condition.getQueryWrapper(workPermit)); + return R.data(detail); + } + + /** + * 分页 工作票一览 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入workPermit") + public R> list(WorkPermit workPermit, Query query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByAsc("eq_ledger_code"); + //场站 + if (null != workPermit.getStations()) { + qw.lambda().eq(WorkPermit::getStations, workPermit.getStations()); + } + //工作票编号 + if (StringUtil.isNotEmpty(workPermit.getWorkTicketNo())) { + qw.lambda().like(WorkPermit::getWorkTicketNo, workPermit.getWorkTicketNo()); + } + //工作票类型 + if (StringUtil.isNotEmpty(workPermit.getWorkTicketType())) { + qw.lambda().like(WorkPermit::getWorkTicketType, workPermit.getWorkTicketType()); + } + //状态 + if (null != workPermit.getWorkState()) { + qw.lambda().eq(WorkPermit::getWorkState, workPermit.getWorkState()); + } + //许可人 + if (StringUtil.isNotEmpty(workPermit.getLicensors())) { + qw.lambda().like(WorkPermit::getLicensors, workPermit.getLicensors()); + } + //签发人 + if (StringUtil.isNotEmpty(workPermit.getIssuer())) { + qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer()); + } + //计划开始时间 + if (StringUtil.isNotEmpty(workPermit.getPlanStartDate())) { + qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate()); + } + //工作负责人 + if (StringUtil.isNotEmpty(workPermit.getWorkChargePerson())) { + qw.lambda().like(WorkPermit::getWorkChargePerson, workPermit.getWorkChargePerson()); + } + IPage pages = workPermitService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermit)); + return R.data(pages); + } + + /** + * 自定义分页 工作票一览 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入workPermit") + public R> page(WorkPermitVO workPermit, Query query) { + IPage pages = workPermitService.selectWorkPermitPage(Condition.getPage(query), workPermit); + return R.data(pages); + } + + /** + * 新增 工作票一览 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入workPermit") + public R save(@Valid @RequestBody WorkPermit workPermit) { + return R.status(workPermitService.save(workPermit)); + } + + /** + * 修改 工作票一览 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入workPermit") + public R update(@Valid @RequestBody WorkPermit workPermit) { + return R.status(workPermitService.updateById(workPermit)); + } + + /** + * 新增或修改 工作票一览 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入workPermit") + public R submit(@Valid @RequestBody WorkPermit workPermit) { + return R.status(workPermitService.saveOrUpdate(workPermit)); + } + + /** + * 删除 工作票一览 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + for (String id : ids.split(",")) { + workPermitAttachmentService.delWorkPermitAttachment(Long.parseLong(id)); + } + return R.status(workPermitService.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(Integer status, String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + WorkPermit workPermit = new WorkPermit(); + workPermit.setId(Long.parseLong(id)); + workPermit.setCheckStatus(status); + list.add(workPermit); + } + return R.status(workPermitService.updateBatchById(list)); + } + + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "导出", notes = "传入") + @ApiLog + public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + WorkPermitVO vo = DataUtils.mapToEntity(entity, WorkPermitVO::new); + List list = workPermitService.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(), WorkPermitExcel.class).sheet("工作票").doWrite(list); + } + + /** + * 关票工作票一览 + */ + @PostMapping("/closeTicket") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "更新", notes = "传入ids") + public R closeTicket(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + WorkPermit workPermit = new WorkPermit(); + workPermit.setId(Long.parseLong(id)); + workPermit.setWorkState(4); + list.add(workPermit); + } + return R.status(workPermitService.updateBatchById(list)); + } +} + diff --git a/src/main/java/org/energy/modules/smart/dto/WorkPermitAttachmentDTO.java b/src/main/java/org/energy/modules/smart/dto/WorkPermitAttachmentDTO.java new file mode 100644 index 0000000..d145237 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/dto/WorkPermitAttachmentDTO.java @@ -0,0 +1,18 @@ +package org.energy.modules.smart.dto; + +import org.energy.modules.smart.entity.WorkPermitAttachment; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工作票附票一览数据传输对象实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPermitAttachmentDTO extends WorkPermitAttachment { + private static final long serialVersionUID = 1L; + +} diff --git a/src/main/java/org/energy/modules/smart/dto/WorkPermitDTO.java b/src/main/java/org/energy/modules/smart/dto/WorkPermitDTO.java new file mode 100644 index 0000000..ebeffbb --- /dev/null +++ b/src/main/java/org/energy/modules/smart/dto/WorkPermitDTO.java @@ -0,0 +1,18 @@ +package org.energy.modules.smart.dto; + +import org.energy.modules.smart.entity.WorkPermit; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工作票一览数据传输对象实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPermitDTO extends WorkPermit { + private static final long serialVersionUID = 1L; + +} 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; /** diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java new file mode 100644 index 0000000..4bfbfbb --- /dev/null +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java @@ -0,0 +1,169 @@ +package org.energy.modules.smart.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; +import io.swagger.annotations.ApiModelProperty; + +/** + * 工作票一览实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@TableName("smt_work_permit") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "WorkPermit对象", description = "工作票一览") +public class WorkPermit extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + /** + * KKS编码 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "KKS编码") + private String kksEncoding; + /** + * KKS描述 + */ + @ApiModelProperty(value = "KKS描述") + private String kksDescription; + /** + * 场站 + */ + @ApiModelProperty(value = "场站") + private Integer stations; + /** + * 工作票编号 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "工作票编号") + private String workTicketNo; + /** + * 工作票类型 + */ + @ApiModelProperty(value = "工作票类型") + private String workTicketType; + /** + * 工单 + */ + @ApiModelProperty(value = "工单") + private String tickets; + /** + * 班组 + */ + @ApiModelProperty(value = "班组") + private String team; + /** + * 工作负责人 + */ + @ApiModelProperty(value = "工作负责人") + private String workChargePerson; + /** + * 工作班成员 + */ + @ApiModelProperty(value = "工作班成员") + private String workClassMembers; + /** + * 许可人 + */ + @ApiModelProperty(value = "许可人") + private String licensors; + /** + * 签发人 + */ + @ApiModelProperty(value = "签发人") + private String issuer; + /** + * 功能位置 + */ + @ApiModelProperty(value = "功能位置") + private String functionalLocation; + /** + * 工作地点 + */ + @ApiModelProperty(value = "工作地点") + private String placeWork; + /** + * 工作内容 + */ + @ApiModelProperty(value = "工作内容") + private String jobDescription; + /** + * 计划开始时间 + */ + @ApiModelProperty(value = "计划开始时间") + private String planStartDate; + /** + * 计划结束时间 + */ + @ApiModelProperty(value = "计划结束时间") + private String planEndDate; + /** + * 工作条件 + */ + @ApiModelProperty(value = "工作条件") + private String workingConditions; + /** + * 实际结束时间 + */ + @ApiModelProperty(value = "实际结束时间") + private String actualEndDate; + /** + * 是否延期 + */ + @ApiModelProperty(value = "是否延期") + private Integer isExtended; + /** + * 计划延期时间 + */ + @ApiModelProperty(value = "计划延期时间") + private String plannedExtensionDate; + /** + * 延期申请理由 + */ + @ApiModelProperty(value = "延期申请理由") + private String extRegReason; + /** + * 是否变更 + */ + @ApiModelProperty(value = "是否变更") + private Integer ischanged; + /** + * 变更申请理由 + */ + @ApiModelProperty(value = "变更申请理由") + private String changeReason; + /** + * 总结 + */ + @ApiModelProperty(value = "总结") + private String summary; + /** + * 工作状态 + */ + @ApiModelProperty(value = "工作状态") + private Integer workState; + + /** + * 审核状态 + */ + @ApiModelProperty(value = "审核状态") + private Integer checkStatus; + + +} diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermitAttachment.java b/src/main/java/org/energy/modules/smart/entity/WorkPermitAttachment.java new file mode 100644 index 0000000..7ae729d --- /dev/null +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermitAttachment.java @@ -0,0 +1,74 @@ +package org.energy.modules.smart.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; +import io.swagger.annotations.ApiModelProperty; + +/** + * 工作票附票一览实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@TableName("smt_work_permit_attachment") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "WorkPermitAttachment对象", description = "工作票附票一览") +public class WorkPermitAttachment extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + + /** + * 工作票主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "工作票主键") + private Long workTicketNo; + /** + * 附票编码 + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "附票编码") + private String ticketCode; + /** + * 附票类型 + */ + @ApiModelProperty(value = "附票类型") + private Integer ticketType; + /** + * 专项作业名称 + */ + @ApiModelProperty(value = "专项作业名称") + private String specialJobName; + /** + * 工作内容 + */ + @ApiModelProperty(value = "工作内容") + private String jobDescription; + /** + * 工作状态 + */ + @ApiModelProperty(value = "工作状态") + private Integer workStatus; + /** + * 工作地点 + */ + @ApiModelProperty(value = "工作地点") + private String placeWork; + + +} diff --git a/src/main/java/org/energy/modules/smart/excel/WorkPermitExcel.java b/src/main/java/org/energy/modules/smart/excel/WorkPermitExcel.java new file mode 100644 index 0000000..f7a8c42 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/excel/WorkPermitExcel.java @@ -0,0 +1,106 @@ +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 lombok.Data; + +import java.io.Serializable; + +/** + * WorkPermit model export + * @author edwong + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(16) +public class WorkPermitExcel implements Serializable { + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty(value = "KKS编码") + private String kksEncoding; + + @ColumnWidth(20) + @ExcelProperty(value = "KKS描述") + private String kksDescription; + + @ColumnWidth(20) + @ExcelProperty(value = "场站") + private String stations; + + @ColumnWidth(20) + @ExcelProperty(value = "工作票编号") + private String workTicketNo; + + @ColumnWidth(20) + @ExcelProperty(value = "工作票类型") + private String workTicketType; + + @ColumnWidth(20) + @ExcelProperty(value = "工单") + private String tickets; + + @ColumnWidth(20) + @ExcelProperty(value = "班组") + private String team; + + @ColumnWidth(20) + @ExcelProperty(value = "工作负责人") + private String workChargePerson; + + @ColumnWidth(20) + @ExcelProperty(value = "工作班成员") + private String workClassMembers; + + @ColumnWidth(20) + @ExcelProperty(value = "许可人") + private String licensors; + + @ColumnWidth(20) + @ExcelProperty(value = "签发人") + private String issuer; + + @ColumnWidth(20) + @ExcelProperty(value = "功能位置") + private String functionalLocation; + + @ColumnWidth(20) + @ExcelProperty(value = "工作地点") + private String placeWork; + + @ColumnWidth(20) + @ExcelProperty(value = "工作内容") + private String jobDescription; + + @ColumnWidth(20) + @ExcelProperty(value = "计划开始时间") + private String planStartDate; + + @ColumnWidth(20) + @ExcelProperty(value = "工作条件") + private String workingConditions; + + @ColumnWidth(20) + @ExcelProperty(value = "计划结束时间") + private String planEndDate; + + @ColumnWidth(20) + @ExcelProperty(value = "实际结束时间") + private String actualEndDate; + + @ColumnWidth(20) + @ExcelProperty(value = "是否延期") + private String isExtended; + + @ColumnWidth(20) + @ExcelProperty(value = "状态") + private String workState; + + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String checkStatus; + +} diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.java b/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.java new file mode 100644 index 0000000..11d2224 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.java @@ -0,0 +1,39 @@ +package org.energy.modules.smart.mapper; + +import org.energy.modules.smart.entity.WorkPermitAttachment; +import org.energy.modules.smart.vo.WorkPermitAttachmentVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * 工作票附票一览 Mapper 接口 + * + * @author Daf + * @since 2024-07-15 + */ +public interface WorkPermitAttachmentMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param workPermitAttachment + * @return + */ + List selectWorkPermitAttachmentPage(IPage page, WorkPermitAttachmentVO workPermitAttachment); + + /** + * 获取最大条数 + */ + Integer getCount(Long workTicketNo); + + /** + * 删除 + * + * @param workTicketNo + * @return + */ + boolean delWorkPermitAttachment(Long workTicketNo); + +} diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.xml b/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.xml new file mode 100644 index 0000000..ddf3939 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update smt_work_permit_attachment set is_deleted = 1 where work_ticket_no = #{workTicketNo} + + diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.java b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.java new file mode 100644 index 0000000..fc61cd8 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.java @@ -0,0 +1,32 @@ +package org.energy.modules.smart.mapper; + +import org.apache.ibatis.annotations.Param; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.excel.WorkOrderExcel; +import org.energy.modules.smart.excel.WorkPermitExcel; +import org.energy.modules.smart.vo.WorkOrderVO; +import org.energy.modules.smart.vo.WorkPermitVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * 工作票一览 Mapper 接口 + * + * @author Daf + * @since 2024-07-15 + */ +public interface WorkPermitMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param workPermit + * @return + */ + List selectWorkPermitPage(IPage page, WorkPermitVO workPermit); + + List exportData(@Param("vo") WorkPermitVO workPermit); + +} diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml new file mode 100644 index 0000000..a7c5078 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/energy/modules/smart/service/IWorkPermitAttachmentService.java b/src/main/java/org/energy/modules/smart/service/IWorkPermitAttachmentService.java new file mode 100644 index 0000000..aa8ecca --- /dev/null +++ b/src/main/java/org/energy/modules/smart/service/IWorkPermitAttachmentService.java @@ -0,0 +1,43 @@ +package org.energy.modules.smart.service; + +import org.energy.modules.smart.entity.WorkPermitAttachment; +import org.energy.modules.smart.vo.WorkPermitAttachmentVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.function.LongFunction; + +/** + * 工作票附票一览 服务类 + * + * @author Daf + * @since 2024-07-15 + */ +public interface IWorkPermitAttachmentService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param workPermitAttachment + * @return + */ + IPage selectWorkPermitAttachmentPage(IPage page, WorkPermitAttachmentVO workPermitAttachment); + + + /** + * 获取最大条数 + * + * @param workTicketNo + */ + Integer getCount(Long workTicketNo); + + /** + * 删除 + * + * @param workTicketNo + * @return + */ + boolean delWorkPermitAttachment(Long workTicketNo); + +} diff --git a/src/main/java/org/energy/modules/smart/service/IWorkPermitService.java b/src/main/java/org/energy/modules/smart/service/IWorkPermitService.java new file mode 100644 index 0000000..3afec63 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/service/IWorkPermitService.java @@ -0,0 +1,41 @@ +package org.energy.modules.smart.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.excel.WorkOrderExcel; +import org.energy.modules.smart.excel.WorkPermitExcel; +import org.energy.modules.smart.vo.WorkOrderVO; +import org.energy.modules.smart.vo.WorkPermitVO; +import com.dayu.daf.core.mp.base.BaseService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 工作票一览 服务类 + * + * @author Daf + * @since 2024-07-15 + */ +public interface IWorkPermitService extends BaseService { + + /** + * 自定义分页 + * + * @param page + * @param workPermit + * @return + */ + IPage selectWorkPermitPage(IPage page, WorkPermitVO workPermit); + + /** + * 获取导出数据 + * + * @param workPermit + * @return + */ + List export(WorkPermitVO workPermit); + +} diff --git a/src/main/java/org/energy/modules/smart/service/impl/WorkPermitAttachmentServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/WorkPermitAttachmentServiceImpl.java new file mode 100644 index 0000000..99db0d7 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/service/impl/WorkPermitAttachmentServiceImpl.java @@ -0,0 +1,34 @@ +package org.energy.modules.smart.service.impl; + +import org.energy.modules.smart.entity.WorkPermitAttachment; +import org.energy.modules.smart.vo.WorkPermitAttachmentVO; +import org.energy.modules.smart.mapper.WorkPermitAttachmentMapper; +import org.energy.modules.smart.service.IWorkPermitAttachmentService; +import com.dayu.daf.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 工作票附票一览 服务实现类 + * + * @author Daf + * @since 2024-07-15 + */ +@Service +public class WorkPermitAttachmentServiceImpl extends BaseServiceImpl implements IWorkPermitAttachmentService { + + @Override + public IPage selectWorkPermitAttachmentPage(IPage page, WorkPermitAttachmentVO workPermitAttachment) { + return page.setRecords(baseMapper.selectWorkPermitAttachmentPage(page, workPermitAttachment)); + } + @Override + public Integer getCount(Long workTicketNo){ + Integer maxCount = baseMapper.getCount(workTicketNo); + return maxCount; + } + + @Override + public boolean delWorkPermitAttachment(Long workTicketNo) { + return baseMapper.delWorkPermitAttachment(workTicketNo); + } +} diff --git a/src/main/java/org/energy/modules/smart/service/impl/WorkPermitServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/WorkPermitServiceImpl.java new file mode 100644 index 0000000..ebb0c69 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/service/impl/WorkPermitServiceImpl.java @@ -0,0 +1,53 @@ +package org.energy.modules.smart.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import io.micrometer.core.instrument.util.StringUtils; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.excel.EquipmentLedgerExcel; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.excel.WorkOrderExcel; +import org.energy.modules.smart.excel.WorkPermitExcel; +import org.energy.modules.smart.vo.WorkPermitVO; +import org.energy.modules.smart.mapper.WorkPermitMapper; +import org.energy.modules.smart.service.IWorkPermitService; +import com.dayu.daf.core.mp.base.BaseServiceImpl; +import org.energy.modules.system.service.IDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 工作票一览 服务实现类 + * + * @author Daf + * @since 2024-07-15 + */ +@Service +public class WorkPermitServiceImpl extends BaseServiceImpl implements IWorkPermitService { + + @Autowired + IDictService dictService; + + @Override + public IPage selectWorkPermitPage(IPage page, WorkPermitVO workPermit) { + return page.setRecords(baseMapper.selectWorkPermitPage(page, workPermit)); + } + + @Override + public List export(WorkPermitVO workPermit) { + List list = baseMapper.exportData(workPermit); + list.forEach(item -> { + if (StringUtils.isNotEmpty(item.getIsExtended())) + item.setIsExtended(dictService.getValue("yes_no", Integer.parseInt(item.getIsExtended()))); + if (StringUtils.isNotEmpty(item.getStations())) + item.setStations(dictService.getValue("station", Integer.parseInt(item.getStations()))); + if (StringUtils.isNotEmpty(item.getWorkState())) + item.setWorkState(dictService.getValue("work_status", Integer.parseInt(item.getWorkState()))); + if (StringUtils.isNotEmpty(item.getCheckStatus())) + item.setCheckStatus(dictService.getValue("check_status", Integer.parseInt(item.getCheckStatus()))); + }); + return list; + } +} diff --git a/src/main/java/org/energy/modules/smart/vo/WorkPermitAttachmentVO.java b/src/main/java/org/energy/modules/smart/vo/WorkPermitAttachmentVO.java new file mode 100644 index 0000000..7c9fe35 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/vo/WorkPermitAttachmentVO.java @@ -0,0 +1,20 @@ +package org.energy.modules.smart.vo; + +import org.energy.modules.smart.entity.WorkPermitAttachment; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; + +/** + * 工作票附票一览视图实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "WorkPermitAttachmentVO对象", description = "工作票附票一览") +public class WorkPermitAttachmentVO extends WorkPermitAttachment { + private static final long serialVersionUID = 1L; + +} diff --git a/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java new file mode 100644 index 0000000..e333ff3 --- /dev/null +++ b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java @@ -0,0 +1,20 @@ +package org.energy.modules.smart.vo; + +import org.energy.modules.smart.entity.WorkPermit; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; + +/** + * 工作票一览视图实体类 + * + * @author Daf + * @since 2024-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "WorkPermitVO对象", description = "工作票一览") +public class WorkPermitVO extends WorkPermit { + private static final long serialVersionUID = 1L; + +}