From 48008bcf695dbb35b22bb4079102361847122235 Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Mon, 18 Dec 2023 16:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/RepairController.java | 2 +- .../sgzb/base/domain/RepairApplyRecord.java | 5 +- .../bonus/sgzb/base/mapper/RepairMapper.java | 6 +-- .../sgzb/base/service/RepairService.java | 2 +- .../base/service/impl/RepairServiceImpl.java | 5 +- .../resources/mapper/base/RepairMapper.xml | 53 +++++++------------ 6 files changed, 30 insertions(+), 43 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index bbef921f..840311e0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -53,7 +53,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修任务机具列表") @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY) @GetMapping("/getRepairMaTypeList") - public TableDataInfo getRepairMaTypeList(RepairTask bean) + public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { startPage(); List list = service.getRepairMaTypeList(bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index 2da8e416..5e3d2aae 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -1,9 +1,11 @@ package com.bonus.sgzb.base.domain; +import com.bonus.sgzb.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,7 +14,8 @@ import java.util.List; */ @Data @ApiModel(value="维修任务详细") -public class RepairApplyRecord { +public class RepairApplyRecord implements Serializable { + private static final long serialVersionUID = 1L; private Long id; /** * 任务ID diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 358874c0..3333ab68 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -21,11 +21,7 @@ public interface RepairMapper { List getRepairTaskList(RepairTask bean); - List getRepairMaTypeList(RepairTask bean); - - List getTypeList(String taskId); - - String getType(String typeId); + List getRepairMaTypeList(RepairTaskDetails bean); int addRecord(RepairApplyRecord bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index 8c7b5d27..296b86b8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -21,7 +21,7 @@ public interface RepairService { List getRepairTaskList(RepairTask bean); - List getRepairMaTypeList(RepairTask bean); + List getRepairMaTypeList(RepairTaskDetails bean); AjaxResult submitRepairApply(RepairApplyRecord bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index e0d1a43c..f537380c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -45,7 +45,7 @@ public class RepairServiceImpl implements RepairService { } @Override - public List getRepairMaTypeList(RepairTask bean) { + public List getRepairMaTypeList(RepairTaskDetails bean) { List repairMaTypeList = mapper.getRepairMaTypeList(bean); return repairMaTypeList; } @@ -128,6 +128,9 @@ public class RepairServiceImpl implements RepairService { if (repairedNum <= 0){ return AjaxResult.error("选中的数据中包含待维修数量为0的机具，请重新选择"); } + } + for (RepairTaskDetails bean : list){ + int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); RepairApplyRecord partDetails = new RepairApplyRecord(); partDetails.setTaskId(bean.getTaskId()); partDetails.setMaId(bean.getMaId()); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 79889141..864bbe8e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -11,7 +11,7 @@ insert into tm_task (task_status,task_type,code,create_by,create_time,company_id) - values (45,46,#{repairCode},#{createBy},now(),#{companyId}); + values (46,45,#{repairCode},#{createBy},now(),#{companyId}); insert into tm_task_agreement (task_id,agreement_id,create_by,create_time,company_id) @@ -84,7 +84,7 @@ LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id left join sys_user su on rd.create_by = su.user_id left join sys_dic sd on sd.id = tt.task_status - GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name + where 1=1 AND (locate(#{keyword}, su.user_name) > 0 or locate(#{keyword}, tt.CODE) > 0) @@ -95,8 +95,11 @@ AND bpi.pro_id = #{backPro} + + AND mt2.type_id = #{type} + - AND locate(#{backCode}, bai.CODE) > 0) + AND locate(#{backCode}, bai.CODE) > 0 AND tt.task_status = #{repairStatus} @@ -104,6 +107,7 @@ AND ts.create_time between #{startTime} and #{endTime} + GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name - - +