中审，会计发票添加 是否关联发票 和 红冲情况说明

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/domain/FinanceInvoice.java

@@ -191,5 +191,8 @@ public class FinanceInvoice extends BaseEntity {
     @Query(tableColumn = "fi.red_invoice_relevancy_number",type = QueryType.EQ)
     private String redInvoiceRelevancyNumber;	//红字发票关联其他发票编号
 
+    private String relatedInvoice; //是否关联发票
+    private String situationDetail;	//情况说明
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -48,6 +48,8 @@
             <result property="redInvoiceFlag" column="red_invoice_flag" jdbcType="VARCHAR"/>
             <result property="redInvoiceRelevancyId" column="red_invoice_relevancy_id" jdbcType="VARCHAR"/>
             <result property="redInvoiceRelevancyNumber" column="red_invoice_relevancy_number" jdbcType="VARCHAR"/>
+            <result property="relatedInvoice" column="related_invoice" jdbcType="VARCHAR"/>
+            <result property="situationDetail" column="situation_detail" jdbcType="VARCHAR"/>
 
         <result property="actualDrawerEmailAddress" column="actual_drawer_email_address" jdbcType="VARCHAR"/>
             <association property="financeInvoiceInvalidDTO" column="id" select="getFii" javaType="com.jeeplus.assess.invoice.service.dto.FinanceInvoiceInvalidDTO"></association>
@@ -161,7 +163,9 @@
         fi.actual_drawer_email_address,
         fi.red_invoice_flag,
         fi.red_invoice_relevancy_id,
-        fi.red_invoice_relevancy_number
+        fi.red_invoice_relevancy_number,
+        fi.related_invoice,
+        fi.situation_detail
     </sql>
 
     <sql id="New_Base_Column_List">
@@ -204,7 +208,9 @@
         fi.actual_drawer_email_address,
         fi.red_invoice_flag,
         fi.red_invoice_relevancy_id,
-        fi.red_invoice_relevancy_number
+        fi.red_invoice_relevancy_number,
+        fi.related_invoice,
+        fi.situation_detail
     </sql>
 
     <select id="getFii" resultType="com.jeeplus.assess.invoice.service.dto.FinanceInvoiceInvalidDTO">

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

@@ -393,6 +393,12 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
 
     public String saveForm(FinanceInvoiceDTO financeInvoiceDTO) throws Exception{
         FinanceInvoice financeInvoice = FinanceInvoiceWrapper.INSTANCE.toEntity(financeInvoiceDTO);
+        if(StringUtils.isNotBlank(financeInvoiceDTO.getRelatedInvoice())){
+            financeInvoice.setRelatedInvoice(financeInvoiceDTO.getRelatedInvoice());
+        }
+        if(StringUtils.isNotBlank(financeInvoiceDTO.getSituationDetail())){
+            financeInvoice.setSituationDetail(financeInvoiceDTO.getSituationDetail());
+        }
         if (ObjectUtil.isNotEmpty(financeInvoice)) {
             if(StringUtils.isBlank(financeInvoice.getId())){
                 //获取当前登录人信息

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

@@ -327,6 +327,8 @@ public class FinanceInvoiceDTO extends BaseDTO {
     private String invoiceNumberStr;	//红字发票关联其他发票号
     private List<String> redNotStatusList;
 
+    private String relatedInvoice; //是否关联发票
+    private String situationDetail;	//情况说明
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -210,6 +210,8 @@ public class CwFinanceInvoice extends BaseEntity {
     @Query(tableColumn = "fi.red_invoice_relevancy_number",type = QueryType.EQ)
     private String redInvoiceRelevancyNumber;	//红字发票关联其他发票编号
 
+    private String relatedInvoice; //是否关联发票
+    private String situationDetail;	//情况说明
 
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -203,7 +203,9 @@
         fi.actual_drawer_email_address,
         fi.red_invoice_flag,
         fi.red_invoice_relevancy_id,
-        fi.red_invoice_relevancy_number
+        fi.red_invoice_relevancy_number,
+        fi.related_invoice,
+        fi.situation_detail
     </sql>
 
     <sql id="File_Column_List">
@@ -585,7 +587,8 @@
         red_invoice_flag = #{redInvoiceFlag},
         red_invoice_relevancy_id = #{redInvoiceRelevancyId},
         red_invoice_relevancy_number = #{redInvoiceRelevancyNumber},
-
+        related_invoice= #{relatedInvoice},
+        situation_detail= #{situationDetail},
         remarks = #{remarks}
         where id = #{id}
     </update>

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

@@ -697,6 +697,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         if (StringUtils.isNotEmpty(cwFinanceInvoiceDTO.getActualDrawerEmailAddress())) {
             cwFinanceInvoice.setActualDrawerEmailAddress(cwFinanceInvoiceDTO.getActualDrawerEmailAddress());
         }
+        if (StringUtils.isNotEmpty(cwFinanceInvoiceDTO.getRelatedInvoice())) {
+            cwFinanceInvoice.setRelatedInvoice(cwFinanceInvoiceDTO.getRelatedInvoice());
+        }
+        if (StringUtils.isNotEmpty(cwFinanceInvoiceDTO.getSituationDetail())) {
+            cwFinanceInvoice.setSituationDetail(cwFinanceInvoiceDTO.getSituationDetail());
+        }
         if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getId())) {
             cwFinanceInvoiceMapper.updateInfoById(cwFinanceInvoice);
         } else {

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

@@ -389,6 +389,8 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private String invoiceNumberStr;	//红字发票关联其他发票号
     private List<String> redNotStatusList;
 
+    private String relatedInvoice; //是否关联发票
+    private String situationDetail;	//情况说明
 
     private static final long serialVersionUID = 1L;
 }