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

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -422,12 +422,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
         String invoiceDate = dto.getInvoiceDate();
         String taxAmount = dto.getTaxAmount();
 
-        if (StringUtils.isEmpty(invoiceCode)) {
-            return "发票代码格式错误";
-        }
-        if (invoiceCode.length() != 10 && invoiceCode.length() != 12) {
-            return "发票代码格式错误";
-        }
+//        if (StringUtils.isEmpty(invoiceCode)) {
+//            return "发票代码格式错误";
+//        }
+//        if (invoiceCode.length() != 10 && invoiceCode.length() != 12) {
+//            return "发票代码格式错误";
+//        }
         if (StringUtils.isBlank(invoiceNo) && invoiceNo.length() != 8) {
             return "发票号码格式错误";
         }

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java

@@ -147,6 +147,27 @@ public class ExtFpzhcxController extends AbstractController {
             pramsMap.put("rzjsrq", "");
         }
 
+        if(pramsMap.get("imageNumber") != null){
+            pramsMap.put("imageId",pramsMap.get("imageNumber"));
+        }
+
+        if(pramsMap.get("snVoucherNumber") != null){
+            pramsMap.put("snVoucherNumber",pramsMap.get("snVoucherNumber"));
+        }
+
+        if(pramsMap.get("accountPeriod") != null){
+            pramsMap.put("accountPeriod",pramsMap.get("accountPeriod"));
+        }
+
+        if (pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))) {
+            pramsMap.put("postingTimeStart",
+                    DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeStart").toString())));
+        }
+        if (pramsMap.get("postingTimeEnd") != null && !"".equals(pramsMap.get("postingTimeEnd"))) {
+            pramsMap.put("postingTimeEnd",
+                    DateUtils.getNight(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString())));
+        }
+
         if (pramsMap.get("qsksrq") != null && !"".equals(pramsMap.get("qsksrq")) && "1".equals(pramsMap.get("qszt"))) {
             pramsMap.put("qsksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("qsksrq").toString())));
         } else {