报销人展示调整，筛选项查询处理

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/OfficeApiFallbackFactory.java

@@ -29,6 +29,11 @@ public class OfficeApiFallbackFactory implements FallbackFactory <IOfficeApi> {
             }
 
             @Override
+            public OfficeDTO getOfficeByName(String name) {
+                return null;
+            }
+
+            @Override
             public Office selectById(String id) {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IOfficeApi.java

@@ -20,6 +20,15 @@ public interface IOfficeApi {
     OfficeDTO getOfficeDTOByName(@RequestParam(value = "name") String name);
 
     /**
+     * 获取机构（无租户限制）
+     *
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/getOfficeByName")
+    OfficeDTO getOfficeByName(@RequestParam(value = "name") String name);
+
+
+    /**
      * 根据id获取组织
      *
      * @return

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -42,10 +42,25 @@
 			WHEN a.source_type = 4 THEN us4.name
 									ELSE us5.name END) AS name,
 			(CASE
-			WHEN a.source_type = 1 THEN  trim(b.`number`)
-			WHEN a.source_type = 2 THEN trim(b2.`number`)
-			WHEN a.source_type = 4 THEN trim(b4.`number`)
-									ELSE trim(b5.`number`) END) AS `number`,
+			WHEN a.source_type = 1 THEN  trim(b.`number_count`)
+			WHEN a.source_type = 2 THEN trim(b2.`number_count`)
+			WHEN a.source_type = 4 THEN trim(b4.`number_count`)
+									ELSE trim(b5.`number_count`) END) AS `numberCount`,
+			 (CASE
+				  WHEN a.source_type = 1 THEN  trim(b.`number`)
+				  WHEN a.source_type = 2 THEN trim(b2.`number`)
+				  WHEN a.source_type = 4 THEN trim(b4.`number`)
+				  ELSE trim(b5.`number`) END) AS `number`,
+			 (CASE
+				  WHEN a.source_type = 1 THEN b.user_id
+				  WHEN a.source_type = 2 THEN b2.user_id
+				  WHEN a.source_type = 4 THEN b4.user_id
+				  ELSE b5.user_id END) AS user_id,
+			 (CASE
+				  WHEN a.source_type = 1 THEN b.dept_id
+				  WHEN a.source_type = 2 THEN b2.dept_id
+				  WHEN a.source_type = 4 THEN b4.dept_id
+				  ELSE b5.dept_id END) AS dept_id,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -107,6 +107,8 @@ public class ReimbursementInfoService {
      * 列表查询
      */
     public IPage<RetureListDto> list(Page<RetureListDto> page , QueryListDto dto) throws Exception{
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
+        IOfficeApi officeApi = SpringUtil.getBean(IOfficeApi.class);
         QueryWrapper<QueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, QueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -131,10 +133,11 @@ public class ReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("(( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR us5.name LIKE {1} ))", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userdto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("(( b.user_id like {0} OR us.name LIKE {1} )", "%" +userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" +userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" +userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} ))", "%" +userdto.getId() + "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -147,10 +150,11 @@ public class ReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("(( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} ))", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("(( b.dept_id like {0} OR so.name LIKE {1} )", "%" + officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" + officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" + officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} ))", "%" + officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -222,6 +226,7 @@ public class ReimbursementInfoService {
         }*/
 
 
+
         IPage<RetureListDto> pageList = infoMapper.findList(page, queryWrapper);
         pageList.getRecords().stream().forEach(item -> {
             // 报销申请
@@ -257,6 +262,16 @@ public class ReimbursementInfoService {
                     item.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(item.getTaskIdFile()));  // 获取数据审核人
                 }
             }
+            if (StringUtils.isBlank(item.getDeptName())){
+                //处理部门名
+                String offices = getOfficeNameByIds(item.getDeptId());
+                item.setDeptName(offices);
+            }
+            if (StringUtils.isBlank(item.getName())){
+                //处理用户名
+                String names = userApi.getNamesByIds(item.getUserId());
+                item.setName(names);
+            }
 
         });
         return pageList;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/dto/RetureListDto.java

@@ -157,4 +157,8 @@ public class RetureListDto {
     private List<String> auditFileUserIds;
 
     private Boolean applyFile;//是否发起文件补充
+
+    private String userId;
+    private String deptId;
+    private String numberCount;
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/mapper/xml/CcpmReimbursementInfoMapper.xml

@@ -131,6 +131,34 @@
                                 ELSE b5.`number_count`
                                 END
                             )          AS `number_count`,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.`user_id`
