Merge remote-tracking branch 'origin/0803-add_column' into release

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java

@@ -118,6 +118,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                             dataArray[23] = "否";
                             dataArray[24] = "";
                         }
+                        dataArray[25] = pageList.get(i).getTaxRate();
 
 
 

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -68,7 +68,7 @@ public class ManualAthensThread extends BaseThread {
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
             "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织"
-    ,"暂挂状态","暂挂区间"};
+    ,"暂挂状态","暂挂区间","税率"};
 
 
     /**

dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml

@@ -354,7 +354,7 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
     </select>
     <!--销项票池查询-->
@@ -452,7 +452,7 @@
             and t.invoice_source = #{invoiceSource}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         GROUP BY t.uuid
         ORDER BY t.create_date DESC

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -561,6 +561,7 @@
         <result column="suspend_status" property="suspendStatus"/>
         <result column="suspend_date" property="suspendDate"/>
         <result column="comp_code" property="compCode"/>
+        <result column="tax_rate" property="taxRate"/>
     </resultMap>
     <select id="selectByparams"  parameterType="java.util.Map"
             resultMap="SggxcxResultMap" databaseId="mysql">
@@ -570,7 +571,7 @@
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
-        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,
+        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,t.tax_rate,
         t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
@@ -722,6 +723,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
+            and t.tax_rate = #{taxRate}
+        </if>
+        <if test="taxRate=='多税率'">
+            and t.tax_rate like '%,%'
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             order by t.qs_date desc,t.invoice_date desc
         </if>

dxhy-core/src/main/resources/mapper/SgqsMapper.xml

@@ -38,7 +38,7 @@
         qs_status = '0' and source_system='0'
         and t.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and businessCode != '99' ">
-            and comp_code = #{companyCode}
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and invoice_type = #{invoiceType}

dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java

@@ -370,7 +370,9 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
         BigDecimal sumTaxAmount = new BigDecimal(0);
         for (ExtTdxRecordInvoice record : sumList) {
             sumInvoiceAmount = sumInvoiceAmount.add(record.getInvoiceAmount());
-            sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            if(record.getTaxAmount() != null) {
+                sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            }
         }
         result.put("sumInvoiceAmount",
             AmountFormatUtil.fmtMicrometer(MathUtil.round(sumInvoiceAmount.toPlainString())));