From eba12725e5229cccf8e5253839f5a22e53f78808 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 24 Apr 2026 14:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NuBizSuppliersApplyServiceImpl.java  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
index 3596092..bb3bd98 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
@@ -461,24 +461,24 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
         BeanUtils.copyProperties(cgdMainEntityDto,nuInvoicingCgdMain);
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>();
-        queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers());
-        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
+        queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(a.cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
+        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getGysId()),"a.gys_id",cgdMainEntityDto.getGysId());
+        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"a.qg_by",cgdMainEntityDto.getCgBy());
         if(cgdMainEntityDto.getQgDate() != null){
-            queryWrapper.like("qg_date", DateUtils.formatDate(cgdMainEntityDto.getQgDate()));
+            queryWrapper.like("a.qg_date", DateUtils.formatDate(cgdMainEntityDto.getQgDate()));
         }
-        queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
-        queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
-        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
-//        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
+        queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"a.qg_date",cgdMainEntityDto.getStartTime());
+        queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"a.qg_date",cgdMainEntityDto.getEndTime());
+        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"a.nu_id",cgdMainEntityDto.getNuId());
+        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"a.status",cgdMainEntityDto.getStatus());
         if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
             if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
-                queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(","));
+                queryWrapper.in("a.cgd_type",cgdMainEntityDto.getCgdType().split(","));
             }else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){
-                queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
+                queryWrapper.eq("a.cgd_type",cgdMainEntityDto.getCgdType());
             }
         }
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("a.create_time");
         Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
         List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
         IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());