ariesy 进项bug修改

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<String, Object> map) {
-        List<String> gfshList = new ArrayList<>();
         String gfsh = (String)map.get("gfsh");
 
         if(map.get("gfsh") == null || "".equals(map.get("gfsh")) || "99".equals(map.get("gfsh").toString())){
-
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
-        }else{
-            gfshList.add(gfsh);
         }
 
         String xydj = (String)map.get("xydj");
@@ -106,7 +103,10 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         Map<String, Object> pramsMap = new HashMap<>(16);
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("limit", map.get("limit"));
-
+        List<String> 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)) {

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;

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

@@ -197,6 +197,11 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         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);
                     }
                 }

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -77,6 +77,16 @@
         <result column="gx_user_name" jdbcType="VARCHAR" property="authenticationPerson"/>
         <result column="rzh_belong_date" jdbcType="VARCHAR" property="taxPeriod"/>
         <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
+        <result column="comp_code" jdbcType="VARCHAR" property="deptId"/>
+        <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
+        <result column="sn_voucher_number" jdbcType="VARCHAR" property="snVoucherNumber"/>
+        <result column="account_period" jdbcType="VARCHAR" property="accountPeriod"/>
+        <result column="posting_time" jdbcType="VARCHAR" property="postingTime"/>
+        <result column="inaccount_status" jdbcType="VARCHAR" property="inaccountStatus"/>
+        <result column="image_id" jdbcType="VARCHAR" property="imageNumber"/>
+        <result column="comp_code" jdbcType="VARCHAR" property="compCode"/>
+        <result column="bzdh" jdbcType="VARCHAR" property="bzdh"/>
+        <result column="bzr" jdbcType="VARCHAR" property="bzr"/>
     </resultMap>
 
     <sql id="Authentication_Check_Column_List">

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<DomesticExpo
 
         Page<Map> 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<String, Object> map = result.getRecords().get(i);
 
@@ -563,9 +563,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("rzhDate", map.get("rzhDate"));
                 }
                 if (map.get("postingTme") != null) {
-                    LocalDateTime dateTime = LocalDateTime.parse(map.get("postingTme").toString());
+                    DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                    log.info("postingTme={}",dateTime);
+                    LocalDateTime ldt = LocalDateTime.parse(map.get("postingTme").toString());
-                    map.put("postingTme", dateTime);
+                    String postingTme = ldt.format(dtf);
+                    log.info("postingTme={}",postingTme);
+                    map.put("postingTme", postingTme);
                 }
 
                 // 字典值转换