From 9411a2777f0c3acc33525e6e6424c4e9dbf9565d Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 14:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/purchase/domain/dto/PurchaseDto.java | 5 +++++ .../material/purchase/mapper/PurchaseCheckDetailsMapper.java | 2 +- .../purchase/service/IPurchaseCheckDetailsService.java | 2 +- .../service/impl/PurchaseCheckDetailsServiceImpl.java | 4 ++-- .../purchase/service/impl/PurchaseCheckInfoServiceImpl.java | 2 +- .../service/impl/PurchaseNoticePersonServiceImpl.java | 2 +- .../mapper/material/purchase/PurchaseCheckDetailsMapper.xml | 4 ++-- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java index 2b9c9fdd..a68333fe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java @@ -87,6 +87,11 @@ public class PurchaseDto { @ApiModelProperty(value = "数据所属组织") private Long companyId; + /** 验收结论 */ + //@Excel(name = "验收结论") + @ApiModelProperty(value = "验收结论") + private String checkResult; + private String createBy; private Date createTime; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index 8d722514..f3c0bfc3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -80,7 +80,7 @@ public interface PurchaseCheckDetailsMapper { * @param taskId 任务id * @param newTaskStatus 新状态 */ - int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); + int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, @Param("checkResult") String checkResult); int updatePurchaseDetails(PurchaseCheckDetails details); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java index bd9a70d3..a878468c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java @@ -63,7 +63,7 @@ public interface IPurchaseCheckDetailsService { * @param taskId 任务id * @param newTaskStatus 新状态 */ - int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); + int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, String checkResult); /** * 批量删除新购验收任务详细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java index d9feda62..df4c69f4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -121,8 +121,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer * @param newTaskStatus 新状态 */ @Override - public int batchUpdateDetailsTaskStatus(Long taskId, Integer newTaskStatus) { - return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, newTaskStatus); + public int batchUpdateDetailsTaskStatus(Long taskId, Integer newTaskStatus, String checkResult) { + return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, newTaskStatus, checkResult); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 7352dbfe..f7088aca 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -235,7 +235,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { ) > 0; if (updateResult) { result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, - purchaseDto.getStatus() + purchaseDto.getStatus(), purchaseDto.getCheckResult() ) > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败"); } else { result = AjaxResult.error("SQL未报错，但修改任务0条"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index f4741902..57cb29a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -85,7 +85,7 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer // 修改采购明细的任务状态 purchaseCheckDetailsService.batchUpdateDetailsTaskStatus( purchaseNoticePersonDto.getTaskId(), - PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue() + PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue(), "" ); return AjaxResult.success("短信发送成功:" + sendResult); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 1acec6cb..2a8b42c0 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_check_details set - `status` = #{newTaskStatus} + `status` = #{newTaskStatus}, check_result = #{checkResult} where 1=1 @@ -279,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_check_details set - `status` = #{status} + `status` = #{status}, check_result = #{checkResult} where 1=1