From 763c003c34c5c781c3f7139e030ee86af5102884 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 30 Apr 2024 09:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 17 +++++++++------ .../PurchaseMacodeInfoController.java | 12 +++++++++++ .../mapper/PurchaseMacodeInfoMapper.java | 2 ++ .../service/IPurchaseMacodeInfoService.java | 1 + .../impl/PurchaseMacodeInfoServiceImpl.java | 6 ++++++ .../material/PurchaseMacodeInfoMapper.xml | 21 +++++++++++++++++++ 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 4a5ab90b..503f00b7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -177,7 +177,7 @@ public class TmTaskController extends BaseController { } if (StringUtils.isNotBlank(task.getLeaseApplyInfo().getPhone())) { String phone = task.getLeaseApplyInfo().getPhone(); - if (!PhoneUtil.isMobile(phone)){ + if (!PhoneUtil.isMobile(phone)) { logger.error("手机号格式错误 :{}", phone); return AjaxResult.error("手机号格式错误"); } @@ -406,7 +406,7 @@ public class TmTaskController extends BaseController { /** * 查询机具领料管理列表 * - * @param task 筛选条件 + * @param task 筛选条件 * @param sourceBy app为1 web为0 * @return 列表 */ @@ -532,11 +532,16 @@ public class TmTaskController extends BaseController { @Log(title = "修改任务信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") public AjaxResult edit(@RequestBody TmTask task) { - if (StringUtils.isNull(task)) { - return AjaxResult.error("参数错误,传入信息为空!"); + try { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误,传入信息为空!"); + } + tmTaskService.edit(task); + return AjaxResult.success("修改成功"); + } catch (Exception e) { + return AjaxResult.error("修改失败"); } - tmTaskService.edit(task); - return AjaxResult.success("修改成功"); + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 12566f2f..7e0087fb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -45,6 +45,18 @@ public class PurchaseMacodeInfoController extends BaseController { return AjaxResult.success(list); } + /** + * 查询新购验收编号管理列表 + */ + @ApiOperation(value = "查询单个新购验收编号管理列表详情") + @GetMapping("/details") + public AjaxResult details(PurchaseMacodeInfo purchaseMacodeInfo) throws Exception { + if (purchaseMacodeInfo.getTaskId() == null || purchaseMacodeInfo.getTaskId() == 0) { + throw new Exception("任务taskId为空!!!"); + } + List list = purchaseMacodeInfoService.selectPurchaseMacodeInfoListDetails(purchaseMacodeInfo); + return AjaxResult.success(list); + } /** * 导出新购验收编号管理列表 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 37ede482..9d8f7232 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -280,4 +280,6 @@ public interface PurchaseMacodeInfoMapper { int selectPurchaseCheckDetailsStatus(Long taskId); int updateMaTypeNum(MachinePart wholeSetDetail); + + List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java index 1faf8175..6dd79771 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java @@ -32,6 +32,7 @@ public interface IPurchaseMacodeInfoService * @return 新购验收编号管理purchase_macode_info集合 */ public List selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo); + public List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); /** * 新增新购验收编号管理purchase_macode_info diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 725b8ac5..02d3fa20 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -92,6 +92,12 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService return purchaseMacodeInfoList; } + @Override + public List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo) { + List purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoListDetails(purchaseMacodeInfo); + return purchaseMacodeInfoList; + } + /** * 新增新购验收编号管理 * diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 737eb966..e553105d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pmi.code_type = #{codeType} and pmi.status = #{status} and pmi.company_id = #{companyId} + GROUP BY pcd.type_id + update ma_type set num = #{num} where type_id = #{typeId}