From ea920b0576247e7a63ce976509ec695bbc28e343 Mon Sep 17 00:00:00 2001
From: zhouxinyu <121470181@qq.com>
Date: Thu, 6 Feb 2025 15:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/mapper/DeviceMapper.xml         | 12 ++++++++++++
 .../business/service/impl/WorkOrderServiceImpl.java  |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml b/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml
index 8746e40..630e9c6 100644
--- a/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml
@@ -28,6 +28,12 @@
                 #{deptId}
             </foreach>
         </if>
+        <if test="startTime != null and startTime.trim() != ''">
+            AND create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime.trim() != ''">
+            AND create_time &lt;= #{endTime}
+        </if>
         GROUP BY type
     </select>
     <select id="selectStatusCount" resultType="org.springblade.modules.business.pojo.vo.PieStatVO">
@@ -48,6 +54,12 @@
                 #{deptId}
             </foreach>
         </if>
+        <if test="startTime != null and startTime.trim() != ''">
+            AND create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime.trim() != ''">
+            AND create_time &lt;= #{endTime}
+        </if>
         GROUP BY
             run_status
     </select>
diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
index 52ce76c..86e3efc 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
@@ -661,10 +661,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             map.put("finishTime", simpleDateFormat.format(finishTime.get()));
         }
         Optional<Device> device = Optional.ofNullable(deviceService.getOne(Wrappers.lambdaQuery(Device.class).eq(Device::getId, workOrder.getDeviceId())));
+        Double discountPrice = workOrder.getDiscountPrice();
         if (device.isPresent()) {
             Optional<Long> limsId = Optional.ofNullable(device.get().getLimsId());
             if (limsId.isPresent()) {
-                map.put("in", String.format("%.2f",workOrder.getDiscountPrice() + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
+                map.put("in", String.format("%.2f",(workOrder.getDiscountPrice() != null ? discountPrice.doubleValue() : 0.0) + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
                 map.put("out", "--");
                 map.put("sel1", "√");
                 map.put("sel2", null);
@@ -672,7 +673,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 map.put("outTravel", "--");
             } else {
                 map.put("in", "--");
-                map.put("out", String.format("%.2f",workOrder.getDiscountPrice() + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
+                map.put("out", String.format("%.2f",(workOrder.getDiscountPrice() != null ? discountPrice.doubleValue() : 0.0) + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
                 map.put("sel2", "√");
                 map.put("sel1", null);
                 map.put("outTravel", workOrder.getTravelExpense());
@@ -680,7 +681,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         } else {
             map.put("in", "--");
-            map.put("out", String.format("%.2f",workOrder.getDiscountPrice() + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
+            map.put("out", String.format("%.2f",(workOrder.getDiscountPrice() != null ? discountPrice.doubleValue() : 0.0) + (workOrder.getLaborCost() == null ? 0 : workOrder.getLaborCost())));
             map.put("sel2", "√");
             map.put("sel1", null);
             map.put("outTravel", workOrder.getTravelExpense());