+                                WHEN a.source_type = 2 THEN
+                                    b2.`user_id`
+                                WHEN a.source_type = 3 THEN
+                                    b3.`user_id`
+                                WHEN a.source_type = 4 THEN
+                                    b4.`user_id`
+                                ELSE b5.`user_id`
+                                END
+                            )          AS `user_id`,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.`dept_id`
+                                WHEN a.source_type = 2 THEN
+                                    b2.`dept_id`
+                                WHEN a.source_type = 3 THEN
+                                    b3.`dept_id`
+                                WHEN a.source_type = 4 THEN
+                                    b4.`dept_id`
+                                ELSE b5.`dept_id`
+                                END
+                            )          AS `dept_id`,
                         a.user_name,
                         a.reim_date,
                         a.type,

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -113,6 +113,8 @@ public class CcpmReimbursementInfoService {
      * 列表查询
      */
     public IPage<CcpmRetureListDto> list(Page<CcpmRetureListDto> page , CcpmQueryListDto dto) throws Exception{
+        IUserApi userApi = SpringUtil.getBean ( IUserApi.class );
+        IOfficeApi officeApi = SpringUtil.getBean ( IOfficeApi.class );
         QueryWrapper<CcpmQueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, CcpmQueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -142,11 +144,12 @@ public class CcpmReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b3.user_id = {0} OR us3.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR us5.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userdto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )", "%" +userdto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" +userdto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" +userdto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" +userdto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" +userdto.getId()+ "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -155,11 +158,12 @@ public class CcpmReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b3.dept_id = {0} OR so3.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -244,6 +248,17 @@ public class CcpmReimbursementInfoService {
                 item.setProcInsIdFile(reimbursementFileSupplement.getProcInsId());
                 item.setTaskIdFile(reimbursementFileSupplement.getTaskIdFile());
             }
+
+            if (StringUtils.isBlank(item.getDeptName())){
+                //处理部门名
+                String offices = getOfficeNameByIds(item.getDeptId());
+                item.setDeptName(offices);
+            }
+            if (StringUtils.isBlank(item.getName())){
+                //处理用户名
+                String names = userApi.getNamesByIds(item.getUserId());
+                item.setName(names);
+            }
         } );
         return list;
     }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/dto/CcpmRetureListDto.java

@@ -165,4 +165,7 @@ public class CcpmRetureListDto {
     private List<String> auditFileUserIds;
 
     private Boolean applyFile;//是否发起文件补充
+
+    private String userId;
+    private String deptId;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -157,6 +157,32 @@
 						zs1.`number_count`
 					END
 				) AS `number_count`,
+			(
+				CASE
+
+					WHEN a.source_type = 1 THEN
+						b.`user_id`
+					WHEN a.source_type = 3 THEN
+						r4.`user_id`
+					WHEN a.source_type = 4 THEN
+						b4.`user_id`
+					WHEN a.source_type = 8 THEN
+						zs1.`user_id`
+					END
+				) AS `user_id`,
+			(
+				CASE
+
+					WHEN a.source_type = 1 THEN
+						b.`dept_id`
+					WHEN a.source_type = 3 THEN
+						r4.`dept_id`
+					WHEN a.source_type = 4 THEN
+						b4.`dept_id`
+					WHEN a.source_type = 8 THEN
+						zs1.`dept_id`
+					END
+				) AS `dept_id`,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -70,8 +70,7 @@ public class ZsReimbursementInfoService {
     @Resource
     private ZsReimbursementAmountInfoMapper amountInfoMapper;
 
-//    @Resource
-//    private OssServiceMapper ossServiceMapper;
+
 
 //    @Resource
 //    private SerialnumTplService serialnumTplService;
@@ -82,9 +81,6 @@ public class ZsReimbursementInfoService {
    /* @Resource
     private MaterialBasicMapper materialBasicMapper;*/
 
-//    @Resource
-//    private OfficeService officeService;
-
     @Resource
     private ZsReimbursementTypeService typeService;
 
@@ -116,6 +112,8 @@ public class ZsReimbursementInfoService {
      * 列表查询
      */
     public IPage<ZsRetureListDto> list(Page<ZsRetureListDto> page , ZsQueryListDto dto) throws Exception{
+        IOfficeApi officeApi = SpringUtil.getBean(IOfficeApi.class);
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
         QueryWrapper<ZsQueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, ZsQueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -145,11 +143,12 @@ public class ZsReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b3.user_id = {0} OR us3.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR us5.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )",  "%" + userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" + userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" + userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" + userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" + userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -158,11 +157,12 @@ public class ZsReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b3.dept_id = {0} OR so3.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -266,6 +266,17 @@ public class ZsReimbursementInfoService {
                 item.setProcInsIdFile(reimbursementFileSupplement.getProcInsId());
                 item.setTaskIdFile(reimbursementFileSupplement.getTaskIdFile());
             }
+
+            if (StringUtils.isBlank(item.getDeptName())){
+                //处理部门名
+                String offices = getOfficeNameByIds(item.getDeptId());
+                item.setDeptName(offices);
+            }
+            if (StringUtils.isBlank(item.getName())){
+                //处理用户名
+                String names = userApi.getNamesByIds(item.getUserId());
+                item.setName(names);
+            }
         });
         return list;
     }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/dto/ZsRetureListDto.java

