test代码补齐

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java

@@ -60,6 +60,11 @@ public class QssbServiceImpl extends MpBaseServiceImpl<QssbDao, QssbRespVO> impl
                 resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
 
                 //字典值转换
+                if ("1".equals(resultList.get(i).getInaccountStatus())){
+                    resultList.get(i).setInaccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInaccountStatus("未入账");
+                }
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,resultList.get(i).getQsfs()));
                 resultList.get(i).setInvoiceType(dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT,resultList.get(i).getInvoiceType()));
 

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java

@@ -68,6 +68,11 @@ public class QstjbServiceImpl extends MpBaseServiceImpl<QstjbDao, QstjbRespVO> i
                 if (resultList.get(i).getSe() != null && !"".equals(resultList.get(i).getSe())) {
                     resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
                 }
+                if ("1".equals(resultList.get(i).getInaccountStatus())){
+                    resultList.get(i).setInaccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInaccountStatus("未入账");
+                }
             }
         }
 

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

@@ -114,17 +114,20 @@ public class RzjgqdPdfExportThread extends BaseThread {
                 String company = prams.getString("company");
                 String gfmc = prams.getString("gfmc");
                 String dklx = prams.getString("dklx");
+                String companyCode = prams.getString("companyCode");
                 // 参数转换为需要的形式
                 Map<String, Object> pramsMap = new HashMap<>(16);
                 pramsMap.put("dbName", dbName);
                 pramsMap.put("userid", userid);
-                List<String> gfshList = new ArrayList<>();
-                if (!StringHelper.isBlank(gfsh)) {
-                    gfshList = StringHelper.stringToList(gfsh);
-                    pramsMap.put("gfsh", gfshList);
-                } else {
-                    pramsMap.put("gfsh", gfshList);
-                }
+//                List<String> gfshList = new ArrayList<>();
+//                if (!StringHelper.isBlank(gfsh)) {
+//                    gfshList = StringHelper.stringToList(gfsh);
+//                    pramsMap.put("gfsh", gfshList);
+//                } else {
+//                    pramsMap.put("gfsh", gfshList);
+//                }
+                pramsMap.put("gfsh", gfsh);
+                pramsMap.put("companyCode",companyCode);
                 pramsMap.put("skssq", skssq);
                 pramsMap.put("company", company);
                 pramsMap.put("gfmc", gfmc);

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

@@ -33,7 +33,7 @@
         <result column="account_period" property="accountPeriod"/>
         <result column="bzdh" property="bzdh"/>
         <result column="bzr" property="bzr"/>
-        <result column="comp_code" property="comp_code"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectByPramsMap" parameterType="java.util.Map"

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

@@ -20,6 +20,14 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
+        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectQssbBySmb" parameterType="java.util.Map"

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

@@ -20,6 +20,14 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
+        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectQstjbByCxtj" parameterType="java.util.Map"

dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml

@@ -222,9 +222,12 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status != '1' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if
                 test="fillInStartDate != null and fillInEndDate != null and fillInStartDate != '' and fillInEndDate != ''">
             and t.fill_in_date between #{fillInStartDate} and #{fillInEndDate}