解決時間格式不一致問題

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -188,11 +188,10 @@ public class ManualAthensThread extends BaseThread {
                     pramsMap.put("cjjsyf", DateUtils.getNight(DateUtils.strToDate(cjjsyf)));
                 }
                 if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) {
-                    pramsMap.put("kpksrq",
+                    pramsMap.put("kpksrq",prams.getString("kpksrq"));
-                            DateUtils.getMorning(DateUtils.strToDate(prams.get("kpksrq").toString())));
                 }
                 if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) {
-                    pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(prams.get("kpjsrq").toString())));
+                    pramsMap.put("kpjsrq",prams.getString("kpjsrq"));
                 }
                 if (prams.get("skssq") != null && !"".equals(prams.get("skssq")) && "1".equals(prams.get("rzzt"))) {
                     pramsMap.put("skssq", prams.get("skssq").toString().replace("-", ""));

dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml

@@ -436,7 +436,13 @@
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus,
         p.bdk_status as bdkStatus,
-        p.dept_name as businessName
+        p.dept_name as businessName,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber
         FROM
         t_dx_customs_record p
         where
@@ -449,6 +455,23 @@
                 #{item,jdbcType=VARCHAR}
             </foreach>
         </if>
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
+            and p.bzdh = #{queryParams.bzdh}
+        </if>
+
+        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null' and queryParams.inAccountStatus != '99'">
+            and p.inaccount_status = #{queryParams.inAccountStatus}
+        </if>
+
+        <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
+            and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
+        </if>
+        <if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
+            and p.image_id = #{queryParams.imageNumber}
+        </if>
+        <if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
+            and p.account_period = #{queryParams.accountPeriod}
+        </if>
 
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}
@@ -466,17 +489,29 @@
             and p.auth_status = #{queryParams.authStatus}
         </if>
 
+        <!--
         <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
+        -->
+        <if test="queryParams.confirmUserList != null and queryParams.confirmUserList.size() > 0">
+            and p.confirm_user in
+            <foreach collection="queryParams.confirmUserList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="queryParams.rzlx!=null and queryParams.rzlx!=''">
             and p.bdk_status = #{queryParams.rzlx}
         </if>
 
-        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno != 3">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
         </if>
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno == 3">
+            and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+        </if>
 
         <if test="queryParams.rzhDateStart!=null and queryParams.rzhDateStart!=''">
             and p.rzh_date &gt;= #{queryParams.rzhDateStart}
@@ -528,15 +563,18 @@
         <if test="queryParams.qsDateEnd!=null and queryParams.qsDateEnd!=''">
             and p.qs_date &lt;= #{queryParams.qsDateEnd}
         </if>
-        <if test="queryParams.businessCode != '99' and queryParams.businessCode != null and queryParams.businessCode != '' and queryParams.businessCode != 'null' ">
+        <if
+                test="queryParams.businessCode != '99' and queryParams.businessCode != null and queryParams.businessCode != '' and queryParams.businessCode != 'null' ">
             and p.dept_id = #{queryParams.businessCode}
         </if>
         <if test="queryParams.businessCode==''">
             and (p.dept_id is null or p.dept_id='' or p.dept_id='99')
         </if>
-        <if test='queryParams.businessCode == "99" and queryParams.business!=null and queryParams.business.size()>0'>
+        <if
+                test='queryParams.businessCode == "99" and queryParams.business!=null and queryParams.business.size()>0'>
             and (p.dept_id in
-            <foreach collection="queryParams.business" index="index" item="item" open="(" separator="," close="">
+            <foreach close="" collection="queryParams.business" index="index" item="item" open="("
+                     separator=",">
                 #{item.businessCode}
             </foreach>
             ) or (p.dept_id is null or p.dept_id='' or p.dept_id='99'))