预开票

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

@@ -361,7 +361,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /**
      * 是否预开票
      */
-    @Excel(name = "是否预开票",width = 14, replace = {"是_1", "否_0"})
+    @Excel(name = "是否预开票",width = 14, replace = {"是_1", "否_0"," _null"})
     private String isPreInvoice;
 
     private String createName;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -101,7 +101,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     List<String> getMembersId(@Param("id") String id);
 
     List<String> findAllList(@Param("id") String id);
-
+    //查找预开票项目
     IPage<CwProjectRecordsDTO> findPreInvoiceList(Page<CwProjectRecordsDTO> page,@Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
 
     CwProjectRecordsDTO getInvoiceTotal(@Param("id") String id);

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

@@ -475,7 +475,8 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             List<CwProjectReportData> reportData = cwProjectReportMapper.getByProjectId(record.getId());
             if (CollectionUtils.isNotEmpty(reportData)) {
                 for (CwProjectReportData reportDatum : reportData) {
-                    if (!"5".equals(reportDatum.getStatus())) {
+                    //报告号申请未完成的项目
+                    if (!"5".equals(reportDatum.getApplyStatus())) {
                         // 如果找到一个状态不是 "5" 的报告，则将该记录的ID添加到集合中
                         projectIdsWithPendingReports.add(record.getId());
                         break; // 不需要继续检查其他报告
@@ -494,6 +495,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         }
         // 替换原列表的内容
         list.setRecords(recordsToKeep);
+        list.setTotal(recordsToKeep.size());
         return list;
     }
 

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

@@ -849,4 +849,18 @@ public class CwProjectReportController {
         return ResponseEntity.ok (projectReportData);
     }
 
+    /**
+     * 查询项目下的报告是否已完成关联
+     * @param id
+     * @return
+     */
+    @ApiLog("查询项目下的报告是否已完成关联")
+    @GetMapping("getCompleteReport")
+    public boolean getCompleteReport(@RequestParam("id") String id) {
+        boolean data = projectReportService.getCompleteReport ( id );
+        return data;
+    }
+
+
+
 }

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

@@ -622,6 +622,7 @@
         a.create_time,
         a.audit_fees,
         a.invoice_number,
+        a.is_complete_invoice,
         e.name as projectMasterName,
         cw_prs1.proc_ins_id as proc_ins_id1,
         cw_prs1.process_definition_id as process_definition_id1,
@@ -631,7 +632,8 @@
         cw_prs2.process_definition_id as process_definition_id2,
         cw_prs2.status as status2,
         cw_prs2.id as sid2,
-        new_line.report_no
+        new_line.report_no,
+        na.review_status as applyStatus
         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
@@ -640,6 +642,7 @@
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
         left join cw_project_report_new_line new_line on a.id = new_line.report_id and new_line.del_flag = '0'
+        left join cw_project_report_number_apply na on a.id = na.report_id and na.del_flag = '0'
         where a.project_id = #{projectId} and a.del_flag = '0'
     </select>
     <select id="getContainDelByProjectId" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReportData">

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

@@ -271,7 +271,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         //当审核通过时,且该报告已完成关联,则将关联状态改为2
         CwProjectReportData cwProjectReportData = reportMapper.queryById(reportData.getId());
         if (StringUtils.isNotBlank(cwProjectReportData.getIsCompleteInvoice())){
-            if ("5".equals(cwProjectReportData.getStatus()) && "1".equals(cwProjectReportData.getIsCompleteInvoice())){
+            if ("5".equals(cwProjectReportData.getApplyStatus()) && "1".equals(cwProjectReportData.getIsCompleteInvoice())){
                 reportMapper.updateCompleteInvoice(reportData.getId());
             }
         }
@@ -4567,4 +4567,23 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         cwRevocationSignatureMapper.updateById(cwRevocationSignature);
         return "操作成功";
     }
+
+    /**
+     * 查询项目下的报告是否已经完成关联
+     * @param id
+     * @return
+     */
+    public boolean getCompleteReport(String id) {
+        List<CwProjectReportData> reportData = reportMapper.getByProjectId(id);
+        if (CollectionUtil.isNotEmpty(reportData)){
+            for (CwProjectReportData data : reportData) {
+                if (StringUtils.isNotBlank(data.getIsCompleteInvoice())){
+                    if (!"0".equals(data.getIsCompleteInvoice())){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }