ariesy 去掉乐企参数

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

@@ -614,13 +614,10 @@ public class BaseInvoiceController extends AbstractController {
             log.info("手工认证有税号");
         } else {
             gfshList = getGfshList(gfshList,companyCodes);
-
             log.info("手工认证无税号{}",gfshList);
         }
         pramsMap.put("gfsh", gfshList);
 
-
-
         if (!StringUtils.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
                 pramsMap.put("invoiceType", invoiceType);

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

@@ -74,7 +74,7 @@
         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.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status in ('2','3','4')
@@ -377,7 +377,7 @@
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
         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.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.auth_status in ('2','3','4')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'

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

@@ -73,7 +73,7 @@
         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}
-        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.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
@@ -423,7 +423,7 @@
         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}
-        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.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -1202,23 +1202,23 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
         if (invoiceInfo == null) {
             result = "发票信息不可为空";
         }
-        if (invoiceInfo.getInvoiceTypeCode() == null || "".equals(invoiceInfo.getInvoiceTypeCode())) {
+        if (StringUtils.isNotEmpty(invoiceInfo.getInvoiceTypeCode())) {
             result = "发票类型不可为空";
         }
-        if (invoiceInfo.getInvoiceDate() == null || "".equals(invoiceInfo.getInvoiceDate())) {
+        if (StringUtils.isNotEmpty(invoiceInfo.getInvoiceDate().toString())) {
             result = "开票日期不可为空";
         }
         if (!CommonEnum.INV_ZZS_ELE_PP.equals(invoiceInfo.getInvoiceTypeCode()) && !CommonEnum.INV_ZZS_ELE_TXF.equals(invoiceInfo.getInvoiceTypeCode())) {
-            if (invoiceInfo.getIdentityNumber() == null || "".equals(invoiceInfo.getIdentityNumber())) {
+            if (StringUtils.isNotEmpty(invoiceInfo.getIdentityNumber())) {
                 result = "用户证件号不可为空";
             }
-            if (invoiceInfo.getPassenger() == null || "".equals(invoiceInfo.getPassenger())) {
+            if (StringUtils.isNotEmpty(invoiceInfo.getPassenger())) {
                 result = "乘车人不可为空";
             }
-            if (invoiceInfo.getDepartCity() == null || invoiceInfo.getDepartCity().isEmpty()) {
+            if (StringUtils.isNotEmpty(invoiceInfo.getDepartCity())) {
                 result = "出发城市不可为空";
             }
-            if (invoiceInfo.getArriveCity() == null || invoiceInfo.getArriveCity().isEmpty()) {
+            if (StringUtils.isNotEmpty(invoiceInfo.getArriveCity())) {
                 result = "到达城市不可为空";
             }
         }