diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 6d5f8c76..332f1ef5 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -89,7 +89,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} @@ -355,7 +355,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index bbbc7a11..f91319a9 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -97,7 +97,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} @@ -431,7 +431,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java index 666fde9a..3dac74e6 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java +++ b/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 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 pageList = super.baseMapper.queryInsertCustoms(pramsMap); + log.info("pageList=======>{}",pageList); PageInfo pageInfo = new PageInfo<>(pageList); json.put("hasNext", pageInfo.isHasNextPage()); json.put("nextPage", pageInfo.getNextPage()); @@ -174,6 +177,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl{}",json); return json; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsInsertThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsInsertThread.java index a99f709e..a887b2fb 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsInsertThread.java +++ b/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 dataList = (List)pageData.get("datalist"); diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsRecordRzdkController.java b/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsRecordRzdkController.java index cdbbae50..caba22a5 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsRecordRzdkController.java +++ b/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) { diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java b/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java index d7b71804..9b3fa896 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java +++ b/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; diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml index 1056246c..fc3572ca 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml @@ -51,7 +51,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inaccountStatus} @@ -217,7 +217,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inaccountStatus} and p.bzdh = #{queryParams.bzdh} - - - + + and p.inaccount_status = #{queryParams.inAccountStatus} + - - - + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} @@ -385,13 +385,13 @@ and p.bzdh = #{queryParams.bzdh} - - - + + and p.inaccount_status = #{queryParams.inAccountStatus} + - - - + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} @@ -406,13 +406,6 @@ and p.gf_tax_no = #{queryParams.gfsh} - - and p.bzdh = #{bzdh} - - - - - and p.customs_code = #{queryParams.customsCode} @@ -876,7 +869,7 @@ and p.bzdh = #{queryParams.bzdh} - + and p.inaccount_status = #{queryParams.inAccountStatus} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 4c6a9b22..bc51b06c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/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()); diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 551591b5..ae2c9e6b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -76,7 +76,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99')) - - and t.in_account_status = #{inAccountStatus} - + + + and t.sn_voucher_number = #{snVoucherNumber} @@ -335,7 +335,7 @@ and t.bzdh = #{bzdh} - + and t.in_account_status = #{inAccountStatus} @@ -426,9 +426,9 @@ ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99')) - - and t.in_account_status = #{inAccountStatus} - + + + and t.sn_voucher_number = #{snVoucherNumber} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 004a1aa5..a37e7677 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -60,7 +60,7 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus}