mapper文件修改

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

@@ -454,8 +454,14 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("settlementNo", map.get("settlementNo"));
         pramsMap.put("voucherNumber", map.get("voucherNumber"));
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
-        pramsMap.put("postingTime", map.get("postingTime"));
+        pramsMap.put("postingTimeEnd", map.get("postingTimeEnd"));
+        pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
         pramsMap.put("imageId", map.get("imageNumber"));
+        if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
+            String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
         pramsMap.put("accountPeriod", map.get("accountPeriod"));
         String inAccountStatus = (String)map.get("inAccountStatus");
 

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

@@ -161,7 +161,7 @@
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
         <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}
+            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}

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

@@ -74,12 +74,10 @@
         select *
         from t_dx_invoice_reimburse t
         where 1=1
-        <if
-                test="kpksrq != null and kpksrq != '' and kpksrq != 'null' and kpjsrq != null and kpjsrq != '' and kpjsrq != 'null'">
+        <if test="kpksrq != null and kpksrq != '' and kpksrq != 'null' and kpjsrq != null and kpjsrq != '' and kpjsrq != 'null'">
             and t.invoice_date between #{kpksrq} and #{kpjsrq}
         </if>
-        <if
-                test="cjksyf != null and cjksyf != '' and cjksyf != 'null' and cjjsyf != null and cjjsyf != '' and cjjsyf != 'null'">
+        <if  test="cjksyf != null and cjksyf != '' and cjksyf != 'null' and cjjsyf != null and cjjsyf != '' and cjjsyf != 'null'">
             and t.create_date between #{cjksyf} and #{cjjsyf}
         </if>
         <if test="keyWord != null and keyWord != '' and keyWord != 'null' ">
@@ -117,11 +115,14 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
-        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
-            and t.posting_time = #{postingTime}
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
         <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
             and t.image_id = #{imageNumber}
         </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
 </mapper>