Merge remote-tracking branch 'origin/master'

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

@@ -179,5 +179,10 @@ public class FinanceInvoice extends BaseEntity {
      */
     private String isMultiple;
 
+    /**
+     * 邮箱账号
+     */
+    private String actualDrawerEmailAddress;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -45,6 +45,7 @@
             <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
             <result property="taskIdInvalid" column="task_id_invalid" jdbcType="VARCHAR"/>
             <result property="isMultiple" column="is_multiple" 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>
             <collection property="financeInvoiceReceivablesDTOList" column="id" select="getFirList" ofType="com.jeeplus.assess.invoice.service.dto.FinanceInvoiceReceivablesDTO"></collection>
             <collection property="financeInvoiceBaseDTOList" column="id" select="getBaseList" ofType="com.jeeplus.assess.invoice.service.dto.FinanceInvoiceBaseDTO"></collection>
@@ -152,7 +153,8 @@
         fi.receivables_status,
         fi.invalid_status,
         fi.receivables_date,
-        fi.is_multiple
+        fi.is_multiple,
+        fi.actual_drawer_email_address
     </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

@@ -383,6 +383,9 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                     financeInvoice.setReceivablesStatus("0");
                 }
             }
+            if(StringUtils.isNotEmpty(financeInvoiceDTO.getActualDrawerEmailAddress())){
+                financeInvoice.setActualDrawerEmailAddress(financeInvoiceDTO.getActualDrawerEmailAddress());
+            }
         }
         this.saveOrUpdate(financeInvoice);
         if (ObjectUtil.isNotEmpty(financeInvoiceDTO)) {

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

@@ -303,6 +303,11 @@ public class FinanceInvoiceDTO extends BaseDTO {
      */
     private String isMultiple;
 
+    /**
+     * 邮箱账号
+     */
+    private String actualDrawerEmailAddress;
+
 
     private static final long serialVersionUID = 1L;
 }