添加字段

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

@@ -89,7 +89,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
@@ -355,7 +355,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">

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

@@ -97,7 +97,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
@@ -431,7 +431,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="businessCode==''">

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

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import lombok.Data;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -135,6 +136,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 pramsMap.put("insertFlag", "1");
                 Map<String, Object> data = super.baseMapper.sumTaxAmount(pramsMap);
 
+                log.info("data======>{}", data);
                 number = ObjectUtil.fixNull(data.get("number"));
                 taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("taxAmountSum")));
                 json.put("taxAmountSum", taxAmountSum);
@@ -145,6 +147,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
 
             PageHelper.startPage(curr, size);
             List<CustomsCollectVO> pageList = super.baseMapper.queryInsertCustoms(pramsMap);
+            log.info("pageList=======>{}",pageList);
             PageInfo<CustomsCollectVO> pageInfo = new PageInfo<>(pageList);
             json.put("hasNext", pageInfo.isHasNextPage());
             json.put("nextPage", pageInfo.getNextPage());
@@ -174,6 +177,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
             }
             json.put("datalist", resultList);
         }
+        log.info("json=====>{}",json);
 
         return json;
     }

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

@@ -237,6 +237,7 @@ public class CustomsInsertThread extends BaseThread {
         throws Exception {
         // 查询指定页数的数据
         JSONObject pageData = customsCollectService.queryInsertCustoms(pramsMap, curr, default_size);
+        log.info("pageData=======> {}",pageData);
         boolean hasNext = pageData.getBooleanValue("hasNext");
         List<CustomsCollectVO> dataList = (List<CustomsCollectVO>)pageData.get("datalist");
 

dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsRecordRzdkController.java

@@ -72,6 +72,7 @@ public class CustomsRecordRzdkController extends AbstractController {
     @PostMapping("/querySgByPage")
     public ResponseEntity<?> querySgByPage(Page<?> page, @RequestBody TdxCustomsRecordModelDTO dto) {
         try {
+            log.info("入参===》{}",dto);
             return ResponseEntity
                 .ok(R.ok().put("data", tDxCustomsRecordService.querySgByPage(page, dto, this.getUserInfo())));
         } catch (Exception e) {

dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java

@@ -68,7 +68,7 @@ public class TdxCustomsRecordModelDTO extends CommonDTO {
     private String bzdh;
     private String inAccountStatus;
 
-    private String snVoucharNumber;
+    private String snVoucherNumber;
     private String imageNumber;
     private String accountPeriod;
     private String postingTime;

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

@@ -51,7 +51,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null' and inaccountStatus != '99' ">
             and t.inaccount_status = #{inaccountStatus}
         </if>
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
@@ -217,7 +217,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null' and inaccountStatus != '99' ">
             and t.inaccount_status = #{inaccountStatus}
         </if>
         <if

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

@@ -284,13 +284,13 @@
         <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'">-->
+        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null' and queryParams.inAccountStatus != '99' ">
-<!--            and p.inaccount_status = #{queryParams.inAccountStatus}-->
+            and p.inaccount_status = #{queryParams.inAccountStatus}
-<!--        </if>-->
+        </if>
 
-<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-<!--        </if>-->
+        </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>
@@ -385,13 +385,13 @@
         <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'">-->
+        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null' and queryParams.inAccountStatus != '99' ">
-<!--            and p.inaccount_status = #{queryParams.inAccountStatus}-->
+            and p.inaccount_status = #{queryParams.inAccountStatus}
-<!--        </if>-->
+        </if>
 
-<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-<!--        </if>-->
+        </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>
@@ -406,13 +406,6 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
-        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
-            and p.bzdh = #{bzdh}
-        </if>
-<!--        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">-->
-<!--            and p.inaccount_status = #{inaccountStatus}-->
-<!--        </if>-->
-
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and p.customs_code = #{queryParams.customsCode}
         </if>
@@ -876,7 +869,7 @@
             and p.bzdh = #{queryParams.bzdh}
         </if>
 
-        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
+        <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.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -563,8 +563,6 @@ public class SDNYMainProcessController extends AbstractController {
 
         info.setZSE(snInvoice.getTotalTax());
         info.setZTXBZ(snInvoice.getTollSign());
-        //机打代码
-        info.setZJDDM(snInvoice.getMachineCode());
 //        info.setZSKPH(snInvoice.getMachineCode());
         info.setZGFZH(snInvoice.getPurchaserBank());
         info.setZBZ(snInvoice.getRemarks());

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

@@ -76,7 +76,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
@@ -172,9 +172,9 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>
+<!--        <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>-->
-            and t.in_account_status = #{inAccountStatus}
+<!--            and t.in_account_status = #{inAccountStatus}-->
-        </if>
+<!--        </if>-->
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -335,7 +335,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.in_account_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
@@ -426,9 +426,9 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>
+<!--        <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>-->
-            and t.in_account_status = #{inAccountStatus}
+<!--            and t.in_account_status = #{inAccountStatus}-->
-        </if>
+<!--        </if>-->
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>

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

@@ -60,7 +60,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
@@ -167,7 +167,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if