diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 3994343d..572eb3bd 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -127,14 +127,14 @@ public class BaseInvoiceController extends AbstractController { String businessCode = (String)map.get("businessCode"); String qsr = (String)map.get("qsr"); String rzhr = (String)map.get("rzhr"); - String inAccountStatus = (String)map.get("inaccountStatus"); + String inAccountStatus = (String)map.get("inAccountStatus"); int curr = (int)map.get("curr"); int size = (int)map.get("size"); String bzdh = (String) map.get("bzdh"); Map pramsMap = new HashMap<>(25); pramsMap.put("bzdh", bzdh); - pramsMap.put("inaccountStatus", inAccountStatus); + pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("qszt", map.get("qszt")); pramsMap.put("wrzfpStart", map.get("wrzfpStart")); pramsMap.put("wrzfpEnd", map.get("wrzfpEnd")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index 8879c776..580ed7c0 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -171,7 +171,7 @@ public class BaseFpRzRespVO implements Serializable { private String rzlx; private String rzhBackMsg; - private String inaccountStatus; + private String inAccountStatus; /** * 付款状态 */ diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index 842bbc68..04f48389 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -137,7 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); + log.info("resultList {}",resultList); json.put("datalist", resultList); } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index f9dd7133..4498312d 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -42,7 +42,7 @@ - + @@ -89,7 +89,7 @@ and t.bzdh = #{bzdh} - and t.inaccount_status = #{inaccountStatus} + and t.inaccount_status = #{inAccountStatus} and t.qs_status = #{qszt} @@ -342,8 +342,8 @@ and t.bzdh = #{bzdh} - - and t.inaccount_status = #{inaccountStatus} + + and t.inaccount_status = #{inAccountStatus} and t.qs_status = #{qszt} diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml index eb0b6636..081ae266 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml @@ -256,7 +256,7 @@ p.check_status as checkStatus, p.dept_name as businessName, p.inaccount_status as inaccountStatus, - p.bzdh + p.bzdh as bzdh FROM t_dx_customs_record p where @@ -277,10 +277,10 @@ and p.gf_tax_no = #{queryParams.gfsh} - + and p.bzdh = #{bzdh} - + and p.inaccount_status = #{inaccountStatus} @@ -369,10 +369,10 @@ and p.gf_tax_no = #{queryParams.gfsh} - + and p.bzdh = #{bzdh} - + and p.inaccount_status = #{inaccountStatus}