diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java index 7a685165..56245672 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java @@ -88,13 +88,10 @@ public class BaseTDxTaxCurrentController extends AbstractController { @PostMapping("/qyxxlb") @SysLog("调用企业税务信息查询接口") public ResponseEntity listTaxCurrent(@RequestBody Map map) { - List gfshList = new ArrayList<>(); String gfsh = (String)map.get("gfsh"); if(map.get("gfsh") == null || "".equals(map.get("gfsh")) || "99".equals(map.get("gfsh").toString())){ - - }else{ - gfshList.add(gfsh); + return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS)); } String xydj = (String)map.get("xydj"); @@ -106,7 +103,10 @@ public class BaseTDxTaxCurrentController extends AbstractController { Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("limit", map.get("limit")); - + List gfshList = new ArrayList<>(); + if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { + gfshList.add(gfsh); + } pramsMap.put("gfsh", gfshList); if (!StringHelper.isBlank(xydj)) { if (!"99".equals(xydj)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java index 013c3656..ed5f440f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java @@ -92,7 +92,7 @@ public class AuthenticationCheckListVO implements Serializable { private String postingTime; @ApiModelProperty("影像id") - private String imageId; + private String imageNumber; @ApiModelProperty("账期") private String accountPeriod; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java index 1421d079..770cf3ee 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java @@ -197,6 +197,11 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl fpVo.setAuthenticationPerson(vo.getAuthenticationPerson()); fpVo.setTaxPeriod(vo.getTaxPeriod()); fpVo.setBusinessName(vo.getDeptId()); + if("1".equals(vo.getInaccountStatus())){ + fpVo.setInAccountStatus("已入账"); + }else{ + fpVo.setInAccountStatus("未入账"); + } returnList.add(fpVo); } } diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 96dd736f..836fd386 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -77,6 +77,16 @@ + + + + + + + + + + diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java index b930b63c..e48d1d0c 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java @@ -4,6 +4,7 @@ package com.dxhy.domestic.service.ckzrz.impl; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import javax.annotation.Resource; @@ -546,7 +547,6 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl result = this.baseMapper.queryRzcxByPage(page, dto); if (ResultData.isEmpty(result)) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); for (int i = 0; i < page.getRecords().size(); i++) { Map map = result.getRecords().get(i); @@ -563,9 +563,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl