From 05a0fe410a1589756b09d1b0325afe94e2c5edfc Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 8 Nov 2024 13:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AD=98=E9=AA=8C=E6=94=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/purchase/domain/PurchaseCheckDetails.java  | 2 +-
 .../com/bonus/material/purchase/domain/dto/PurchaseDto.java   | 2 +-
 .../material/purchase/mapper/PurchaseCheckDetailsMapper.java  | 4 ++--
 .../purchase/service/impl/PurchaseCheckInfoServiceImpl.java   | 2 +-
 .../java/com/bonus/material/task/mapper/TmTaskMapper.java     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
index 0a595f2b..d154ae60 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
@@ -88,7 +88,7 @@ public class PurchaseCheckDetails extends BaseEntity {
     /** 0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过 */
     @Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过")
     @ApiModelProperty(value = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过")
-    private Long status;
+    private Integer status;
 
     /** 出厂日期 */
     @ApiModelProperty(value = "出厂日期")
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 c52a2f7f..2b9c9fdd 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
@@ -42,7 +42,7 @@ public class PurchaseDto {
     private String keyWord;
 
     @ApiModelProperty(value = "状态")
-    private Long status;
+    private Integer status;
 
     @ApiModelProperty(value = "出厂日期")
     private String productDate;
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 a81d0e11..e44dd9f0 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,9 +80,9 @@ public interface PurchaseCheckDetailsMapper {
      * @param taskId 任务id
      * @param newTaskStatus 新状态
      */
-    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus);
+    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
 
-    int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus);
+    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 f6f9943d..16763e7d 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
@@ -253,7 +253,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
         try {
             AjaxResult result = new AjaxResult();
             Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId();
-            Long status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus();
+            Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus();
             for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) {
                 result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId,
                         details.getStatus()
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
index 7be92a9f..e6e5dc82 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
@@ -57,7 +57,7 @@ public interface TmTaskMapper {
      * @param taskId 任务id  必传
      * @param newTaskStatus 新状态
      */
-    int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus);
+    int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
 
     /**
      * 删除任务