人员筛选

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/assessSignatureDaily/service/AssessSignatureDailyOfficeWorkService.java

@@ -79,7 +79,7 @@ public class AssessSignatureDailyOfficeWorkService {
         }
         // 创建人
         if (StringUtils.isNotEmpty(dto.getCreateById())) {
-            queryWrapper.apply("(a.create_by_id",dto.getCreateById());
+            queryWrapper.apply("(a.create_by_id",dto.getCreateById()).or().like("c.name",dto.getCreateById());
         }
 
         // 状态

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/assessSignatureDaily/service/AssessSignatureProjectReportService.java

@@ -87,7 +87,7 @@ public class AssessSignatureProjectReportService {
         }
         // 创建人
         if (StringUtils.isNotEmpty(dto.getCreateById())) {
-            queryWrapper.apply("(a.create_by_id",dto.getCreateById());
+            queryWrapper.apply("(a.create_by_id",dto.getCreateById()).or().like("c.name",dto.getCreateById());
         }
 
         // 状态

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/mapper/xml/FinanceInvoiceMapper.xml

@@ -224,8 +224,12 @@
 
     <select id="queryById" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"></include>
+        <include refid="Base_Column_List"></include>,
+        su.name as reconciliationPeopleName,
+        su1.name as billingPeopleRealName
         from finance_invoice fi
