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

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

@@ -162,6 +162,11 @@ public class ExtInvoicePoolController extends AbstractController {
         if (pramsMap.get("qsyf") == null && "".equals(pramsMap.get("qsyf")) && !"1".equals(pramsMap.get("qszt"))) {
             pramsMap.put("qsyf", "");
         }
+        if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) {
+            String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
         int curr = (int)pramsMap.get("curr");
         int size = (int)pramsMap.get("size");
         try {

dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@@ -345,8 +345,7 @@
 <!--        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">-->
 <!--            and t.posting_time = #{postingTime}-->
 <!--        </if>-->
-        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'
-        postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
             and posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
 <!--        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">-->