From 900cbcf73e364cd6110e06453dcc9c33d95d43da Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Tue, 16 Jul 2024 17:14:52 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkPermitAttachmentController.java | 142 ++++++++++ .../controller/WorkPermitController.java | 253 ++++++++++++++++++ .../smart/dto/WorkPermitAttachmentDTO.java | 18 ++ .../modules/smart/dto/WorkPermitDTO.java | 18 ++ .../modules/smart/entity/WorkPermit.java | 169 ++++++++++++ .../smart/entity/WorkPermitAttachment.java | 74 +++++ .../modules/smart/excel/WorkPermitExcel.java | 106 ++++++++ .../mapper/WorkPermitAttachmentMapper.java | 39 +++ .../mapper/WorkPermitAttachmentMapper.xml | 35 +++ .../smart/mapper/WorkPermitMapper.java | 32 +++ .../modules/smart/mapper/WorkPermitMapper.xml | 99 +++++++ .../service/IWorkPermitAttachmentService.java | 43 +++ .../smart/service/IWorkPermitService.java | 41 +++ .../impl/WorkPermitAttachmentServiceImpl.java | 34 +++ .../service/impl/WorkPermitServiceImpl.java | 53 ++++ .../smart/vo/WorkPermitAttachmentVO.java | 20 ++ .../energy/modules/smart/vo/WorkPermitVO.java | 20 ++ 17 files changed, 1196 insertions(+) create mode 100644 src/main/java/org/energy/modules/smart/controller/WorkPermitAttachmentController.java create mode 100644 src/main/java/org/energy/modules/smart/controller/WorkPermitController.java create mode 100644 src/main/java/org/energy/modules/smart/dto/WorkPermitAttachmentDTO.java create mode 100644 src/main/java/org/energy/modules/smart/dto/WorkPermitDTO.java create mode 100644 src/main/java/org/energy/modules/smart/entity/WorkPermit.java create mode 100644 src/main/java/org/energy/modules/smart/entity/WorkPermitAttachment.java create mode 100644 src/main/java/org/energy/modules/smart/excel/WorkPermitExcel.java create mode 100644 src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.java create mode 100644 src/main/java/org/energy/modules/smart/mapper/WorkPermitAttachmentMapper.xml create mode 100644 src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.java create mode 100644 src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml create mode 100644 src/main/java/org/energy/modules/smart/service/IWorkPermitAttachmentService.java create mode 100644 src/main/java/org/energy/modules/smart/service/IWorkPermitService.java create mode 100644 src/main/java/org/energy/modules/smart/service/impl/WorkPermitAttachmentServiceImpl.java create mode 100644 src/main/java/org/energy/modules/smart/service/impl/WorkPermitServiceImpl.java create mode 100644 src/main/java/org/energy/modules/smart/vo/WorkPermitAttachmentVO.java create mode 100644 src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java 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/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; + +} From 4dea0d94fc1b8161c450359fc3fc34ecafca353e Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:19:10 +0800 Subject: [PATCH 02/14] =?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} From 3edc637a47d759fbee184ac8ec849314ff326562 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 10:43:58 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=20=E4=B8=8B=E6=8B=89=E6=A1=86=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/energy/modules/leger/entity/ToolInventoryRecord.java | 2 ++ 1 file changed, 2 insertions(+) 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; /** From ccab9a4fe3204fd4a010d6b5626d1312a0c46178 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 10:44:30 +0800 Subject: [PATCH 04/14] =?UTF-8?q?sql=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 10 ++-------- .../controller/InspectionRouteController.java | 10 ++-------- .../modules/inspection/mapper/InspectionPlanMapper.xml | 10 +++++----- .../inspection/mapper/InspectionRouteMapper.xml | 10 +++++----- 4 files changed, 14 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..15a2c64 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -144,7 +144,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,12 +216,6 @@ public class InspectionPlanController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"station".equals(key) && !"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"); @@ -249,7 +243,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 0a24905..9847cad 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -144,7 +144,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,12 +217,6 @@ public class InspectionRouteController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"stations".equals(key) && !"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"); @@ -250,7 +244,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/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index cc148a8..5ffb0ae 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -36,16 +36,16 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.plan_no LIKE #{entity.planNo} + AND a.plan_no LIKE CONCAT('%', #{entity.planNo}, '%') - AND a.plan_name LIKE #{entity.planName} + AND a.plan_name LIKE CONCAT('%', #{entity.planName}, '%') AND a.station = #{entity.station} - AND a.period_type LIKE #{entity.periodType} + AND a.period_type LIKE CONCAT('%', #{entity.periodType}, '%') AND a.plan_status = #{entity.planStatus} @@ -58,11 +58,11 @@ diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml index 402eff3..b5fc70d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -33,16 +33,16 @@ 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 - AND a.route_no LIKE #{entity.routeNo} + AND a.route_no LIKE CONCAT('%', #{entity.routeNo}, '%') - AND a.route_name LIKE #{entity.routeName} + AND a.route_name LIKE CONCAT('%', #{entity.routeName}, '%') AND a.stations = #{entity.stations} - AND a.type LIKE #{entity.type} + AND a.type LIKE CONCAT('%', #{entity.type}, '%') AND a.istatus = #{entity.istatus} @@ -55,11 +55,11 @@ From d2ef28d0471eab01000ad96f623b9be4d606f437 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:44:43 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E5=85=B3=E8=81=94=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionTasksController.java | 8 ++++++++ .../inspection/mapper/InspectionTasksMapper.java | 2 ++ .../inspection/mapper/InspectionTasksMapper.xml | 14 ++++++++++++++ .../service/IInspectionTasksService.java | 2 ++ .../service/impl/InspectionTasksServiceImpl.java | 6 ++++++ 5 files changed, 32 insertions(+) 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 d2951d5..532baae 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -247,5 +247,13 @@ public class InspectionTasksController extends DafController { EasyExcel.write(response.getOutputStream(), InspectionTasksExcel.class).sheet("巡检任务").doWrite(list); } + @GetMapping("/getListByToolsCodeId") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "通过工器具编码获取巡检任务", notes = "通过工器具编码获取巡检任务") + public R> getListByToolsCodeId(String toolsCodeId) { + List pages = inspectionTasksService.getListByToolsCodeId(toolsCodeId); + return R.data(pages); + } + } 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 f5ce492..e68de5d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java @@ -39,4 +39,6 @@ public interface InspectionTasksMapper extends BaseMapper { */ String getMaxTaskNO(String date); + List getListByToolsCodeId(String toolsCodeId); + } 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 a90d53c..4fdad89 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -71,4 +71,18 @@ FROM i_inspection_tasks where task_no like ${date} + + diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java index d917083..c7d5f7e 100644 --- a/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java @@ -42,4 +42,6 @@ public interface IInspectionTasksService extends BaseService { */ String getMaxTaskNo(String date); + List getListByToolsCodeId(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java index f9db9bc..7e7fb6d 100644 --- a/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java @@ -45,4 +45,10 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl getListByToolsCodeId(String toolsCodeId) { + List list = baseMapper.getListByToolsCodeId(toolsCodeId); + return list; + } + } From 06df1d313c7e5be5833486870368d002fc18888d Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 10:58:19 +0800 Subject: [PATCH 06/14] =?UTF-8?q?sql=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 10 ++-------- .../controller/InspectionRouteController.java | 10 ++-------- .../controller/InspectionTasksController.java | 8 +------- .../inspection/mapper/InspectionTasksMapper.xml | 12 ++++++------ 4 files changed, 11 insertions(+), 29 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 a330d47..3cddf13 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -141,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)); @@ -213,12 +213,6 @@ 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"); @@ -246,7 +240,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 86532af..639c344 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -141,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)); @@ -214,12 +214,6 @@ 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"); @@ -247,7 +241,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/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index 532baae..85a05db 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -162,7 +162,7 @@ public class InspectionTasksController extends DafController { public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) { inspectionTasks.setTaskStatus(1L); String date = LocalDate.now().toString().replace("-",""); - String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'"); + String maxTaskNo = inspectionTasksService.getMaxTaskNo(date); int number; if (StringUtil.isNotEmpty(maxTaskNo)){ number = Integer.parseInt(maxTaskNo.substring(9)); @@ -232,12 +232,6 @@ public class InspectionTasksController extends DafController { @ApiLog public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { 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"); 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 4fdad89..f860d53 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -44,22 +44,22 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.task_no LIKE #{entity.taskNo} + AND a.task_no LIKE CONCAT('%', #{entity.taskNo}, '%') - AND a.task_name LIKE #{entity.taskName} + AND a.task_name LIKE CONCAT('%', #{entity.taskName}, '%') AND a.station = #{entity.station} - AND a.task_start_date LIKE #{entity.taskStartDate} + AND a.task_start_date LIKE CONCAT('%', #{entity.taskStartDate}, '%') - AND a.task_end_date LIKE #{entity.taskEndDate} + AND a.task_end_date LIKE CONCAT('%', #{entity.taskEndDate}, '%') - AND a.responsible_person LIKE #{entity.responsiblePerson} + AND a.responsible_person LIKE CONCAT('%', #{entity.responsiblePerson}, '%') AND a.task_status = #{entity.taskStatus} @@ -68,7 +68,7 @@ From cec9a2725b3ca250dbf1b00636c38e668ec24518 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 17 Jul 2024 11:13:21 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarehouseController.java | 20 +++++++++++++++++++ .../energy/modules/system/util/DataUtils.java | 17 ++++++++++++++++ 2 files changed, 37 insertions(+) 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 c34bf84..40464c1 100644 --- a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java +++ b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java @@ -140,6 +140,26 @@ public class WarehouseController extends DafController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入warehouse") public R submit(@Valid @RequestBody Warehouse warehouse) { + if (warehouse.getId() == null) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().select(Warehouse::getCode) + .eq(Warehouse::getType, warehouse.getType()) + .eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED) + .orderByDesc(Warehouse::getCode) + .last("LIMIT 1"); + String code = ""; + Warehouse warehouseSelect = warehouseService.getOne(qw); + if (warehouseSelect != null) { + String maxCode = warehouseSelect.getCode(); + if ("9999".equals(maxCode)) { + return R.fail("操作失败，编号已越位"); + } + code = "CK" + warehouse.getType() + DataUtils.incrementLast(maxCode, 4); + } else { + code = "CK" + warehouse.getType() + "0001"; + } + warehouse.setCode(code); + } return R.status(warehouseService.saveOrUpdate(warehouse)); } diff --git a/src/main/java/org/energy/modules/system/util/DataUtils.java b/src/main/java/org/energy/modules/system/util/DataUtils.java index 2d1babd..2e49591 100644 --- a/src/main/java/org/energy/modules/system/util/DataUtils.java +++ b/src/main/java/org/energy/modules/system/util/DataUtils.java @@ -68,4 +68,21 @@ public class DataUtils { // Add more type conversions as needed return value; } + + /** + * 将字符串末尾的latterIndex位数字加一并格式化成latterIndex位数 + * @param str + * @return + */ + public static String incrementLast(String str, int latterIndex) { + // 获取字符串末尾的latterIndex位字符 + String lastFour = str.substring(Math.max(0, str.length() - latterIndex)); + // 将末尾字符转换为整数 + int number = Integer.parseInt(lastFour); + // 整数加一 + number++; + // 格式化整数为latterIndex位数的字符串 + String result = String.format("%0" + latterIndex + "d", number); + return result; + } } From a3f861a00a441845feed8339a09b6b1941a96561 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 17 Jul 2024 11:37:32 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spares/entity/ManufacturerInfo.java | 14 +++++++++----- .../energy/modules/spares/entity/SupplierInfo.java | 9 +++++++-- .../spares/excel/ManufacturerInfoExcel.java | 8 ++++++++ .../modules/spares/excel/SupplierInfoExcel.java | 10 +++++++++- .../spares/mapper/ManufacturerInfoMapper.xml | 4 +++- .../modules/spares/mapper/SupplierInfoMapper.xml | 4 +++- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java index 5c2f52c..fcbcb9f 100644 --- a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java @@ -65,12 +65,16 @@ public class ManufacturerInfo extends BaseEntity { */ @ApiModelProperty(value = "经营范围") private String businessScope; - /** - * 执行标准 - */ + /** + * 审核状态 + */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; - + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java index 753abff..2a18d79 100644 --- a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java @@ -66,10 +66,10 @@ public class SupplierInfo extends BaseEntity { @ApiModelProperty(value = "经营范围") private String businessScope; /** - * 执行标准 + * 审核状态 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; /** * 付款条约 @@ -81,6 +81,11 @@ public class SupplierInfo extends BaseEntity { */ @ApiModelProperty(value = "价格条款") private String priceTerms; + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java index 51ee610..b62a737 100644 --- a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java @@ -85,6 +85,14 @@ public class ManufacturerInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") + private String executiveStandards; + + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") private String approvalStatus; } diff --git a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java index 4c00fa6..8b062a3 100644 --- a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java @@ -82,7 +82,7 @@ public class SupplierInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") - private String approvalStatus; + private String executiveStandards; /** * 付款条约 */ @@ -96,4 +96,12 @@ public class SupplierInfoExcel implements Serializable { @ExcelProperty(value = "价格条款") private String priceTerms; + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String approvalStatus; + } 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 0790f0e..ed03a5c 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -36,7 +37,8 @@ a.contact_number, a.email, a.business_scope, - a.approval_status + a.approval_status, + a.executive_standards from spt_manufacturer_info a where a.is_deleted = 0 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 a480ce3..7daf699 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml @@ -19,6 +19,7 @@ + @@ -39,7 +40,8 @@ a.business_scope, a.approval_status, a.payment_terms, - a.price_terms + a.price_terms, + a.executive_standards from spt_supplier_info a where a.is_deleted = 0 From 59f8cda331688a19bde17312474a9f8c703cf602 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 14:43:09 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=20=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20bug=E5=AF=B9?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/entity/InspectionObject.java | 11 +++++-- .../excel/InspectionObjectExcel.java | 4 +++ .../mapper/InspectionObjectMapper.xml | 2 ++ .../ToolInventoryRecordController.java | 31 +++++++++++++------ .../mapper/ToolInventoryRecordMapper.java | 9 ++++++ .../mapper/ToolInventoryRecordMapper.xml | 8 +++++ .../service/IToolInventoryRecordService.java | 9 ++++++ .../impl/TechParametersServiceImpl.java | 1 + .../impl/ToolInventoryRecordServiceImpl.java | 12 +++++++ .../modules/smart/entity/WorkPermit.java | 3 ++ 10 files changed, 79 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java index b223837..28891e0 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java @@ -61,11 +61,18 @@ public class InspectionObject extends BaseEntity { */ @ApiModelProperty(value = "对象区域") private String objectArea; + + /** + * KKS编号 + */ + @ApiModelProperty(value = "KKS编号") + private String kksNo; + /** * KKS编号 */ - @ApiModelProperty(value = "KKS编号") - private String kksNo; + @ApiModelProperty(value = "工器具编号") + private String toolsCodeId; /** * 取消原因 */ diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java index a6830a0..b4f2129 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java @@ -43,6 +43,10 @@ public class InspectionObjectExcel implements Serializable { @ExcelProperty(value = "KKS编号") private String kksNo; + @ColumnWidth(15) + @ExcelProperty(value = "工器具台账编码") + private String toolsCodeId; + @ColumnWidth(15) @ExcelProperty(value = "取消原因") private String cancelReason; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml index 7aa1e8d..f14bfa2 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml @@ -18,6 +18,7 @@ + @@ -58,6 +59,7 @@ THEN '巡检对象02' ELSE '' END AS object_name_ext + , tools_code_id FROM i_inspection_object ${ew.customSqlSegment} diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index d19206e..15f3528 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.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.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.TechParameters; import org.energy.modules.leger.excel.ToolInventoryRecordExcel; import org.energy.modules.leger.service.*; @@ -221,14 +222,26 @@ public class ToolInventoryRecordController extends DafController { EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list); } -// /** -// * 删除 检验标准一览 -// */ -// @GetMapping("/del") -// @ApiOperationSupport(order = 9) -// @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") -// public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { -// return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId)); -// } + /** + * 获取对象编号 + */ + @GetMapping("/getToolsCodeIdList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取工器具编码", notes = "获取工器具编码") + public R> getToolsCodeIdList() { + List kksList = toolInventoryRecordService.getToolsCodeIdList(); + return R.data(kksList); + } + + /** + * 获取对象编号 + */ + @GetMapping("/getDetailList") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取工器具信息", notes = "获取工器具信息") + public R getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = toolInventoryRecordService.getDetailList("'" + toolsCodeId + "'"); + return R.data(DetailList); + } } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java index d82dbb4..5e21bc8 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java @@ -30,4 +30,13 @@ public interface ToolInventoryRecordMapper extends BaseMapper exportData(@Param("ew") Wrapper queryWrapper); + /** + * 获取kks编号 + */ + List getToolsCodeIdList(); + /** + * 获取kks的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index cb0447f..60a7800 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -66,4 +66,12 @@ END AS check_status_ext FROM l_tool_inventory_record ${ew.customSqlSegment} + + + + diff --git a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java index eb44cac..1b1b343 100644 --- a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java +++ b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java @@ -36,4 +36,13 @@ public interface IToolInventoryRecordService extends BaseService export(Wrapper queryWrapper); + /** + * 获取路线编号 + */ + List getToolsCodeIdList(); + /** + * 获取路线的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java index b1459e4..69afb83 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java @@ -26,4 +26,5 @@ public class TechParametersServiceImpl extends BaseServiceImpl getToolsCodeIdList() { + List list = baseMapper.getToolsCodeIdList(); + return list; + } + + @Override + public ToolInventoryRecord getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = baseMapper.getDetailList(toolsCodeId); + return DetailList; + } + } diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java index 4bfbfbb..43b03f6 100644 --- a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.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; @@ -126,6 +127,7 @@ public class WorkPermit extends BaseEntity { /** * 是否延期 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否延期") private Integer isExtended; /** @@ -141,6 +143,7 @@ public class WorkPermit extends BaseEntity { /** * 是否变更 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否变更") private Integer ischanged; /** From 3e0344a64c5beadd433a5db2967d9c3d6ff480e7 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 14:58:36 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20bu?= =?UTF-8?q?g=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/energy/modules/inspection/entity/InspectionObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java index 28891e0..32d97bd 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java @@ -40,7 +40,7 @@ public class InspectionObject extends BaseEntity { * 对象名称 */ @ApiModelProperty(value = "对象名称") - private Integer objectName; + private String objectName; /** * 场站 */ From 768a0481d17df43543fe15416eb0683df0ab32f4 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 16:04:49 +0800 Subject: [PATCH 12/14] =?UTF-8?q?BUG=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spares/mapper/MaterialMapper.xml | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml index 1013526..ac128a7 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml @@ -38,18 +38,16 @@ From 64cbcb6e86759efd7673fb7ae141017fc814b389 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 17:25:25 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smart/controller/WorkPermitController.java | 4 ++-- .../energy/modules/smart/entity/WorkPermit.java | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java index b0d39eb..5e02f62 100644 --- a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java +++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java @@ -115,8 +115,8 @@ public class WorkPermitController extends DafController { if (StringUtil.isNotEmpty(workPermit.getIssuer())) { qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer()); } - //计划开始时间 - if (StringUtil.isNotEmpty(workPermit.getPlanStartDate())) { + //计划开始时间 + if (null != workPermit.getPlanStartDate()) { qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate()); } //工作负责人 diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java index 43b03f6..f05425e 100644 --- a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java @@ -1,9 +1,13 @@ package org.energy.modules.smart.entity; +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.NullSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -108,12 +112,14 @@ public class WorkPermit extends BaseEntity { * 计划开始时间 */ @ApiModelProperty(value = "计划开始时间") - private String planStartDate; + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") + private LocalDateTime planStartDate; /** * 计划结束时间 */ @ApiModelProperty(value = "计划结束时间") - private String planEndDate; + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") + private LocalDateTime planEndDate; /** * 工作条件 */ @@ -123,7 +129,8 @@ public class WorkPermit extends BaseEntity { * 实际结束时间 */ @ApiModelProperty(value = "实际结束时间") - private String actualEndDate; + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") + private LocalDateTime actualEndDate; /** * 是否延期 */ @@ -134,7 +141,8 @@ public class WorkPermit extends BaseEntity { * 计划延期时间 */ @ApiModelProperty(value = "计划延期时间") - private String plannedExtensionDate; + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") + private LocalDateTime plannedExtensionDate; /** * 延期申请理由 */ @@ -159,6 +167,7 @@ public class WorkPermit extends BaseEntity { /** * 工作状态 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "工作状态") private Integer workState;