项目修改校验

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -303,6 +303,20 @@ public class CwFinanceInvoiceController {
     }
 
     /**
+     * 根据项目id查询项目关联发票(用于项目登记修改)
+     * @param projectId
+     * @param cwFinanceInvoiceDTO
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("getByIds2")
+    @ApiOperation(value = "根据项目id查询项目关联发票")
+    public ResponseEntity<List<CwFinanceInvoiceDTO>> getByIds2(String projectId,CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception {
+        List<CwFinanceInvoiceDTO> cwFinanceDTO = cwFinanceInvoiceService.getByIds2(projectId, cwFinanceInvoiceDTO);
+        return ResponseEntity.ok(cwFinanceDTO);
+    }
+
+    /**
      * 根据合同id查询项目关联发票
      * @param contractId
      * @param cwFinanceInvoiceDTO

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

@@ -662,6 +662,21 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         return new ArrayList<>();
     }
 
+    public List<CwFinanceInvoiceDTO> getByIds2(String projectId,CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
+        if(StringUtils.isNotBlank(projectId)){
+            List<String> idByProjectId = cwFinanceInvoiceMapper.getIdByProjectId(projectId);
+            if (CollectionUtil.isNotEmpty(idByProjectId)){
+                QueryWrapper<CwFinanceInvoice> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwFinanceInvoiceWrapper.INSTANCE.toEntity(cwFinanceInvoiceDTO), CwFinanceInvoice.class );
+                queryWrapper.in("fi.id", idByProjectId);
+                queryWrapper.eq("fi.del_flag","0");
+                queryWrapper.orderByDesc("fi.create_time");
+                queryWrapper.eq("fi.invalid_status","0"); // 未作废
+                return cwFinanceInvoiceMapper.getByIds(queryWrapper);
+            }
+        }
+        return new ArrayList<>();
+    }
+
     public List<CwFinanceInvoiceDTO> getByContractId(String contractId,CwFinanceInvoiceDTO cwFinanceInvoiceDTO) throws Exception{
         if(StringUtils.isNotBlank(contractId)){
             List<String> idByContractId = cwFinanceInvoiceMapper.getIdByContractId(contractId);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -580,6 +580,20 @@ public class CwProjectReportController {
     }
 
     /**
+     * 根据项目id查询关联报告(用于项目登记修改)
+     * @param projectId
+     * @param cwProjectReport
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("getIdByProjectId2")
+    @ApiOperation(value = "根据项目id查询关联报告")
+    public ResponseEntity<List<CwProjectReport>> getIdByProjectId2(String projectId, CwProjectReport cwProjectReport) throws Exception {
+        List<CwProjectReport> cwProjectReportList = projectReportService.getIdByProjectId2(projectId, cwProjectReport);
+        return ResponseEntity.ok(cwProjectReportList);
+    }
+
+    /**
      * 根据合同id查询关联报告
      * @param contractId
      * @param cwProjectReport

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

@@ -3610,6 +3610,31 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         return new ArrayList<>();
     }
 
+    public List<CwProjectReport> getIdByProjectId2(String projectId, CwProjectReport cwProjectReport) throws Exception{
+        if(StringUtils.isNotBlank(projectId)){
+            List<String> idByProjectId = reportMapper.getIdByProjectId(projectId);
+            if (CollectionUtil.isNotEmpty(idByProjectId)){
+                QueryWrapper<CwProjectReport> queryWrapper = new QueryWrapper<>();
+                if (ObjectUtil.isNotEmpty(cwProjectReport)) {
+                    if (StringUtils.isNotBlank(cwProjectReport.getReportNo())) {
+                        queryWrapper.like("cw_prnl.report_no", cwProjectReport.getReportNo());
+                    }
+                    if (StringUtils.isNotBlank(cwProjectReport.getProjectName())) {
+                        queryWrapper.like("cw_pro.project_name", cwProjectReport.getProjectName());
+                    }
+                    if (StringUtils.isNotBlank(cwProjectReport.getProjectNumber())) {
+                        queryWrapper.like("cw_pro.project_number", cwProjectReport.getProjectNumber());
+                    }
+                }
+                queryWrapper.in("cw_pr.id", idByProjectId);
+                queryWrapper.eq("cw_pr.del_flag","0");
+                queryWrapper.orderByDesc("cw_pr.create_time");
+                return reportMapper.getByIds(queryWrapper);
+            }
+        }
+        return new ArrayList<>();
+    }
+
     public List<CwProjectReport> getIdByClientId(String clientId, CwProjectReport cwProjectReport) throws Exception{
         if(StringUtils.isNotBlank(clientId)){
             List<String> idByClientId = reportMapper.getIdByClientId(clientId);