+        left join sys_user su on fi.reconciliation_people = su.id
+        left join sys_user su1 on fi.billing_people_real = su1.id
         where fi.del_flag = '0' and fi.id = ${id}
     </select>
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -246,7 +246,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 }
             }
             if (StringUtils.isNotBlank(financeInvoiceDTO.getOperator())){
-                queryWrapper.eq("su.id",financeInvoiceDTO.getOperator());
+                queryWrapper.eq("su.id",financeInvoiceDTO.getOperator()).or().like("su.name",financeInvoiceDTO.getOperator());
             }
             if (StringUtils.isNotBlank(financeInvoiceDTO.getReconciliationPeopleName())) {
                 List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(financeInvoiceDTO.getReconciliationPeopleName());

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/dto/FinanceInvoiceDTO.java

@@ -179,6 +179,11 @@ public class FinanceInvoiceDTO extends BaseDTO {
     private String billingPeopleReal;
 
     /**
+     * 实际开票人姓名
+     */
+    private String billingPeopleRealName;
+
+    /**
      * 对账人id
      */
     private String reconciliationPeople;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProgramArchiveMapper.xml

@@ -160,9 +160,15 @@
     <select id="findByIdArchive" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>,
-        prn.report_no as report_no
+        prn.report_no as report_no,
+        su1.name as currentDisposePersonName,
+        su3.name as signatureEvaluatorSecondName,
+        su2.name as signatureEvaluatorFirstName
         from program_archive pa
         left join program_report_no prn on prn.program_id = pa.program_id and prn.del_flag = '0'
+        left join sys_user su1 on pa.current_dispose_person= su1.id
+        left join sys_user su2 on pa.signature_evaluator_first= su2.id
+        left join sys_user su3 on pa.signature_evaluator_second= su3.id
         where pa.del_flag = '0' and pa.id = #{id}
     </select>
     <select id="getByProgramId" resultMap="BaseResultMap">

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProgramAuditMapper.xml

@@ -97,8 +97,10 @@
     </select>
     <select id="findByIdAudit" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"></include>
+        <include refid="Base_Column_List"></include>,
+        su.name as auditPeopleName
         from program_audit pa
+        left join sys_user su on pa.audit_people = su.id
         where pa.del_flag = '0' and pa.id = #{id}
     </select>
     <select id="findIdByProIdAndLevel" resultType="string">

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -730,7 +730,7 @@ public class ProjectListService {
         String userId = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( )).getId();
         QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
         if (ObjectUtil.isNotEmpty(info) && StringUtils.isNotBlank(info.getCreateById())) {
-            wrapper.eq("a.create_by_id", info.getCreateById());
+            wrapper.eq("a.create_by_id", info.getCreateById()).or().like("b.name", info.getCreateById());
         }
         wrapper.eq("a.del_flag", "0");
         wrapper.eq("a.tab_type", tabType);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProgramArchiveDto.java

@@ -93,6 +93,10 @@ public class ProgramArchiveDto extends BaseDTO {
      * 当前处理人
      */
     private String currentDisposePerson;
+    /**
+     * 当前处理人姓名
+     */
+    private String currentDisposePersonName;
 
     /**
      * 是否开票
@@ -226,11 +230,19 @@ public class ProgramArchiveDto extends BaseDTO {
      * 签字评估师1
      */
     private String signatureEvaluatorFirst;
+    /**
+     * 签字评估师1姓名
+     */
+    private String signatureEvaluatorFirstName;
 
     /**
      * 签字评估师2
      */
     private String signatureEvaluatorSecond;
+    /**
+     * 签字评估师2姓名
+     */
+    private String signatureEvaluatorSecondName;
 
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProgramAuditDto.java

@@ -108,5 +108,10 @@ public class ProgramAuditDto extends BaseDTO {
      */
     private List<WorkAttachmentInfo> workAttachmentDtoList;
 
+    /**
+     * 审核人姓名
+     */
+    private String auditPeopleName;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workClientInfo/controller/WorkClientController.java

@@ -48,7 +48,7 @@ public class WorkClientController {
                 workClientInfoQueryWrapper.between("a.create_time",workClientInfo.getCreateDates()[0], workClientInfo.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(workClientInfo.getCreateById())) {
-                workClientInfoQueryWrapper.eq("a.create_by_id",workClientInfo.getCreateById());
+                workClientInfoQueryWrapper.eq("a.create_by_id",workClientInfo.getCreateById()).or().like("su.name",workClientInfo.getCreateById());
             }
         }
         IPage<WorkClientInfo> list = workClientService.list(page,workClientInfoQueryWrapper);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/controller/WorkContractController.java

@@ -47,7 +47,7 @@ public class WorkContractController {
         String status = workClientInfo.getStatus();
         QueryWrapper<WorkContractInfo> workContractInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(workClientInfo, WorkContractInfo.class);
         if (ObjectUtil.isNotEmpty(workClientInfo) && StringUtils.isNotBlank(workClientInfo.getCreateById())) {
-            workContractInfoQueryWrapper.eq("a.create_by_id", workClientInfo.getCreateById());
+            workContractInfoQueryWrapper.eq("a.create_by_id", workClientInfo.getCreateById()).or().like("c.name", workClientInfo.getCreateById());
         }
         IPage<WorkContractInfo> list = workContractService.list(page, workContractInfoQueryWrapper, clientName, contractDates, contractAmounts, statusList, status);
         return ResponseEntity.ok (list);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractInfoService.java

@@ -135,7 +135,7 @@ public class ContractInfoService {
         }
         //5、创建人
         if (StringUtils.isNotBlank(info.getCreateById())) {
-            wrapper.like("c.`id`", info.getCreateById());
+            wrapper.like("c.`id`", info.getCreateById()).or().like("c.name", info.getCreateById());
         }
         //6、所属部门
         if (StringUtils.isNotBlank(info.getDepartment())) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -321,6 +321,7 @@
         left join cw_finance_invoice fi on a.invoice_id = fi.id
         left join cw_finance_invoice_detail cfid on cfid.invoice_id = fi.id and cfid.del_flag = '0'
         left join sys_user su on fi.create_by_id = su.id and su.del_flag = '0'
+        left join sys_user su1 on fi.reconciliation_people = su1.id and su1.del_flag = '0'
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
         LEFT JOIN act_ru_task d ON fi.proc_ins_id = d.PROC_INST_ID_
@@ -396,11 +397,13 @@
         select
         DISTINCT
         <include refid="Base_Column_List"></include>,
-        su.name as reconciliationPeopleName
+        su.name as reconciliationPeopleName,
+        su1.name as billingPeopleRealName
         from cw_finance_invoice fi
         left join cw_finance_invoice_base fib on fib.invoice_id = fi.id
         left join cw_project_report_new_line rpl on fib.program_id=rpl.report_id
         left join sys_user su on fi.reconciliation_people = su.id
+        left join sys_user su1 on fi.billing_people_real = su1.id
         left join cw_project_records pr on fib.program_id=pr.id
         where fi.del_flag = '0' and fi.id = #{id}
     </select>

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

@@ -242,7 +242,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 经办人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
-                queryWrapper.like("su.id", cwFinanceInvoiceDTO.getOperator());
+                queryWrapper.like("su.id", cwFinanceInvoiceDTO.getOperator()).or().like("su.name", cwFinanceInvoiceDTO.getOperator());
             }
             //报备类型
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReportType())){
@@ -260,7 +260,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
 //                }
 //            }
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
-                queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName());
+                queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName()).or().like("su1.name",cwFinanceInvoiceDTO.getReconciliationPeopleName());
             }
             // 经办人部门
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperatorOffice())){
@@ -342,30 +342,30 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
 
         CwFinanceInvoiceDTO cwFinanceInvoiceDTO = cwFinanceInvoiceMapper.queryById(id);
         //获取项目是否预开票
-        if (ObjectUtil.isNotEmpty(cwFinanceInvoiceDTO)){
-            for (CwFinanceInvoiceBaseDTO cwFinanceInvoiceBaseDTO : cwFinanceInvoiceDTO.getFinanceInvoiceBaseDTOList()) {
-                CwProjectRecordsDTO projectRecordsDTO = cwProjectRecordsMapper.queryById(cwFinanceInvoiceBaseDTO.getProgramId());
-                if (StringUtils.isNotBlank(projectRecordsDTO.getIsPreInvoice()) && "1".equals(projectRecordsDTO.getIsPreInvoice())){
-                    cwFinanceInvoiceBaseDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
-                }
-                List<CwProjectReportData> reportData = cwProjectReportMapper.getByProjectId(cwFinanceInvoiceBaseDTO.getProgramId());
-                if (CollectionUtils.isNotEmpty(reportData)){
-                    for (CwFinanceInvoiceDetailDTO cwFinanceInvoiceDetailDTO : cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList()) {
-                        for (CwProjectReportData reportDatum : reportData) {
-                            if (StringUtils.isNotBlank(reportDatum.getReportNo()) &&
-                                    reportDatum.getInvoiceNumber().equals(cwFinanceInvoiceDetailDTO.getNumber())) {
-                                cwFinanceInvoiceBaseDTO.setReportNo(reportDatum.getReportNo());
-                                break;
-                            }
-                        }
-
-                    }
-                }
-                break;
-            }
-
-
-        }
+//        if (ObjectUtil.isNotEmpty(cwFinanceInvoiceDTO)){
+//            for (CwFinanceInvoiceBaseDTO cwFinanceInvoiceBaseDTO : cwFinanceInvoiceDTO.getFinanceInvoiceBaseDTOList()) {
+//                CwProjectRecordsDTO projectRecordsDTO = cwProjectRecordsMapper.queryById(cwFinanceInvoiceBaseDTO.getProgramId());
+//                if (StringUtils.isNotBlank(projectRecordsDTO.getIsPreInvoice()) && "1".equals(projectRecordsDTO.getIsPreInvoice())){
+//                    cwFinanceInvoiceBaseDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
+//                }
+//                List<CwProjectReportData> reportData = cwProjectReportMapper.getByProjectId(cwFinanceInvoiceBaseDTO.getProgramId());
+//                if (CollectionUtils.isNotEmpty(reportData)){
+//                    for (CwFinanceInvoiceDetailDTO cwFinanceInvoiceDetailDTO : cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList()) {
+//                        for (CwProjectReportData reportDatum : reportData) {
+//                            if (StringUtils.isNotBlank(reportDatum.getReportNo()) &&
+//                                    reportDatum.getInvoiceNumber().equals(cwFinanceInvoiceDetailDTO.getNumber())) {
+//                                cwFinanceInvoiceBaseDTO.setReportNo(reportDatum.getReportNo());
+//                                break;
+//                            }
+//                        }
+//
+//                    }
+//                }
+//                break;
+//            }
+//
+//
+//        }
         // 电话号获取
         if (ObjectUtil.isNotEmpty(cwFinanceInvoiceDTO) && StringUtils.isNotBlank(cwFinanceInvoiceDTO.getBillingId())) {
             CwWorkClientBilling cwWorkClientBilling = cwWorkClientBillingService.getById(cwFinanceInvoiceDTO.getBillingId());

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

@@ -191,6 +191,10 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      * 实际开票人
      */
     private String billingPeopleReal;
+    /**
+     * 实际开票人姓名
+     */
+    private String billingPeopleRealName;
 
     /**
      * 对账人id

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -100,7 +100,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
-                queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
+                queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName()).or().like("su2.name", cwProjectRecordsDTO.getProjectMasterName());
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getBusinessType())){
                 queryWrapper.eq("a.business_type",cwProjectRecordsDTO.getBusinessType());
@@ -119,7 +119,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 }
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
-                queryWrapper.in("a.real_header", cwProjectRecordsDTO.getRealHeaderName());
+                queryWrapper.in("a.real_header", cwProjectRecordsDTO.getRealHeaderName()).or().like("su3.name", cwProjectRecordsDTO.getRealHeaderName());
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateId())){
                 queryWrapper.eq("a.create_by_id", cwProjectRecordsDTO.getCreateId());
@@ -127,7 +127,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             // 创建人
             if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getCreateBy())){
                 if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateBy().getName())){
-                    queryWrapper.in("a.create_by_id",cwProjectRecordsDTO.getCreateBy().getName());
+                    queryWrapper.in("a.create_by_id",cwProjectRecordsDTO.getCreateBy().getName()).or().like("su.name",cwProjectRecordsDTO.getCreateBy().getName());
                 }
             }
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -604,4 +604,20 @@ public class CwProjectReportData extends BaseDTO {
      * 是否完成已开票(0:否,1:是,2:选择为1时审核通过后变为最终的结果)
      */
     private String isCompleteInvoice;
+
+    /**
+     * 签字注师1名字
+     */
+    @TableField(exist = false)
+    private String signatureAnnotator1Name;
+    /**
+     * 签字注师2名字
+     */
+    @TableField(exist = false)
+    private String signatureAnnotator2Name;
+    /**
+     * 实际创建人名字
+     */
+    @TableField(exist = false)
+    private String realCreateName;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -316,7 +316,10 @@
 
         cw_nra.proc_ins_id as applyReviewProcId,
         cw_nra.process_definition_id as applyReviewProcDefId,
-        ifnull(cw_nra.review_status,'0') as applyReviewStatus
+        ifnull(cw_nra.review_status,'0') as applyReviewStatus,
+        su1.name as signatureAnnotator1Name,
+        su2.name as signatureAnnotator2Name,
+        su3.name as realCreateName
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -331,6 +334,9 @@
         LEFT JOIN cw_project_report_number_apply cw_na on  a.id = cw_na.report_id and cw_na.del_flag = '0'
         LEFT JOIN cw_project_report_number_review_apply cw_nra on  a.id = cw_nra.report_id and cw_nra.del_flag = '0'
         LEFT JOIN cw_project_report_archive cw_pa on  a.id = cw_pa.report_id and cw_pa.del_flag = '0'
+        LEFT JOIN sys_user su1 on a.signature_annotator1 = su1.id
+        LEFT JOIN sys_user su2 on a.signature_annotator2 = su2.id
+        LEFT JOIN sys_user su3 on a.real_create = su3.id
         where a.id = #{id}
     </select>
 
@@ -407,7 +413,10 @@
         ifnull(cw_nra.review_status,'0') as applyReviewStatus,
         rs.reason as rebackReason,
         rs.status as rebackStatus,
-        rs.id as revocationId
+        rs.id as revocationId,
+        su1.name as signatureAnnotator1Name,
+        su2.name as signatureAnnotator2Name,
+        su3.name as realCreateName
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -423,6 +432,9 @@
         LEFT JOIN cw_project_report_number_review_apply cw_nra on  a.id = cw_nra.report_id and cw_nra.del_flag = '0'
         LEFT JOIN cw_project_report_archive cw_pa on  a.id = cw_pa.report_id and cw_pa.del_flag = '0'
         left join cw_revocation_signature rs on a.id = rs.report_id and rs.del_flag = '0'
+        LEFT JOIN sys_user su1 on a.signature_annotator1 = su1.id
+        LEFT JOIN sys_user su2 on a.signature_annotator2 = su2.id
+        LEFT JOIN sys_user su3 on a.real_create = su3.id
         where (rs.id = #{id} or a.id = #{id})
     </select>
     <select id="queryContainDelById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReportData">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -582,10 +582,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             queryWrapper.eq("b.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("e.id", projectReportData.getProjectMasterName());
+            queryWrapper.like("e.id", projectReportData.getProjectMasterName()).or().like("e.name", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getRealHeaderName())) { // 项目经理2筛选
-            queryWrapper.like("f.id", projectReportData.getRealHeaderName());
+            queryWrapper.like("f.id", projectReportData.getRealHeaderName()).or().like("f.name", projectReportData.getRealHeaderName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId()).or().like("d.name", projectReportData.getCreateBy().getId());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveDetailService.java

@@ -66,7 +66,7 @@ public class CwProjectReportArchiveDetailService extends ServiceImpl<CwProjectRe
                 }
                 // 项目经理
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDetailDTO.getCwProjectRecordsDTO().getProjectMasterId())){
-                    queryWrapper.eq("p.project_master_id",cwProjectReportArchiveDetailDTO.getCwProjectRecordsDTO().getProjectMasterId());
+                    queryWrapper.eq("p.project_master_id",cwProjectReportArchiveDetailDTO.getCwProjectRecordsDTO().getProjectMasterId()).or().like("pm.name",cwProjectReportArchiveDetailDTO.getCwProjectRecordsDTO().getProjectMasterId());
                 }
                 // 创建时间
                 if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDetailDTO.getReportDates())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -173,7 +173,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
 //                        }else{
 //                            return new Page<>();
 //                        }
