diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java index 337a3f0e..e49b7477 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java @@ -51,6 +51,10 @@ public class TdxExportCustomsModelDTO extends CommonDTO { private String entryDiscrepancy; private String bzdh; private String inAccountStatus; + private String snVoucherNumber; + private String imageNumber; + private String postingTime; + private String accountStatus; public void setParam(Page page, UserInfo userInfo) throws Exception { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index 6ab31378..6b149d35 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -266,6 +266,20 @@ public class ExtFpzhcxController extends AbstractController { data.put("company", pramsMap.get("company")); data.put("menuId", pramsMap.get("menuId")); data.put("imageNumber",pramsMap.get("imageNumber")); + data.put("snVoucherNumber",pramsMap.get("snVoucherNumber")); + if(pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))){ + data.put("postingTimeStart",DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeStart").toString()))); + } + if(pramsMap.get("postingTimeEnd") != null && !"".equals(pramsMap.get("postingTimeEnd"))){ + data.put("postingTimeEnd",DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString()))); + } + + if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) { + String accountPeriod = (String) pramsMap.get("accountPeriod"); + accountPeriod = accountPeriod.substring(0,7); + data.put("accountPeriod",accountPeriod); + log.info("accountPeriod:{}",accountPeriod); + } try { return ResponseEntity.ok(R.ok().put("data", ycfpcxService.selectByPramsMap(data, curr, size))); } catch (Exception e) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java index 0945c30f..4491d1a0 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java @@ -108,8 +108,12 @@ public class ExtBbycfpcxRespVO implements Serializable { private String skssq; private String businessName; - private String inaccountStatus; + private String inAccountStatus; private String bzdh; + private String snVoucherNumber; + private String imageNumber; + private String accountPeriod; + private String postingTime; public ExtBbycfpcxRespVO() {} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java index 7a119c3e..6bbb932e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java @@ -105,8 +105,8 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl - + @@ -60,8 +60,8 @@ and t.bzdh = #{bzdh} - - and t.inaccount_status = #{inaccountStatus} + + and t.inaccount_status = #{inAccountStatus} @@ -167,8 +167,8 @@ and t.bzdh = #{bzdh} - - and t.inaccount_status = #{inaccountStatus} + + and t.inaccount_status = #{inAccountStatus}