发票页面详情展示

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/domain/CwFinanceInvoice.java

@@ -143,7 +143,7 @@ public class CwFinanceInvoice extends BaseEntity {
     private String reconciliationArea;
 
     /**
-     * 状态
+     * 状态  待审核:2;通过:3;驳回:4
      */
     @Query(tableColumn = "fi.status",type = QueryType.EQ)
     private String status;
@@ -190,10 +190,11 @@ public class CwFinanceInvoice extends BaseEntity {
      * 报备类型(其他)
      */
     private String reportType;
+
     /**
-     * 报备类型
+     * 基本信息中的类型(项目:1;报告:2;其他:0)
      */
-    private String recordReportType;
+    private String recordType;
 
 
     private static final long serialVersionUID = 1L;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/domain/CwFinanceInvoiceBase.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("cw_finance_invoice_base")
-public class CwFinanceInvoiceBase extends BaseEntity {
+public class CwFinanceInvoiceBase extends BaseEntity implements Serializable {
 
     /**
      * 发票id

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

@@ -357,6 +357,10 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
         }
 
+
+
+
+
         return cwFinanceInvoiceDTO;
     }
 
@@ -375,9 +379,10 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 if (StringUtils.isBlank(cwFinanceInvoice.getReceivablesStatus())){
                     cwFinanceInvoice.setReceivablesStatus("0");
                 }
-                if(StringUtils.isBlank(cwFinanceInvoice.getReportType())){
+                if(StringUtils.isNotEmpty(cwFinanceInvoice.getReportType())){
                     cwFinanceInvoice.setReportType(cwFinanceInvoiceDTO.getReportType());
                 }
+
             }
         }
         if(StringUtils.isNotBlank(cwFinanceInvoiceDTO.getId())){
@@ -430,11 +435,11 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                             cwFinanceInvoiceBase.setType("2");
                             cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
                         }
-                        if (cwFinanceInvoiceBase.getProgramId().equals("")){
-                            cwFinanceInvoiceBase.setType("0");
-                            cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
-                        }
+                    }else {
+                        cwFinanceInvoiceBase.setType("0");
+                        cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
                     }
+
                 });
             }else{
                 cwFinanceInvoiceBaseMapper.delete(new QueryWrapper<CwFinanceInvoiceBase>().lambda()

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

@@ -51,6 +51,9 @@ public class CwFinanceInvoiceBaseDTO extends BaseDTO {
      */
     private String type;
 
+    /**
+     * 报备类型
+     */
     private String reportNo;
 
 

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

@@ -321,15 +321,20 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      */
     private String reportType;
 
+
     /**
-     * 报备类型
+     * 基本信息表id
      */
-    private String recordReportType;
-
     private String baseId;
 
+    /**
+     * 基本信息中的类型(项目:1;报告:2;其他:0)
+     */
     private String recordType;
 
+    /**
+     * 报告文号
+     */
     private String reportNo;