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] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=20=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20bug=E5=AF=B9=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; /**