Merge branch '0614-增加税率筛选条件' of http://192.168.12.182/invoice/pt into release

 Conflicts:

	dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -141,6 +141,8 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
+        String taxRate = String.valueOf(map.get("taxRate"));
+        log.info("taxRate={}",taxRate);
         String inAccountStatus = (String)map.get("inAccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
@@ -225,6 +227,12 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("companyCode",companyCode);
         }
 
+        if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+//            List<String> rates = new ArrayList<>();
+//            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",taxRate);
+        }
+
         if (!StringHelper.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
                 pramsMap.put("invoiceType", invoiceType);
@@ -503,6 +511,7 @@ public class BaseInvoiceController extends AbstractController {
         String suspendStatus = (String) map.get("suspendStastus");
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
+        String taxRate = String.valueOf(map.get("taxRate"));
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
         }
@@ -566,6 +575,12 @@ public class BaseInvoiceController extends AbstractController {
         if (!StringUtils.isNotBlank(gfsh)){
             pramsMap.put("sign","88");
         }
+
+        if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+//            List<String> rates = new ArrayList<>();
+//            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",taxRate);
+        }
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             gfshList.add(gfsh);
@@ -694,6 +709,56 @@ public class BaseInvoiceController extends AbstractController {
 
     }
 
+    private List<String> convertRates(String taxRate,List<String> rates) {
+        switch (taxRate) {
+            case "0":
+                rates.add("0");
+                break;
+            case "1.5":
+                rates.add("1.5");
+                break;
+            case "2":
+                rates.add("2");
+                rates.add("0.02");
+                break;
+            case "3":
+                rates.add("3");
+                rates.add("0.03");
+                break;
+            case "5":
+                rates.add("5");
+                rates.add("0.05");
+                break;
+            case "6":
+                rates.add("6");
+                rates.add("0.06");
+                break;
+            case "9":
+                rates.add("9");
+                rates.add("0.09");
+                break;
+            case "10":
+                rates.add("10");
+                rates.add("0.10");
+                break;
+            case "13":
+                rates.add("13");
+                rates.add("0.13");
+                break;
+            case "16":
+                rates.add("16");
+                rates.add("0.16");
+                break;
+            case "17":
+                rates.add("17");
+                rates.add("0.17");
+                break;
+            default:
+                break;
+        }
+        return rates;
+    }
+
     public boolean checkList(List<String> list) {
         boolean flag =false;
         if (list == null || list.isEmpty()){

dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java

@@ -140,6 +140,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String bzdh = (String) map.get("bzdh");
         String bzr = (String) map.get("bzr");
+        String taxRate = String.valueOf(map.get("taxRate"));
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");
@@ -170,6 +171,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("name", getUserName());
+        pramsMap.put("taxRate", taxRate);
         pramsMap.put("loginName", getLoginName());
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
@@ -319,6 +321,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String bzdh = (String) map.get("bzdh");
         String bzr = (String) map.get("bzr");
+        String taxRate = String.valueOf(map.get("taxRate"));
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");
@@ -356,6 +359,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
         pramsMap.put("company", map.get("company"));
+        pramsMap.put("taxRate", taxRate);
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {

dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java

@@ -522,4 +522,5 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String suspendDate;
 
     private String bzr;
+    private String taxRate;
 }

dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java

@@ -211,6 +211,7 @@ public class BaseFpRzRespVO implements Serializable {
     private String compCode;
 
     private String bzr;
+    private String taxRate;
 
 
 }

dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java

@@ -166,4 +166,5 @@ public class BaseSggxCxRespVO {
     private String bzr;
 
     private String uuid;
+    private String taxRate;
 }

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -203,6 +203,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         }
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());
+                        pageList.get(i).setTaxRate(pageList.get(i).getTaxRate());
                     }
                 }
 

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -222,6 +222,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
+                    vo.setTaxRate(pageList.get(i).getTaxRate());
 //                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
 //                    pageList.get(i).setInAccountStatus(dkzt);
 //                    vo.setInAccountStatus(dkzt);

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -71,13 +71,13 @@
         t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status,
         t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d')
         bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date,
-        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id
+        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,t.tax_rate
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.company = #{company}
         <if test="sign != '88'">
             and t.gf_tax_no in
@@ -235,7 +235,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        order by t.rzh_date desc,t.invoice_date desc
+        <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>
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">
@@ -355,7 +360,7 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}
@@ -492,6 +497,12 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </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>
     </select>
     <select id="selectRzfpHj" parameterType="java.util.Map"
             resultMap="RzcxhjResultMap" databaseId="oracle">

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -69,7 +69,7 @@
         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.suspend_status,t.suspend_date,
-        t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
+        t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate
         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
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
@@ -135,14 +135,14 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="bzdh == null or bzdh == '' or bzdh == 'null' or bzdh == '99'">
+        <if test=" bzdh == ''">
             and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
-            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+            and t.inaccount_status = '0'
         </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
@@ -511,9 +511,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="bzdh == null or bzdh == '' or bzdh == 'null' or bzdh == '99'">
-            and t.bzdh is not null
-        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>

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

@@ -151,6 +151,7 @@ public class ManualAthensThread extends BaseThread {
                 String cjjsyf = prams.getString("cjjsyf");
                 String gfTaxNo = prams.getString("gfTaxNo");
                 String bzr = prams.getString("bzr");
+                String taxRate = String.valueOf(prams.getInteger("taxRate"));
                 String suspendStatus = prams.getString("suspendStastus");
                 String suspendDate = prams.getString("suspendDate");
                 String inAccountStatus = prams.getString("inAccountStatus");
@@ -222,6 +223,7 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("rzzt", rzzt);
                 pramsMap.put("rzlx", rzlx);
                 pramsMap.put("rzr", rzr);
+                pramsMap.put("taxRate", taxRate);
                 pramsMap.put("inAccountStatus", inAccountStatus);
                 pramsMap.put("company", company);
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));

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

@@ -140,6 +140,7 @@ public class RzFpxxExportThread extends BaseThread {
                 String menuId = prams.getString("menuId");
                 String bzdh = prams.getString("bzdh");
                 String bzr = prams.getString("bzr");
+                String taxRate = String.valueOf(prams.getInteger("taxRate"));
                 JSONArray companyCodeArray = prams.getJSONArray("companyCodes");
                 String snVoucherNumber = prams.getString("snVoucherNumber");
                 String imageNumber = prams.getString("imageNumber");
@@ -176,6 +177,7 @@ public class RzFpxxExportThread extends BaseThread {
                 pramsMap.put("paymentStatus", prams.getString("paymentStatus"));
                 pramsMap.put("bzdh",bzdh);
                 pramsMap.put("bzr",bzr);
+                pramsMap.put("taxRate", taxRate);
                 pramsMap.put("companyCodes",companyCodes);
 
                 if (StringHelper.isBlank(gfsh)){

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

@@ -259,6 +259,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>
         order by t.rzh_date desc,t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -716,6 +722,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>