-                        queryWrapper.in("cw_pa.create_by_id",cwProjectReportArchiveDTO.getCreateBy().getName());
+                        queryWrapper.in("cw_pa.create_by_id",cwProjectReportArchiveDTO.getCreateBy().getName()).or().like("su.name",cwProjectReportArchiveDTO.getCreateBy().getName());
                     }
                 }
                 // 报告文号

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -99,13 +99,13 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("g.id", projectReportData.getProjectMasterName());
+            queryWrapper.like("g.id", projectReportData.getProjectMasterName()).or().like("g.name", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Name())) { // 项目经理2筛选
-            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name());
+            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name()).or().like("k.name", projectReportData.getProjectMaster2Name());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
-            queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId());
+            queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId()).or().like("h.name", projectReportData.getCreateBy().getId());
         }
         //创建时间
         String[] contractDates = projectReportData.getContractDates();

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -107,13 +107,13 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("g.id", projectReportData.getProjectMasterName());
+            queryWrapper.like("g.id", projectReportData.getProjectMasterName()).or().like("g.name", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Name())) { // 项目经理2筛选
-            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name());
+            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name()).or().like("k.name", projectReportData.getProjectMaster2Name());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
-            queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId());
+            queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId()).or().like("f.name",projectReportData.getCreateBy().getId());
         }
         if (StringUtils.isNotEmpty(projectReportData.getApplyFileType())) { // 状态筛选
             queryWrapper.eq("a.apply_file_type", projectReportData.getApplyFileType());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/signatureDaily/service/SignatureDaulyOfficeWorkService.java

@@ -83,7 +83,7 @@ public class SignatureDaulyOfficeWorkService {
         }
         // 创建人
         if (StringUtils.isNotEmpty(dto.getCreateById())) {
-            queryWrapper.apply("(a.create_by_id",dto.getCreateById());
+            queryWrapper.apply("a.create_by_id",dto.getCreateById()).or().like("c.name",dto.getCreateById());
         }
 
         // 状态

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/signatureDaily/service/SignatureProjectReportService.java

@@ -96,7 +96,7 @@ public class SignatureProjectReportService {
         }
         // 创建人
         if (StringUtils.isNotEmpty(dto.getCreateById())) {
-            queryWrapper.apply("(a.create_by_id",dto.getCreateById());
+            queryWrapper.eq("a.create_by_id",dto.getCreateById()).like("c.name",dto.getCreateById());
         }
 
         // 状态