报销列表,筛选报销编号

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

@@ -177,6 +177,10 @@ public class ReimbursementInfoService {
         if (StringUtils.isNotBlank(dto.getSourceType())) {
             queryWrapper.eq("a.source_type", dto.getSourceType());
         }
+        // 报销编号
+        if (StringUtils.isNotEmpty(dto.getNo())) {
+            queryWrapper.like("a.no", dto.getNo());
+        }
         //获取当前登录人信息
         /*UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色

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

@@ -57,4 +57,9 @@ public class QueryListDto extends BaseEntity {
     private String sourceType;
 
     private String reimbursementType;
+
+    /**
+     * 报销编号
+     */
+    private String no;
 }

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

@@ -117,6 +117,10 @@ public class CcpmReimbursementInfoService {
         if (dto.getDates() != null) {
             queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
         }
+        // 报销编号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getNo())) {
+            queryWrapper.like("a.no", dto.getNo());
+        }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {
             queryWrapper.apply("(a.create_by_id = {0} OR c.name LIKE {1})", dto.getHandled(), "%" + dto.getHandled() + "%");

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

@@ -60,4 +60,9 @@ public class CcpmQueryListDto extends BaseEntity {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+
+    /**
+     * 报销编号
+     */
+    private String no;
 }

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

@@ -114,6 +114,10 @@ public class ZsReimbursementInfoService {
         if (dto.getDates() != null) {
             queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
         }
+        // 报销编号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getNo())) {
+            queryWrapper.like("a.no", dto.getNo());
+        }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {
             queryWrapper.apply("(a.create_by_id = {0} OR c.name LIKE {1})", dto.getHandled(), "%" + dto.getHandled() + "%");

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

@@ -60,4 +60,8 @@ public class ZsQueryListDto extends BaseEntity {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+    /**
+     * 报销编号
+     */
+    private String no;
 }

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

@@ -117,6 +117,10 @@ public class ConsultancyReimbursementInfoService {
         if (dto.getDates() != null) {
             queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
         }
+        // 报销编号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getNo())) {
+            queryWrapper.like("a.no", dto.getNo());
+        }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {
             queryWrapper.apply("(a.create_by_id = {0} OR c.name LIKE {1})", dto.getHandled(), "%" + dto.getHandled() + "%");

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

@@ -60,4 +60,9 @@ public class ConsultancyQueryListDto extends BaseEntity {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+
+    /**
+     * 报销编号
+     */
+    private String no;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -240,7 +240,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 经办人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
-                queryWrapper.like("su.name", cwFinanceInvoiceDTO.getOperator());
+                queryWrapper.like("su.id", cwFinanceInvoiceDTO.getOperator());
             }
             //报备类型
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReportType())){
@@ -248,14 +248,17 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
 
             // 对账人
+//            if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
+//                List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwFinanceInvoiceDTO.getReconciliationPeopleName());
+//                List<String> userIdList = users.stream().distinct().map(User::getId).collect(Collectors.toList());
+//                if (CollectionUtil.isNotEmpty(userIdList)) {
+//                    queryWrapper.in("fi.reconciliation_people",userIdList);
+//                } else {
+//                    return new Page<CwFinanceInvoiceDTO>();
+//                }
+//            }
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
-                List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwFinanceInvoiceDTO.getReconciliationPeopleName());
-                List<String> userIdList = users.stream().distinct().map(User::getId).collect(Collectors.toList());
-                if (CollectionUtil.isNotEmpty(userIdList)) {
-                    queryWrapper.in("fi.reconciliation_people",userIdList);
-                } else {
-                    return new Page<CwFinanceInvoiceDTO>();
-                }
+                queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName());
             }
             // 经办人部门
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperatorOffice())){

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

@@ -193,6 +193,10 @@ public class CwReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getReimbursementType())) {
             queryWrapper.eq("a.reimbursement_type", dto.getReimbursementType());
         }
+        // 报销编号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getNo())) {
+            queryWrapper.like("a.no", dto.getNo());
+        }
 
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目

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

@@ -57,4 +57,9 @@ public class QueryListDto extends BaseEntity {
     private String sourceType;
 
     private String reimbursementType;
+
+    /**
+     * 报销编号
+     */
+    private String no;
 }