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

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

@@ -13,6 +13,7 @@ import com.dxhy.common.controller.AbstractController;
 import com.dxhy.common.util.InvoiceUtil;
 import com.dxhy.common.util.StringHelper;
 import com.dxhy.common.util.UserInfoUtil;
+import com.dxhy.common.utils.DateUtils;
 import com.dxhy.common.utils.R;
 import com.dxhy.common.vo.Tax;
 import lombok.extern.slf4j.Slf4j;
@@ -277,6 +278,35 @@ public class BaseInvoiceController extends AbstractController {
         if (StringUtils.isNotBlank(inAccountStatus)) {
             pramsMap.put("inAccountStatus", inAccountStatus);
         }
+
+        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 ){
+            if(pramsMap.get("accountPeriod").toString().length() > 7) {
+                String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0, 7);
+                pramsMap.put("accountPeriod", accountPeriod);
+            }else{
+                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())));
+        }
+
+        log.info("请求列表的参数为:{}",pramsMap);
+
         try {
             return ResponseEntity.ok(R.ok().put("data", baseRzFpxxService.selectByPramsMap(pramsMap, curr, size)));
         } catch (Exception e) {

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

@@ -180,6 +180,18 @@
         <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeStart != null and postingTimeEnd != null and postingTimeStart != '' and postingTimeEnd != ''">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <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
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"

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

@@ -455,7 +455,7 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
 
         String invoiceType = invoiceUtil.getFplxdm();
 
-        if(dto.getInvoiceCode().length() == 20){
+        if(dto.getInvoiceNo().length() == 20){
             invoiceType = "31";
         }
 

dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

@@ -278,8 +278,13 @@ public class SignFpqsController extends AbstractController {
             }
         }
         String invoiceType = pramsMap.get("invoiceType");
+        String invoiceCode = pramsMap.get("invoiceCode");
+        String invoiceNo = pramsMap.get("invoiceNo");
         if(FplxEnum.QDZZP.getFplxDm().equals(invoiceType) || FplxEnum.QDPP.getFplxDm().equals(invoiceType)){
             pramsMap.put("invoiceType", invoiceType);
+        }else if("99".equals(invoiceType) && invoiceNo.length() == 20){
+            invoiceType = "31";
+            pramsMap.put("invoiceType", invoiceType);
         }else {
             InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode"));
             pramsMap.put("invoiceType", iu.getFplxdm());