@@ -176,4 +176,6 @@ public class ZsRetureListDto {
     private List<String> auditFileUserIds;
 
     private Boolean applyFile;//是否发起文件补充
+    private String userId;
+    private String deptId;
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/mapper/xml/ConsultancyReimbursementInfoMapper.xml

@@ -111,18 +111,41 @@
 			END
 			) AS `number`,
 			 (
+			 CASE
+				 WHEN a.source_type = 1 THEN
+					 b.`number_count`
+				 WHEN a.source_type = 2 THEN
+					 b2.`number_count`
+				 WHEN a.source_type = 3 THEN
+					 b3.`number_count`
+				 WHEN a.source_type = 4 THEN
+					 b4.`number_count` ELSE b5.`number_count`
+				 END
+			 )          AS `number_count`,
+			 (
+						 CASE
+							 WHEN a.source_type = 1 THEN
+								 b.`user_id`
+							 WHEN a.source_type = 2 THEN
+								 b2.`user_id`
+							 WHEN a.source_type = 3 THEN
+								 b3.`user_id`
+							 WHEN a.source_type = 4 THEN
+								 b4.`user_id` ELSE b5.`user_id`
+							 END
+						 )          AS `user_id`,
+			 (
 						 CASE
-
 							 WHEN a.source_type = 1 THEN
-								 b.`number_count`
+								 b.`dept_id`
 							 WHEN a.source_type = 2 THEN
-								 b2.`number_count`
+								 b2.`dept_id`
 							 WHEN a.source_type = 3 THEN
-								 b3.`number_count`
+								 b3.`dept_id`
 							 WHEN a.source_type = 4 THEN
-								 b4.`number_count` ELSE b5.`number_count`
+								 b4.`dept_id` ELSE b5.`dept_id`
 							 END
-						 )          AS `number_count`,
+						 )          AS `dept_id`,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -113,6 +113,8 @@ public class ConsultancyReimbursementInfoService {
      * 列表查询
      */
     public IPage<ConsultancyRetureListDto> list(Page<ConsultancyRetureListDto> page , ConsultancyQueryListDto dto) throws Exception{
+        IOfficeApi officeApi = SpringUtil.getBean(IOfficeApi.class);
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
         QueryWrapper<ConsultancyQueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, ConsultancyQueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -142,11 +144,12 @@ public class ConsultancyReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b3.user_id = {0} OR us3.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR us5.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -155,11 +158,12 @@ public class ConsultancyReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b3.dept_id = {0} OR so3.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )",  "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -244,6 +248,18 @@ public class ConsultancyReimbursementInfoService {
                 item.setProcInsIdFile(reimbursementFileSupplement.getProcInsId());
                 item.setTaskIdFile(reimbursementFileSupplement.getTaskIdFile());
             }
+
+            if (StringUtils.isBlank(item.getDeptName())){
+                //处理部门名
+                String offices = getOfficeNameByIds(item.getDeptId());
+                item.setDeptName(offices);
+            }
+            if (StringUtils.isBlank(item.getName())){
+                //处理用户名
+                String names = userApi.getNamesByIds(item.getUserId());
+                item.setName(names);
+            }
+
         } );
         return list;
     }
@@ -1003,6 +1019,8 @@ public class ConsultancyReimbursementInfoService {
      * 下载列表查询
      */
     public List<ConsultancyRetureListDto> exportList(ConsultancyQueryListDto dto) throws Exception{
+        IOfficeApi officeApi = SpringUtil.getBean(IOfficeApi.class);
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
         QueryWrapper<ConsultancyQueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, ConsultancyQueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -1028,12 +1046,13 @@ public class ConsultancyReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b3.user_id = {0} OR us3.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR" +
-                    " us5.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("( b.user_id LIKE {0} OR us.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id LIKE {0} OR us2.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b3.user_id LIKE {0} OR us3.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id LIKE {0} OR us4.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id LIKE {0} OR" +
+                    " us5.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -1042,11 +1061,12 @@ public class ConsultancyReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b3.dept_id = {0} OR so3.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )", "%" +officeDto.getId() + "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId() + "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId() + "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId() + "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId() + "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -1116,6 +1136,17 @@ public class ConsultancyReimbursementInfoService {
                     }
                     retureListDto.setSourceType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(retureListDto.getSourceType(),"cw_reimbursement_source_type",""));
                 }
