评估，会计-发票-添加红冲原因

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

@@ -193,6 +193,8 @@ public class FinanceInvoice extends BaseEntity {
 
     private String relatedInvoice; //是否关联发票
     private String situationDetail;	//情况说明
+    private String redFlushReason;	//红冲原因
+
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -50,6 +50,7 @@
             <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="redFlushReason" column="red_flush_reason" 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>
@@ -105,6 +106,7 @@
         <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="redFlushReason" column="red_flush_reason" jdbcType="VARCHAR"/>
 
         <result property="actualDrawerEmailAddress" column="actual_drawer_email_address" jdbcType="VARCHAR"/>
     </resultMap>
@@ -216,7 +218,8 @@
         fi.red_invoice_relevancy_id,
         fi.red_invoice_relevancy_number,
         fi.related_invoice,
-        fi.situation_detail
+        fi.situation_detail,
+        fi.red_flush_reason
     </sql>
 
     <sql id="New_Base_Column_List">
@@ -261,7 +264,8 @@
         fi.red_invoice_relevancy_id,
         fi.red_invoice_relevancy_number,
         fi.related_invoice,
-        fi.situation_detail
+        fi.situation_detail,
+        fi.red_flush_reason
     </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

@@ -367,7 +367,6 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
 //    }
 
     public FinanceInvoiceDTO queryById(String id) {
-
         FinanceInvoiceDTO financeInvoiceDTO = financeInvoiceMapper.queryById(id);
         if(ObjectUtil.isNotEmpty(financeInvoiceDTO) && "1".equals(financeInvoiceDTO.getRedInvoiceFlag()) ){
             //此处为红冲数据 需要获取发票号
@@ -375,6 +374,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 FinanceInvoiceDTO redCwFinanceInvoiceDTO = financeInvoiceMapper.queryById(financeInvoiceDTO.getRedInvoiceRelevancyId());
                 String invoiceNumberStr = financeInvoiceMapper.getInvoiceNumberStr(redCwFinanceInvoiceDTO.getId());
                 financeInvoiceDTO.setInvoiceNumberStr(invoiceNumberStr);
+                financeInvoiceDTO.setOriginalAccount(redCwFinanceInvoiceDTO.getAccount());
             }
         }
         // 查询附件信息
@@ -399,6 +399,9 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         if(StringUtils.isNotBlank(financeInvoiceDTO.getSituationDetail())){
             financeInvoice.setSituationDetail(financeInvoiceDTO.getSituationDetail());
         }
+        if(StringUtils.isNotBlank(financeInvoiceDTO.getRedFlushReason())){
+            financeInvoice.setRedFlushReason(financeInvoiceDTO.getRedFlushReason());
+        }
         if (ObjectUtil.isNotEmpty(financeInvoice)) {
             if(StringUtils.isBlank(financeInvoice.getId())){
                 //获取当前登录人信息

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

@@ -329,6 +329,9 @@ public class FinanceInvoiceDTO extends BaseDTO {
 
     private String relatedInvoice; //是否关联发票
     private String situationDetail;	//情况说明
+    private String redFlushReason;	//红冲原因
+    private String originalAccount;	//原发票金额
+
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -212,6 +212,7 @@ public class CwFinanceInvoice extends BaseEntity {
 
     private String relatedInvoice; //是否关联发票
     private String situationDetail;	//情况说明
+    private String redFlushReason;	//红冲原因
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -205,7 +205,8 @@
         fi.red_invoice_relevancy_id,
         fi.red_invoice_relevancy_number,
         fi.related_invoice,
-        fi.situation_detail
+        fi.situation_detail,
+        fi.red_flush_reason
     </sql>
 
     <sql id="File_Column_List">
@@ -572,6 +573,9 @@
         <if test="null != situationDetail and situationDetail != ''">
             situation_detail= #{situationDetail},
         </if>
+        <if test="null != redFlushReason and redFlushReason != ''">
+            red_flush_reason= #{redFlushReason},
+        </if>
         remarks = #{remarks}
         where id = #{id}
     </update>

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

@@ -610,6 +610,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 CwFinanceInvoiceDTO redCwFinanceInvoiceDTO = cwFinanceInvoiceMapper.queryById(cwFinanceInvoiceDTO.getRedInvoiceRelevancyId());
                 String invoiceNumberStr = cwFinanceInvoiceMapper.getInvoiceNumberStr(redCwFinanceInvoiceDTO.getId());
                 cwFinanceInvoiceDTO.setInvoiceNumberStr(invoiceNumberStr);
+                cwFinanceInvoiceDTO.setOriginalAccount(redCwFinanceInvoiceDTO.getAccount());
             }
         }
         //获取项目是否预开票
@@ -703,6 +704,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         if (StringUtils.isNotEmpty(cwFinanceInvoiceDTO.getSituationDetail())) {
             cwFinanceInvoice.setSituationDetail(cwFinanceInvoiceDTO.getSituationDetail());
         }
+        if (StringUtils.isNotEmpty(cwFinanceInvoiceDTO.getRedFlushReason())) {
+            cwFinanceInvoice.setRedFlushReason(cwFinanceInvoiceDTO.getRedFlushReason());
+        }
         if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getId())) {
             cwFinanceInvoiceMapper.updateInfoById(cwFinanceInvoice);
         } else {
@@ -908,6 +912,16 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
     public String updateStatusById(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) {
         CwFinanceInvoice cwFinanceInvoice = CwFinanceInvoiceWrapper.INSTANCE.toEntity(cwFinanceInvoiceDTO);
         if ("4".equals(cwFinanceInvoice.getStatus())) {
+            CwFinanceInvoiceDTO invoice = queryById(cwFinanceInvoice.getId());
+            if(StringUtils.isNotBlank( invoice.getRedInvoiceRelevancyId())){
+                cwFinanceInvoice.setRedInvoiceRelevancyId(invoice.getRedInvoiceRelevancyId());
+            }
+            if(StringUtils.isNotBlank( invoice.getRedInvoiceRelevancyNumber())){
+                cwFinanceInvoice.setRedInvoiceRelevancyNumber(invoice.getRedInvoiceRelevancyNumber());
+            }
+            if(invoice.getRedInvoiceFlag() != null){
+                cwFinanceInvoice.setRedInvoiceFlag(invoice.getRedInvoiceFlag());
+            }
             cwFinanceInvoiceMapper.updateInfoById(cwFinanceInvoice);
         } else {
             cwFinanceInvoiceMapper.update(cwFinanceInvoice, new QueryWrapper<CwFinanceInvoice>().lambda().eq(CwFinanceInvoice::getId, cwFinanceInvoice.getId()));

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

@@ -391,6 +391,8 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
 
     private String relatedInvoice; //是否关联发票
     private String situationDetail;	//情况说明
+    private String redFlushReason;	//红冲原因
+    private String originalAccount;	//原发票金额
 
     private static final long serialVersionUID = 1L;
 }