From 46d3116c5b2886505d612cb2f5e57591e31f6b2b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 8 Nov 2024 14:34:03 +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
---
.../ma/controller/MachineController.java | 2 +-
.../mapper/PurchaseCheckDetailsMapper.java | 2 ++
.../impl/PurchaseCheckInfoServiceImpl.java | 4 +---
.../impl/PurchaseNoticePersonServiceImpl.java | 4 ++--
.../purchase/PurchaseCheckDetailsMapper.xml | 23 ++++++++++++++++++-
5 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
index 02bf727a..916706d9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
@@ -57,7 +57,7 @@ public class MachineController extends BaseController {
* 查询机具设备管理列表
*/
@ApiOperation(value = "查询机具设备管理列表")
- @RequiresPermissions("ma:machine:typeList")
+ //@RequiresPermissions("ma:machine:typeList")
@GetMapping("/getTypeList")
public AjaxResult list(Type type)
{
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 e44dd9f0..8d722514 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
@@ -82,6 +82,8 @@ public interface PurchaseCheckDetailsMapper {
*/
int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
+ int updatePurchaseDetails(PurchaseCheckDetails details);
+
int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
/**
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 16763e7d..7352dbfe 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
@@ -255,9 +255,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId();
Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus();
for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) {
- result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId,
- details.getStatus()
- ) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败");
+ result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败");
}
//查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态
int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status);
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 b46d7e61..f4741902 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
@@ -79,13 +79,13 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer
tmTaskMapper.updateTmTask(new TmTask()
.setTaskId(purchaseNoticePersonDto.getTaskId())
.setTaskType(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskTypeId())
- .setTaskStatus(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusCode())
+ .setTaskStatus(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue())
);
// 修改采购明细的任务状态
purchaseCheckDetailsService.batchUpdateDetailsTaskStatus(
purchaseNoticePersonDto.getTaskId(),
- PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusCode()
+ 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 2a983551..1acec6cb 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
@@ -266,7 +266,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
set
`status` = #{newTaskStatus}
where
- task_id = #{taskId}
+ 1=1
+
+ and task_id = #{taskId}
+
+
+ and type_id = #{typeId}
+
+
+
+
+ update
+ purchase_check_details
+ set
+ `status` = #{status}
+ where
+ 1=1
+
+ and task_id = #{taskId}
+
+
+ and type_id = #{typeId}
+