From 8cf748d179ae3ee267b9261f8cd04d6dd2dff4fc Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 13 Dec 2024 17:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8F=90=E4=BA=A4=E8=87=B3?= =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=90=8E=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScrapApplyDetailsController.java | 12 +++++- .../scrap/domain/ScrapApplyDetails.java | 41 ++++++++++++------- .../scrap/domain/vo/ScrapTaskListVo.java | 2 + .../scrap/mapper/ScrapApplyDetailsMapper.java | 2 + .../service/IScrapApplyDetailsService.java | 11 ++++- .../impl/ScrapApplyDetailsServiceImpl.java | 12 ++++++ .../repair/RepairApplyDetailsMapper.xml | 1 + .../scrap/ScrapApplyDetailsMapper.xml | 34 ++++++++++++++- 8 files changed, 97 insertions(+), 18 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java index 266e6f65..0d4aacb2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java @@ -42,7 +42,7 @@ public class ScrapApplyDetailsController extends BaseController { /** * 查询报废任务详细列表 */ - @ApiOperation(value = "查询报废任务详细列表") + @ApiOperation(value = "查询报废任务列表") // @RequiresPermissions("scrap:details:list") @GetMapping("/list") public TableDataInfo list(ScrapApplyDetails scrapApplyDetails) { @@ -51,6 +51,16 @@ public class ScrapApplyDetailsController extends BaseController { return getDataTable(list); } + /** + * 查询报废任务详细列表--根据任务ID + */ + @ApiOperation(value = "查询报废任务详情--TaskId") + @GetMapping("/selectRepairQuestListByTaskId") + public AjaxResult selectRepairQuestListByTaskId(ScrapApplyDetails scrapApplyDetails) { + List list = scrapApplyDetailsService.selectRepairQuestListByTaskId(scrapApplyDetails); + return success(list); + } + /** * 导出报废任务详细列表 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java index 3ff5661a..cafa326f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java @@ -30,18 +30,7 @@ public class ScrapApplyDetails extends BaseEntity { @ApiModelProperty(value = "任务ID") private Long taskId; - @Excel(name = "任务编号") - @ApiModelProperty(value = "任务编号") - private String taskCode; - - @Excel(name = "任务状态编码") - @ApiModelProperty(value = "任务状态Code") - private Byte taskStatusCode; - - @Excel(name = "任务状态名称") - @ApiModelProperty(value = "任务状态名称") - private String taskStatusName; - + @ApiModelProperty(value = "状态") private String status; /** 上级ID */ @@ -59,6 +48,26 @@ public class ScrapApplyDetails extends BaseEntity { @ApiModelProperty(value = "规格ID") private Long typeId; + @ApiModelProperty(value = "规格型号名称") + private String type; + + @ApiModelProperty(value = "物资类型ID") + private Long typeNameId; + + @ApiModelProperty(value = "物资类型名称") + private String typeName; + + @ApiModelProperty(value = "管理方式") + private Byte manageType; + + @ApiModelProperty(value = "单位") + private String unitName; + + private String code; + + @ApiModelProperty(value = "维修单号") + private String repairCode; + /** 报废数量 */ @Excel(name = "报废数量") @ApiModelProperty(value = "报废数量") @@ -70,12 +79,14 @@ public class ScrapApplyDetails extends BaseEntity { private String scrapSource; /** （0自然，1人为） */ - @Excel(name = "", readConverterExp = "0=自然，1人为") + @Excel(name = "报废类型", readConverterExp = "0=自然，1人为") private String scrapType; + @ApiModelProperty(value = "报废人") + private String scraper; + /** 审核人 */ - @Excel(name = "审核人") - @ApiModelProperty(value = "审核人") + @ApiModelProperty(value = "审核人id") private Long auditBy; /** 审核时间 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java index 3cae54fc..26a0cf63 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java @@ -25,6 +25,8 @@ public class ScrapTaskListVo { @ApiModelProperty(value = "报废单号") private String scrapCode; + private String repairCode; + @ApiModelProperty(value = "组织id") private Long companyId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java index d52a9ca1..6251aa5e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java @@ -22,6 +22,8 @@ public interface ScrapApplyDetailsMapper { */ public ScrapApplyDetails selectScrapApplyDetailsById(Long id); + List selectRepairQuestListByTaskId(ScrapApplyDetails scrapApplyDetails); + /** * 查询报废任务详细列表 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapApplyDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapApplyDetailsService.java index 5728b6a9..09e4569a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapApplyDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapApplyDetailsService.java @@ -25,7 +25,16 @@ public interface IScrapApplyDetailsService { * @param scrapApplyDetails 报废任务详细 * @return 报废任务详细集合 */ - public List selectScrapApplyDetailsList(ScrapApplyDetails scrapApplyDetails); + List selectScrapApplyDetailsList(ScrapApplyDetails scrapApplyDetails); + + /** + * 查询报废任务详细列表 + * + * @param scrapApplyDetails 报废任务详细 + * @return 报废任务详细集合 + */ + List selectRepairQuestListByTaskId(ScrapApplyDetails scrapApplyDetails); + /** * 新增报废任务详细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java index be50b323..dbcc2ed1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.scrap.service.impl; +import java.util.Collections; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; @@ -43,6 +44,17 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { return scrapApplyDetailsMapper.selectScrapApplyDetailsList(scrapApplyDetails); } + /** + * 查询报废任务详细列表 + * + * @param scrapApplyDetails 报废任务详细 + * @return 报废任务详细集合 + */ + @Override + public List selectRepairQuestListByTaskId(ScrapApplyDetails scrapApplyDetails) { + return scrapApplyDetailsMapper.selectRepairQuestListByTaskId(scrapApplyDetails); + } + /** * 新增报废任务详细 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml index 5045005a..5167c320 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml @@ -124,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rad.ma_id as maId, rad.type_id as typeId, rad.repair_num as repairNum, + rad.this_repaired_num,rad.this_scrap_num, rad.repaired_num as repairedNum, rad.this_repaired_num as thisRepairedNum, rad.scrap_num as scrapNum, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml index c7e36e99..96ca2f9a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + \ No newline at end of file