From e0c900cad8f628363852e1f08e17dc3bf04017df Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 23 Dec 2024 17:57:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=80=92=E5=BA=8F?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/purchase/domain/dto/PurchaseQueryDto.java     | 3 +++
 .../service/impl/PurchaseCheckInfoServiceImpl.java         | 7 +++++++
 .../mapper/material/ma/WorkSiteDirectManageMapper.xml      | 1 +
 .../mapper/material/purchase/PurchaseCheckInfoMapper.xml   | 1 +
 4 files changed, 12 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
index 4637fdb7..62b2ebee 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
@@ -35,6 +35,9 @@ public class PurchaseQueryDto {
     @ApiModelProperty(value = "任务阶段,对应新购阶段枚举")
     private Integer taskStage;
 
+    @ApiModelProperty(value = "是否完成")
+    private Integer isFinish;
+
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
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 c4de9f2a..6bcaa0ca 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
@@ -229,6 +229,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                 // 设置外层任务状态：入库待开始、入库进行中、入库已完成
                 TmTask tmTask = tmTaskMapper.selectTmTaskByTaskId(purchaseInfo.getTaskId());
                 purchaseInfo.setTaskStatusName(isIncludeStage ? "未完成" : "已完成");
+                if (purchaseQueryDto.getIsFinish() != null) {
+                    if (purchaseQueryDto.getIsFinish() == 1) {
+                        if (isIncludeStage) {continue;}
+                    } else {
+                        if (!isIncludeStage) {continue;}
+                    }
+                }
                 purchaseInfo.setTaskStatus(tmTask.getTaskStatus());
 
                 // 设置外层任务列表
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
index ffeec4d2..043bfe32 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
@@ -436,6 +436,7 @@
                 and dai.status = #{status}
             </if>
         </where>
+        order by dai.create_time desc
     </select>
 
     <select id="getDirectApplyInfoById" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 296b1420..72365ba0 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </if>
         </where>
+        order by pci.create_time desc
     </select>
 
     <select id="selectPurchaseCheckFormVoByTaskId" resultMap="PurchaseCheckFormResult">

From 34d736ca85eeb6809a7b95023e4e7bc7f3332cd7 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 23 Dec 2024 18:38:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
index 1e6d4ecb..c97df72c 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
@@ -44,10 +44,10 @@ public enum PurchaseTaskStatusEnum {
         }
 
         if (findEnum == null || stageEnum == null) {
-            return false;
+            return true;
         } else {
-            // 如果是最后的入库完成，那么说明流程已走完，不需要再判断了
-            if (Objects.equals(findEnum.getStage(), TASK_FINISHED.getStage())) {
+            // 如果是最后的入库完成状态，那么说明流程已走完，不需要再对比状态了
+            if (Objects.equals(findEnum.getStatus(), TASK_FINISHED.getStatus())) {
                 return false;
             }
             return findEnum.getStage().equals(stageEnum.getCode());

From 41f5ed276b27111de969789a90605fb8bbe69534 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 23 Dec 2024 18:46:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
index c97df72c..edc094f2 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
@@ -47,7 +47,7 @@ public enum PurchaseTaskStatusEnum {
             return true;
         } else {
             // 如果是最后的入库完成状态，那么说明流程已走完，不需要再对比状态了
-            if (Objects.equals(findEnum.getStatus(), TASK_FINISHED.getStatus())) {
+            if (Objects.equals(findEnum.getStatus(), TASK_FINISHED.getStatus()) || Objects.equals(findEnum.getStatus(), IN_STORE.getStatus())) {
                 return false;
             }
             return findEnum.getStage().equals(stageEnum.getCode());