报告号申请

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

@@ -873,6 +873,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
 
         // 将filteredList设置回原来的list.getRecords()
         list.setRecords(filteredList);
+        list.setTotal(filteredList.size());
         return list;
     }
 }

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

@@ -1008,8 +1008,8 @@ public class CwProjectReportController {
      */
     @ApiLog("根据发票编号查询报告")
     @GetMapping("getByInvoiceNumber")
-    public boolean getByInvoiceNumber(@RequestParam("invoiceNumber") String invoiceNumber) {
-        boolean data = projectReportService.getByInvoiceNumber ( invoiceNumber );
+    public boolean getByInvoiceNumber(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("id") String id) {
+        boolean data = projectReportService.getByInvoiceNumber ( invoiceNumber,id );
         return data;
     }
 

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

@@ -249,5 +249,5 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
 
     void updateCompleteInvoice(@Param("id") String id);
 
-    CwProjectReportData getByInvoiceNumber(@Param("invoiceNumber")String invoiceNumber);
+    CwProjectReportData getByInvoiceNumber(@Param("invoiceNumber")String invoiceNumber,@Param("id") String id);
 }

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

@@ -1207,7 +1207,7 @@
             a.signature_annotator_status
         from cw_project_report a
         left join cw_project_report_number_apply rna on a.id = rna.report_id and rna.del_flag = '0'
-        where rna.review_status not in ('0','1') and a.invoice_number = #{invoiceNumber}
+        where rna.review_status not in ('0','1') and a.invoice_number = #{invoiceNumber} and a.del_flag = 0 and a.id != #{id}
     </select>
 
 

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

@@ -4959,8 +4959,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
      * @param invoiceNumber
      * @return
      */
-    public boolean getByInvoiceNumber(String invoiceNumber) {
-        CwProjectReportData reportData = reportMapper.getByInvoiceNumber(invoiceNumber);
+    public boolean getByInvoiceNumber(String invoiceNumber,String id) {
+        CwProjectReportData reportData = reportMapper.getByInvoiceNumber(invoiceNumber,id);
         if (ObjectUtil.isNotEmpty(reportData)){
             return true;
         }