From 678b4d1ab14090421125bd7f0a79cb9ed8180987 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 22 Dec 2025 14:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NuInvoicingPddMainServiceImpl.java  | 10 +++++-----
 .../camera/service/impl/CameraInfoServiceImpl.java   | 12 ++++++++++--
 .../care/order/service/impl/CarePadServiceImpl.java  |  4 +++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java
index 41ac83e4..57df0bec 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java
@@ -321,11 +321,11 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
             map.put("message","盘点单状态不是盘点中，不能作废盘点单");
             return map;
         }
-        List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()));
-        for(NuInvoicingPddInfo param : listCrk){
-            param.setPdType("3");//作废
-            pddInfoMapper.updateById(param);
-        }
+//        List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()));
+//        for(NuInvoicingPddInfo param : listCrk){
+//            param.setPdType("3");//作废
+//            pddInfoMapper.updateById(param);
+//        }
         nuInvoicingPddMainInfo.setUpdateBy(user.getRealname());
         nuInvoicingPddMainInfo.setUpdateTime(new Date());
         nuInvoicingPddMainInfo.setPddStatus("3");
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
index 43780b57..c7522dcc 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
@@ -24,6 +24,7 @@ import com.nu.modules.tplink.common.entity.ErrorCode;
 import com.nu.modules.tplink.common.service.IErrorCodeService;
 import com.nu.modules.tplink.utils.TumsApi;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -57,6 +58,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     @Lazy
     @Autowired
     private CameraInfoServiceImpl syncImpl;
+
+    @Value(value = "${jeecg.path.upload}")
+    private String uploadpath;
     /**
      * 获取摄像头信息-分页
      * @param page
@@ -3016,8 +3020,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     public String mkdirsFolder(String folderPath){
         // 创建File对象
         File folder = new File(folderPath);
-
-        // 判断文件夹是否存在
+        String ctxPath = uploadpath;
+        String fileName = null;
+        File file = new File(ctxPath + File.separator + File.separator);
+        if (!file.exists()) {
+            file.mkdirs();// 创建文件根目录
+        }        // 判断文件夹是否存在
         if (!folder.exists()) {
             System.out.println("文件夹不存在，开始创建...");
 
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CarePadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CarePadServiceImpl.java
index 3be67324..d9f89d3c 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CarePadServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CarePadServiceImpl.java
@@ -38,7 +38,9 @@ public class CarePadServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrders
     public IPage<CareOrdersEntity> queryCareList(Integer pageNo, Integer pageSize, CareOrdersEntity careOrdersEntityDto, HttpServletRequest req) {
         CareOrders careOrders = new CareOrders();
         BeanUtils.copyProperties(careOrdersEntityDto,careOrders);
-        QueryWrapper<CareOrders> queryWrapper = QueryGenerator.initQueryWrapper(careOrders, req.getParameterMap());
+        QueryWrapper<CareOrders> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("nu_id",careOrdersEntityDto.getNuId());
+        queryWrapper.eq(StringUtils.isNotBlank(careOrdersEntityDto.getEmployeeId()),"employee_id",careOrdersEntityDto.getEmployeeId());
         Page<CareOrders> page = new Page<>(pageNo, pageSize);
         List<CareOrders> list = baseMapper.selectList(page,queryWrapper);
         IPage<CareOrdersEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());