+
+                if (StringUtils.isBlank(retureListDto.getDeptName())){
+                    //处理部门名
+                    String offices = getOfficeNameByIds(retureListDto.getDeptId());
+                    retureListDto.setDeptName(offices);
+                }
+                if (StringUtils.isBlank(retureListDto.getName())){
+                    //处理用户名
+                    String names = userApi.getNamesByIds(retureListDto.getUserId());
+                    retureListDto.setName(names);
+                }
             }
         }
         return exportList;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/dto/ConsultancyRetureListDto.java

@@ -163,4 +163,6 @@ public class ConsultancyRetureListDto {
     private List<String> auditFileUserIds;
 
     private Boolean applyFile;//是否发起文件补充
+    private String userId;
+    private String deptId;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -124,6 +124,8 @@ public class CwReimbursementInfoService {
      * 列表查询
      */
     public IPage<RetureListDto> list(Page<RetureListDto> page , QueryListDto dto) throws Exception{
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
+        IOfficeApi officeApi = SpringUtil.getBean(IOfficeApi.class);
         QueryWrapper<QueryListDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, QueryListDto.class);
         /**
          * a表是reimbursementInfo
@@ -150,11 +152,12 @@ public class CwReimbursementInfoService {
         }
         // 报销人
         if (StringUtils.isNotEmpty(dto.getReimBy())) {
-            queryWrapper.apply("( b.user_id = {0} OR us.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b2.user_id = {0} OR us2.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b3.user_id = {0} OR us3.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b4.user_id = {0} OR us4.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
-            queryWrapper.or().apply("( b5.user_id = {0} OR us5.name LIKE {1} )", dto.getReimBy(), "%" + dto.getReimBy() + "%");
+            UserDTO userdto = userApi.getByLoginNameNoTen(dto.getReimBy());
+            queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )", "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+            queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
 
         }
         // 报销状态
@@ -163,11 +166,12 @@ public class CwReimbursementInfoService {
         }
         // 报销部门
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
-            queryWrapper.apply("( b.dept_id = {0} OR so.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id = {0} OR so2.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b3.dept_id = {0} OR so3.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b4.dept_id = {0} OR so4.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id = {0} OR so5.name LIKE {1} )", dto.getDepartment(), "%" + dto.getDepartment() + "%");
+            OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
+            queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
+            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
@@ -270,6 +274,7 @@ public class CwReimbursementInfoService {
         }*/
 
 
+
         IPage<RetureListDto> list = infoMapper.findList(page, queryWrapper, officeIds.toString());
         list.getRecords().stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getSourceType()) && "1".equals(item.getSourceType())) { //项目报销
@@ -277,12 +282,6 @@ public class CwReimbursementInfoService {
                     String proName = selectProjectByIds(item.getProjectId());
                     item.setProjectName(proName);
                 }
-                if (StringUtils.isBlank(item.getDeptName())){
-                    String name = infoMapper.findUserById(item.getProjectUser());
-                    item.setName(name);
-                    String office = infoMapper.findOfficeById(item.getProjectOffice());
-                    item.setDeptName(office);
-                }
             }
             if (StringUtils.isNotBlank(item.getSourceType()) && "3".equals(item.getSourceType())){//报告报销
                 if (StringUtils.isBlank(item.getDeptName())){
@@ -300,6 +299,16 @@ public class CwReimbursementInfoService {
                 item.setProcInsIdFile(reimbursementFileSupplement.getProcInsId());
                 item.setTaskIdFile(reimbursementFileSupplement.getTaskIdFile());
             }
+            if (StringUtils.isBlank(item.getDeptName())){
+                //处理部门名
+                String offices = getOfficeNameByIds(item.getProjectOffice());
+                item.setDeptName(offices);
+            }
+            if(StringUtils.isBlank(item.getName())){
+                //处理用户名
+                String names = userApi.getNamesByIds(item.getProjectUser());
+                item.setName(names);
+            }
         });
         return list;
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/OfficeApiImpl.java

@@ -22,6 +22,11 @@ public class OfficeApiImpl implements IOfficeApi {
     }
 
     @Override
+    public OfficeDTO getOfficeByName(String name) {
+        return OfficeWrapper.INSTANCE.toDTO ( officeService.lambdaQuery ( ).eq ( Office::getName, name ).one ( ) );
+    }
+
+    @Override
     public Office selectById(String id) {
         return officeService.getById(id);
     }