Merge branches '0627-手工认证界面增加排序' and 'test' of http://192.168.12.182/invoice/pt into test

 Conflicts:

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

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

@@ -512,6 +512,10 @@ public class BaseInvoiceController extends AbstractController {
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
         String taxRate = String.valueOf(map.get("taxRate"));
+
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
         }
@@ -553,6 +557,10 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("imageNumber", map.get("imageNumber"));
         pramsMap.put("suspendStatus",suspendStatus);
         pramsMap.put("suspendDate",suspendDate);
+
+        pramsMap.put("sortPzbh",sortPzbh);
+        pramsMap.put("sortBzdh",sortBzdh);
+        pramsMap.put("sortKprq",sortKprq);
         pramsMap.put("bzr",bzr);
         if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
             String accountPeriod = map.get("accountPeriod").toString().substring(0,7);

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

@@ -512,9 +512,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>
@@ -559,6 +556,24 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="sortPzbh == '1'">
+            order by t.sn_voucher_number desc
+        </if>
+        <if test="sortPzbh == '2'">
+            order by t.sn_voucher_number
+        </if>
+        <if test="sortBzdh == '1'">
+            order by t.bzdh desc
+        </if>
+        <if test="sortBzdh == '2'">
+            order by t.bzdh
+        </if>
+        <if test="sortKprq == '1'">
+            order by t.invoice_date desc
+        </if>
+        <if test="sortKprq == '2'">
+            order by t.invoice_date
+        </if>
         <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
@@ -1093,9 +1108,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <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>
@@ -1168,12 +1180,6 @@
         <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>
         <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
@@ -1337,9 +1343,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <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>
@@ -1412,12 +1415,6 @@
         <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="selectRzhAllHj" parameterType="java.util.Map"

dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java

@@ -97,7 +97,7 @@ public class FtpDownloadController extends AbstractController {
                 if ("1".equals(serviceType)) {
                     response.setContentType(this.getContentType(fileName));
                 } else {
-                    response.setContentType("application/octet-stream");
+                    response.setContentType("application/vnd.ms-excel");
                 }
                 response.setHeader("Content-disposition",
                     "attachment; filename=" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1"));