预开票及人员筛选

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

@@ -210,7 +210,8 @@
         cfid.number as "number",
         cfid.account as "accountDetail",
         art.ID_ as task_id,
-        art_invalid.ID_ as task_id_invalid
+        art_invalid.ID_ as task_id_invalid,
+        su1.name as reconciliationPeopleName
         from finance_invoice fi
         left join 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'
@@ -219,6 +220,7 @@
         left join act_ru_task art on fi.proc_ins_id = art.PROC_INST_ID_
         left join finance_invoice_invalid invalid on invalid.invoice_id = fi.id and invalid.del_flag = '0'
         left join act_ru_task art_invalid on invalid.proc_ins_id = art_invalid.PROC_INST_ID_
+        left join sys_user su1 on su1.id = fi.reconciliation_people
         ${ew.customSqlSegment}
     </select>
 

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

@@ -249,13 +249,15 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 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());
-                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<FinanceInvoiceDTO>();
-                }
+//                List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(financeInvoiceDTO.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<FinanceInvoiceDTO>();
+//                }
+                queryWrapper.like("su1.name",financeInvoiceDTO.getReconciliationPeopleName());
+
             }
             if (StringUtils.isNotBlank(financeInvoiceDTO.getOperatorOffice())){
                 List<User> userList = SpringUtil.getBean ( IUserApi.class ).getUserByOfficeAll(financeInvoiceDTO.getOperatorOffice());

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

@@ -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/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -235,6 +235,7 @@
         cw_wcb.name as audited_units_name,
         su.name as user_name,
         su1.name as project_master_name,
+        su2.name as realHeaderName,
         cw_pr.project_name as project_name,
         cw_prnl.report_no,
         date_format(cw_prnl.report_date,'%Y-%m-%d') as report_date,
@@ -249,6 +250,7 @@
         left join sys_office so on so.id = su.office_id and so.del_flag ='0'
         left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
+        left join sys_user su2 on cw_pr.real_header = su2.id and su2.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
 
         left join cw_project_members cpm on cw_pr.id = cpm.project_id

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

@@ -103,56 +103,58 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 }
                 // 项目经理1
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName())){
-                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName());
-                    if (CollectionUtils.isNotEmpty(userList)){
-                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(userIdList)){
-                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getProjectMasterId, userIdList));
-                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                            if (CollectionUtil.isNotEmpty(projectIds)){
-                                queryWrapper.in("cw_pa.project_id",projectIds);
-                            }else{
-                                return new Page<>();
-                            }
-                        }else{
-                            return new Page<>();
-                        }
-                    } else {
-                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().eq(CwProjectRecords::getProjectMasterId, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
-                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(projectIds)){
-                            queryWrapper.in("cw_pa.project_id",projectIds);
-                        }else{
-                            return new Page<>();
-                        }
-                    }
+//                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName());
+//                    if (CollectionUtils.isNotEmpty(userList)){
+//                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                        if (CollectionUtil.isNotEmpty(userIdList)){
+//                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getProjectMasterId, userIdList));
+//                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                            if (CollectionUtil.isNotEmpty(projectIds)){
+//                                queryWrapper.in("cw_pa.project_id",projectIds);
+//                            }else{
+//                                return new Page<>();
+//                            }
+//                        }else{
+//                            return new Page<>();
+//                        }
+//                    } else {
+//                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().eq(CwProjectRecords::getProjectMasterId, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
+//                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                        if (CollectionUtil.isNotEmpty(projectIds)){
+//                            queryWrapper.in("cw_pa.project_id",projectIds);
+//                        }else{
+//                            return new Page<>();
+//                        }
+//                    }
+                    queryWrapper.like("su1.name",cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName());
 
                 }
                 // 项目经理2
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName())){
-                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName());
-                    if (CollectionUtils.isNotEmpty(userList)){
-                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(userIdList)){
-                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, userIdList));
-                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                            if (CollectionUtil.isNotEmpty(projectIds)){
-                                queryWrapper.in("cw_pa.project_id",projectIds);
-                            }else{
-                                return new Page<>();
-                            }
-                        }else{
-                            return new Page<>();
-                        }
-                    } else {
-                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
-                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(projectIds)){
-                            queryWrapper.in("cw_pa.project_id",projectIds);
-                        }else{
-                            return new Page<>();
-                        }
-                    }
+//                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName());
+//                    if (CollectionUtils.isNotEmpty(userList)){
+//                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                        if (CollectionUtil.isNotEmpty(userIdList)){
+//                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, userIdList));
+//                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                            if (CollectionUtil.isNotEmpty(projectIds)){
+//                                queryWrapper.in("cw_pa.project_id",projectIds);
+//                            }else{
+//                                return new Page<>();
+//                            }
+//                        }else{
+//                            return new Page<>();
+//                        }
+//                    } else {
+//                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
+//                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                        if (CollectionUtil.isNotEmpty(projectIds)){
+//                            queryWrapper.in("cw_pa.project_id",projectIds);
+//                        }else{
+//                            return new Page<>();
+//                        }
+//                    }
+                    queryWrapper.like("su2.name",cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName());
 
                 }
                 // 创建时间