Merge remote-tracking branch 'origin/release' into release

dxhy-admin/src/main/resources/bootstrap-test.yaml

@@ -4,22 +4,24 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.3.224:8848
+        server-addr: nacos-1.itax.local:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-admin-group
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
-        password: nacos
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-admin
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 10.1.3.224:8848
+        server-addr: 172.31.36.143:33000
-        username: nacos
+        # Nacos config 登录用户名
-        password: nacos
+        username: admin
+        # Nacos config 登录密码
+        password: Invoice.nacos.!1
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

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<String, Object> 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"));

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;
     /**
      * 付款状态
      */

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -137,7 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         }
 
                         pageList.get(i).setId(pageList.get(i).getId());
-                        pageList.get(i).setInaccountStatus(pageList.get(i).getInaccountStatus());
+//                        pageList.get(i).setInAccountStatus(pageList.get(i).getInAccountStatus());
                         pageList.get(i).setBzdh(pageList.get(i).getBzdh());
                         pageList.get(i).setXh(String.valueOf(i + start));
                         pageList.get(i).setTaxAmount(
@@ -182,8 +182,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         // }
                         // }
                         // }
-                        pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
+                        pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
-                            pageList.get(i).getInaccountStatus()));
+                            pageList.get(i).getInAccountStatus()));
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());
                     }
@@ -193,6 +193,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                 json.put("total", pageInfo.getTotal());
 
                 List<BaseFpRzRespVO> resultList = pageInfo.getList();
+                log.info("resultList {}",resultList);
                 json.put("datalist", resultList);
             }
 

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -186,7 +186,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setInvoiceStatus(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus()));
                     vo.setInvoiceType(pageList.get(i).getInvoiceType());
                     //报账单号和入账状态
-                    vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
+//                    vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
                     vo.setBzdh(pageList.get(i).getBzdh());
                     // 签收方式为已经签收时展示签收信息
                     if ("1".equals(pageList.get(i).getQsStatus())) {
@@ -212,7 +212,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
-                    String dkzt= dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
+                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
                     pageList.get(i).setInAccountStatus(dkzt);
                     vo.setInAccountStatus(dkzt);
                     vo.setSelect(true);

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -42,7 +42,7 @@
         <result column="bdk_current_period" property="bdkCurrentPeriod"/>
         <result column="bdk_date" property="bdkDate"/>
         <result column="bzdh" property="bzdh"/>
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="payment_date" property="paymentDate"/>
         <result column="payment_status" property="paymentStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
@@ -89,7 +89,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
@@ -342,8 +342,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}

dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java

@@ -0,0 +1,31 @@
+package com.dxhy.core.dao;
+
+
+import com.dxhy.core.entity.GsClient;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface GsClientMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int deleteAll();
+
+    int insert(GsClient record);
+
+    int insertSelective(GsClient record);
+
+    int insertList(@Param("list") List<GsClient> recordList);
+
+    GsClient selectByPrimaryKey(Integer id);
+
+
+
+    List<GsClient> selectByGsdm(String gsdm);
+
+    int updateByPrimaryKeySelective(GsClient record);
+
+    int updateByPrimaryKey(GsClient record);
+}

dxhy-core/src/main/java/com/dxhy/core/entity/EsOutput.java

@@ -0,0 +1,32 @@
+package com.dxhy.core.entity;
+
+import lombok.Data;
+
+/**
+ * @Description: PO输出参数
+ * @Author liufeilong
+ * @Date 2023-02-06
+ **/
+@Data
+public class EsOutput {
+    /**
+     * 外围系统数据唯一标识
+     */
+    private String BSKEY;
+    /**
+     * SAP数据唯一标识
+     */
+    private String SAPKEY;
+    /**
+     * 数据处理标识(S：成功，E：失败)
+     */
+    private String ZTYPE;
+    /**
+     * 数据处理描述
+     */
+    private String ZMESSAGE;
+    /**
+     * 业务报文
+     */
+    private Object ZDATA;
+}

dxhy-core/src/main/java/com/dxhy/core/entity/GsClient.java

@@ -0,0 +1,19 @@
+package com.dxhy.core.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GsClient {
+    private Integer id;
+
+    private String gsdm;
+
+    private String gsmc;
+
+    private String client;
+
+    private Date createTime;
+
+}

dxhy-core/src/main/java/com/dxhy/core/entity/PoCommonResponseParam.java

@@ -0,0 +1,16 @@
+package com.dxhy.core.entity;
+
+import lombok.Data;
+
+/**
+ * @Description: PO接口公共响应参数
+ * @Author liufeilong
+ * @Date 2023-02-06
+ **/
+@Data
+public class PoCommonResponseParam {
+    /**
+     * ES_OUTPUT
+     */
+    private EsOutput ES_OUTPUT;
+}

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

@@ -5,7 +5,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dxhy.common.util.StringHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,7 @@ import com.github.pagehelper.PageInfo;
  */
 
 @SuppressWarnings("AlibabaMethodTooLong")
+@Slf4j
 @Service
 public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, InvoicePaperEntity>
     implements PoolPaperService {
@@ -179,7 +182,9 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
         try {
             PageHelper.startPage(curr, size);
             List<ExtAddTaxInvoice> pageList = super.baseMapper.listAddTaxInvoice(pramsMap);
+            log.info("pageList={}",pageList.size());
             PageInfo<ExtAddTaxInvoice> pageInfo = new PageInfo<>(pageList);
+            log.info("pageInfo={}",pageInfo);
             json.put("hasNext", pageInfo.isHasNextPage());
             json.put("nextPage", pageInfo.getNextPage());
             List<String[]> returnList = new ArrayList<>();

dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java

@@ -0,0 +1,136 @@
+package com.dxhy.core.task;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.dxhy.common.constant.DbConstant;
+import com.dxhy.common.controller.AbstractController;
+import com.dxhy.common.datasource.config.DynamicContextHolder;
+import com.dxhy.core.dao.ConfirmDao;
+import com.dxhy.core.dao.GsClientMapper;
+import com.dxhy.core.entity.EsOutput;
+import com.dxhy.core.entity.GsClient;
+import com.dxhy.core.entity.PoCommonResponseParam;
+import com.dxhy.core.job.entity.SNSAPObject;
+import com.dxhy.core.job.entity.ScheduleJobEntity;
+import com.dxhy.core.job.service.InvoiceInterfaceService;
+import com.dxhy.core.job.service.ScheduleJobService;
+import com.dxhy.core.util.HttpUtils;
+import com.dxhy.core.util.JsonUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @author fth
+ * @date 2018年04月13日 下午10:57:22
+ */
+@SuppressWarnings({"rawtypes", "DuplicatedCode"})
+@Component("sdnyClientTask")
+@Slf4j
+public class SdnyClientTask extends AbstractController {
+
+    private static final String LOGGER_MSG = "(SAP获取公司client)";
+
+    @Value("${sdny.snYxUrl}")
+    private String snYxUrl;
+
+    @Value("${po.userName}")
+    private String userName;
+
+    @Value("${po.password}")
+    private String password;
+
+    @Resource
+    private GsClientMapper gsClientMapper;
+
+    @Resource
+    private InvoiceInterfaceService invoiceInterfaceService;
+    @Resource
+    private ConfirmDao confirmDao;
+    @Resource
+    private ScheduleJobService scheduleJobService;
+
+    /**
+     * 核心线程池大小
+     */
+    private int corePoolSize = 10;
+    /**
+     * 最大线程池大小
+     */
+
+    private int maximumPoolSize = 20;
+
+    /**
+     * @throws InterruptedException 异常
+     * @Desc 发票获取接口
+     */
+
+    public void getSdnyClient() throws InterruptedException {
+        log.info("获取山东能源Client定时任务开始");
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
+        ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("sdnyClientTask", "getSdnyClient");
+        if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) {
+            try {
+                scheduleJobEntity.setJobStatus("1");
+                DynamicContextHolder.push(DbConstant.BASICS_WRITE);
+                scheduleJobService.updateById(scheduleJobEntity);
+                // 准备请求参数
+                // 需判断 设置不认证状态
+
+                List<GsClient> list = new ArrayList<>();
+                long startTime = System.currentTimeMillis();
+                SNSAPObject object = new SNSAPObject();
+                object.setSYSID("FPXT");
+                object.setIFYWID("FI846");
+                object.setBSKEY(UUID.randomUUID().toString().replace("-", ""));
+                object.setZFILED5("200");
+                object.setZDATA("");
+
+                //推送到SAP
+                log.info("推送山能数据:{}", JSONObject.toJSONString(object));
+                JSONObject request = new JSONObject();
+                request.put("IS_INPUT", object);
+
+                log.info("{}获取公司client入参:{}", LOGGER_MSG, request.toJSONString());
+                String result = HttpUtils.sendPo(snYxUrl, request.toJSONString(), userName, password);
+                log.info("{}获取公司client出参:{}", LOGGER_MSG, result);
+                PoCommonResponseParam poCommonResponseParam = JsonUtils.getInstance().parseObject(result, PoCommonResponseParam.class);
+                EsOutput es_output = poCommonResponseParam.getES_OUTPUT();
+                String ztype = es_output.getZTYPE();
+                String zmessage = es_output.getZMESSAGE();
+                Object zdata = es_output.getZDATA();
+                if ("s".equals(ztype)) {
+                    List<Map<String, String>> gsClientList = JsonUtils.getInstance().parseObject(zdata.toString(), List.class);
+                    gsClientList.stream().forEach(f -> {
+                        GsClient gsClient = new GsClient();
+                        gsClient.setGsdm(ObjectUtil.isNull(f.get("BUKRS")) ? "" : f.get("BUKRS").toString());
+                        gsClient.setGsmc(ObjectUtil.isNull(f.get("BUTXT")) ? "" : f.get("BUTXT").toString());
+                        gsClient.setClient(ObjectUtil.isNull(f.get("MANDT")) ? "" : f.get("MANDT").toString());
+                        gsClient.setCreateTime(new Date());
+                        list.add(gsClient);
+                    });
+                } else {
+                    log.error("{}client:{},获取公司client出错:{}", LOGGER_MSG, "200", zmessage);
+                }
+                log.info("{}删除gs_client表数据", LOGGER_MSG);
+                gsClientMapper.deleteAll();
+                log.info("{}插入gs_client表", LOGGER_MSG);
+                gsClientMapper.insertList(list);
+                long endTime = System.currentTimeMillis();
+                log.debug("{}任务结束，耗时:{}", LOGGER_MSG, endTime - startTime);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                log.info("获取山东能源Client定时任务--重置执行状态");
+                scheduleJobEntity.setJobStatus("0");
+                DynamicContextHolder.push(DbConstant.BASICS_WRITE);
+                scheduleJobService.updateById(scheduleJobEntity);
+            }
+        }
+    }
+
+}

dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java

@@ -197,6 +197,7 @@ public class PoolAddTaxThread extends BaseThread {
                 pramsMap.put("inAccountStatus", inAccountStatus);
                 pramsMap.put("company", company);
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
+                log.info("传入的参数为:{}",pramsMap);
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();
                 ftpFileName.append(fileNamePrefix);
@@ -224,6 +225,7 @@ public class PoolAddTaxThread extends BaseThread {
                 StringBuilder excelFile = new StringBuilder();
                 excelFile.append(fileService.getLocalPathDefault());
                 excelFile.append(ftpFileName.toString());
+                log.info("导出的文件名字为:{}",excelFile.toString());
                 File filePath = new File(getFilePath(excelFile.toString()));
                 if (!filePath.exists()) {
                     filePath.mkdirs();
@@ -245,7 +247,7 @@ public class PoolAddTaxThread extends BaseThread {
                 // 递归导出数据到excel 发票信息
                 this.cicleExport(pramsMap, default_curr, excelFile.toString(), out, writer);
 
-                this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer);
+//                this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer);
 //                writer.finish();
                 // FTP文件存储路径
                 String[] toDay = DateUtil.today().split("-");
@@ -386,8 +388,9 @@ public class PoolAddTaxThread extends BaseThread {
                 String titleColumn = datas[var12];
                 titles.add(Collections.singletonList(titleColumn));
             }
-
+            log.info("导出文件的标头为:{}",titles);
             writeTable.setHead(titles);
+
             List<List<String>> list = new ArrayList<>();
 
             for (String[] strings : dataList) {

dxhy-core/src/main/java/com/dxhy/core/util/HttpUtils.java

@@ -0,0 +1,88 @@
+package com.dxhy.core.util;
+
+import cn.hutool.http.HttpRequest;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author ZSC-DXHY
+ */
+@Slf4j
+public class HttpUtils {
+
+    private static final String LOGGER_MSG = "(请求http访问)";
+
+    /**
+     * 执行post请求
+     *
+     * @param url
+     * @param paramMap
+     * @return
+     * @throws IOException
+     */
+    public static String doPost(String url, Map<String, ?> paramMap) {
+        Map<String, Object> requestMap = new HashMap<>(paramMap);
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.post(url).form(requestMap).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}以Map调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    public static String doPost(String url, String request) {
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.post(url).body(request).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    public static String doPostWithHeader(String url, String data, Map<String, String> header) {
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.post(url).addHeaders(header).body(data).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}带head调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    public static String doPostFormWithHeader(String url, Map<String, ?> paramMap, Map<String, String> header) {
+        Map<String, Object> requestMap = new HashMap<>(paramMap);
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.post(url).addHeaders(header).form(requestMap).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}带head和form调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    public static String doGetWithHeader(String url, Map<String, String> header) {
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.get(url).addHeaders(header).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}带head调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    public static String doGet(String url, String request) {
+        long startTime = System.currentTimeMillis();
+        String body = HttpRequest.get(url).body(request).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}以字符串调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+    //请求山能PO
+    public static String sendPo(String url, String request,String userName,String password) {
+        long startTime = System.currentTimeMillis();
+        HttpRequest httpRequest = new HttpRequest(url);
+        httpRequest.basicAuth(userName,password);
+        String body = httpRequest.body(request).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
+
+}
+

dxhy-core/src/main/java/com/dxhy/core/util/JsonUtils.java

@@ -0,0 +1,90 @@
+package com.dxhy.core.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer;
+import com.alibaba.fastjson.util.TypeUtils;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: chendognzhi
+ * @Date: 2017年10月17日
+ * @Description: json转换工具
+ */
+public class JsonUtils {
+    private JsonUtils() {
+    }
+
+    private static final SerializeConfig SERIALIZE_CONFIG = new SerializeConfig();
+
+    static {
+        SERIALIZE_CONFIG.put(Date.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss"));
+        SERIALIZE_CONFIG.put(Timestamp.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss"));
+        /**
+         * 设置json格式化第一个字母大写
+         */
+        TypeUtils.compatibleWithJavaBean = true;
+    }
+
+    private static final JsonUtils HELPER = new JsonUtils();
+
+    public static JsonUtils getInstance() {
+        return HELPER;
+    }
+
+    /**
+     * parseObject(json转换为java bean)
+     */
+    public <T> T parseObject(String text, Class<T> clazz) {
+        return JSON.parseObject(text, clazz);
+    }
+
+    /**
+     * toJsonString(对象转换为json字符串)
+     */
+    public <T> String toJsonString(T obj) {
+        return toJsonString(obj, SERIALIZE_CONFIG);
+    }
+
+    /**
+     * toJsonString(对象转换为自定义格式的json字符串)
+     */
+    public <T> String toJsonString(T obj, SerializeConfig serializeConfig) {
+        return JSON.toJSONString(obj, serializeConfig, SerializerFeature.DisableCircularReferenceDetect);
+    }
+
+    /**
+     * 把json串转为指定的对象
+     */
+    public <T> T fromJson(String str, Class<T> clazz) {
+        return JSON.parseObject(str, clazz);
+    }
+
+    /**
+     * 把对象转换 为json字符串 null的字符串转换为""
+     */
+
+    public <T> String toJsonStringNullToEmpty(T obj) {
+        return JSON.toJSONString(obj, SerializerFeature.WriteNullStringAsEmpty);
+    }
+
+    /**
+     * json字符串转list
+     */
+    public <T> List<T> jsonToList(String text, Class<T> clazz) {
+
+        return JSON.parseArray(text, clazz);
+    }
+
+    /**
+     * json字符串转list
+     */
+    public <T> List<T> listBeanCopy(Object text, Class<T> clazz) {
+        return JSON.parseArray(JSON.toJSONString(text), clazz);
+    }
+
+}

dxhy-core/src/main/resources/bootstrap-test.yaml

@@ -4,22 +4,24 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.3.224:8848
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-core-group
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
-        password: nacos
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-core
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 10.1.3.224:8848
+        server-addr: 172.31.36.147:33000
-        username: nacos
+        # Nacos config 登录用户名
-        password: nacos
+        username: admin
+        # Nacos config 登录密码
+        password: Invoice.nacos.!1
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

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

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dxhy.core.dao.GsClientMapper" >
+  <resultMap id="BaseResultMap" type="com.dxhy.core.entity.GsClient" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="gsdm" property="gsdm" jdbcType="VARCHAR" />
+    <result column="gsmc" property="gsmc" jdbcType="VARCHAR" />
+    <result column="client" property="client" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, gsdm, gsmc, client, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from gs_client
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByGsdm" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from gs_client
+    where gsdm = #{gsdm,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from gs_client
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteAll" >
+    delete from gs_client
+  </delete>
+  <insert id="insert" parameterType="com.dxhy.core.entity.GsClient" >
+    insert into gs_client (id, gsdm, gsmc, 
+      client, create_time)
+    values (#{id,jdbcType=INTEGER}, #{gsdm,jdbcType=VARCHAR}, #{gsmc,jdbcType=VARCHAR}, 
+      #{client,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.dxhy.core.entity.GsClient" >
+    insert into gs_client
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="gsdm != null" >
+        gsdm,
+      </if>
+      <if test="gsmc != null" >
+        gsmc,
+      </if>
+      <if test="client != null" >
+        client,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="gsdm != null" >
+        #{gsdm,jdbcType=VARCHAR},
+      </if>
+      <if test="gsmc != null" >
+        #{gsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="client != null" >
+        #{client,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dxhy.core.entity.GsClient" >
+    update gs_client
+    <set >
+      <if test="gsdm != null" >
+        gsdm = #{gsdm,jdbcType=VARCHAR},
+      </if>
+      <if test="gsmc != null" >
+        gsmc = #{gsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="client != null" >
+        client = #{client,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dxhy.core.entity.GsClient" >
+    update gs_client
+    set gsdm = #{gsdm,jdbcType=VARCHAR},
+      gsmc = #{gsmc,jdbcType=VARCHAR},
+      client = #{client,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="false">
+      insert into gs_client (gsdm,gsmc,client,create_time)
+      values
+      <foreach collection="list" item="item" index="index"
+               separator=",">
+        (#{item.gsdm,jdbcType=VARCHAR}, #{item.gsmc,jdbcType=VARCHAR},
+        #{item.client,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP})
+      </foreach>
+  </insert>
+</mapper>

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -116,6 +116,8 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                         AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getYxTaxAmount())));
 
                     // 字典值转换
+                    String inaccountStatus = pageList.get(i).getInaccountStatus();
+                    pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
                     String auditStatus = pageList.get(i).getAuditStatus();
                     pageList.get(i)
                         .setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, auditStatus));

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java

@@ -126,6 +126,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     map.put("qsStatus", dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
                     String qsType = (String)map.get("qsType");
                     map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
+                    map.put("inaccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,(String)map.get("inaccountStatus")));
 
                     if (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
@@ -1212,6 +1213,9 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     // 不抵扣状态
                     map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                     map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
+                    //入账状态
+                    String inaccountStatus = (String) map.get("inaccountStatus");
+                    map.put("inaccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
                     if (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
                     }

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}
         </if>
 
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
             and p.inaccount_status = #{inaccountStatus}
         </if>
 
@@ -369,10 +369,10 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
             and p.inaccount_status = #{inaccountStatus}
         </if>
 

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -14,6 +14,7 @@ import com.dxhy.common.util.InvoiceUtil;
 import com.dxhy.common.util.UserInfoUtil;
 import com.dxhy.common.utils.R;
 import com.dxhy.erp.dao.CustomsRecordDao;
+import com.dxhy.erp.dao.GsClientMapper;
 import com.dxhy.erp.dao.RecordInvoiceDao;
 import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao;
 import com.dxhy.erp.entity.*;
@@ -52,6 +53,9 @@ public class SDNYMainProcessController extends AbstractController {
     @Value("${sdny.environment}")
     private String environment;
 
+    @Resource
+    private GsClientMapper gsClientMapper;
+
     @Resource
     private InvoiceQueryService invoiceQueryService;
 
@@ -375,6 +379,7 @@ public class SDNYMainProcessController extends AbstractController {
         String dbName = "business";
         String company = "BIGB";
         String taxNo = "9111112222333344DD";
+        String orgCode = "1010";
 
 //        // 入参统一在入口处理
 //        String userid = getLoginName();
@@ -409,7 +414,12 @@ public class SDNYMainProcessController extends AbstractController {
             object.setZFILED2("");
             object.setZFILED3("");
             object.setZFILED4("");
-            object.setZFILED5(environment);
+            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
+            if(gsClients != null && gsClients.size() > 0) {
+                object.setZFILED5(gsClients.get(0).getClient());
+            }else{
+                object.setZFILED5(environment);
+            }
             List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
             if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
                 for (SNInvoice invoice : invoiceInfoList) {
@@ -528,6 +538,8 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZDJZH(snInvoice.getCertificateNo());
         info.setZGFMC(snInvoice.getPurchaserName());
         info.setSORT(snInvoice.getSort());
+        //机打代码
+        info.setZJDDM(snInvoice.getMachineCode());
         if (snInvoice.getTotalAmount() != null) {
             BigDecimal total = new BigDecimal(snInvoice.getTotalAmount());
 //            BigDecimal tax = new BigDecimal(snInvoice.getTotalTax());

dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java

@@ -0,0 +1,29 @@
+package com.dxhy.erp.dao;
+
+
+import com.dxhy.erp.entity.GsClient;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface GsClientMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int deleteAll();
+
+    int insert(GsClient record);
+
+    int insertSelective(GsClient record);
+
+    int insertList(@Param("list") List<GsClient> recordList);
+
+    GsClient selectByPrimaryKey(Integer id);
+
+    List<GsClient> selectByGsdm(String gsdm);
+
+    int updateByPrimaryKeySelective(GsClient record);
+
+    int updateByPrimaryKey(GsClient record);
+}

dxhy-erp/src/main/java/com/dxhy/erp/entity/GsClient.java

@@ -0,0 +1,19 @@
+package com.dxhy.erp.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GsClient {
+    private Integer id;
+
+    private String gsdm;
+
+    private String gsmc;
+
+    private String client;
+
+    private Date createTime;
+
+}

dxhy-erp/src/main/resources/bootstrap-test.yaml

@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.3.224:8848
+        server-addr: nacos-1.itax.local:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
@@ -12,7 +12,7 @@ spring:
         # Nacos config 登录用户名
         username: nacos
         # Nacos config 登录密码
-        password: nacos
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-erp
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}

dxhy-erp/src/main/resources/mapper/GsClientMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dxhy.erp.dao.GsClientMapper" >
+  <resultMap id="BaseResultMap" type="com.dxhy.erp.entity.GsClient" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="gsdm" property="gsdm" jdbcType="VARCHAR" />
+    <result column="gsmc" property="gsmc" jdbcType="VARCHAR" />
+    <result column="client" property="client" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, gsdm, gsmc, client, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from gs_client
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByGsdm" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from gs_client
+    where gsdm = #{gsdm,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from gs_client
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteAll" >
+    delete from gs_client
+  </delete>
+  <insert id="insert" parameterType="com.dxhy.erp.entity.GsClient" >
+    insert into gs_client (id, gsdm, gsmc, 
+      client, create_time)
+    values (#{id,jdbcType=INTEGER}, #{gsdm,jdbcType=VARCHAR}, #{gsmc,jdbcType=VARCHAR}, 
+      #{client,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.dxhy.erp.entity.GsClient" >
+    insert into gs_client
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="gsdm != null" >
+        gsdm,
+      </if>
+      <if test="gsmc != null" >
+        gsmc,
+      </if>
+      <if test="client != null" >
+        client,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="gsdm != null" >
+        #{gsdm,jdbcType=VARCHAR},
+      </if>
+      <if test="gsmc != null" >
+        #{gsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="client != null" >
+        #{client,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dxhy.erp.entity.GsClient" >
+    update gs_client
+    <set >
+      <if test="gsdm != null" >
+        gsdm = #{gsdm,jdbcType=VARCHAR},
+      </if>
+      <if test="gsmc != null" >
+        gsmc = #{gsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="client != null" >
+        client = #{client,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dxhy.erp.entity.GsClient" >
+    update gs_client
+    set gsdm = #{gsdm,jdbcType=VARCHAR},
+      gsmc = #{gsmc,jdbcType=VARCHAR},
+      client = #{client,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="false">
+      insert into gs_client (gsdm,gsmc,client,create_time)
+      values
+      <foreach collection="list" item="item" index="index"
+               separator=",">
+        (#{item.gsdm,jdbcType=VARCHAR}, #{item.gsmc,jdbcType=VARCHAR},
+        #{item.client,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP})
+      </foreach>
+  </insert>
+</mapper>

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java

@@ -152,7 +152,7 @@ public class ExtBbfpzhcxRespVO implements Serializable {
      */
     private String exportMark;
     private String scanId;
-    private String inaccountStatus;
+    private String inAccountStatus;
 
     /**
      * 结算单号

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java

@@ -122,9 +122,9 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                     resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsfs));
                     String bdkStatus = resultList.get(i).getBdkStatus();
                     resultList.get(i).setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
-                    String inAccountStatus = resultList.get(i).getInaccountStatus();
+                    String inAccountStatus = resultList.get(i).getInAccountStatus();
                     resultList.get(i)
-                        .setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS, inAccountStatus));
+                        .setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, inAccountStatus));
                 }
             }
 

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java

@@ -78,6 +78,7 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
 
             PageHelper.startPage(curr, size);
             List<ExtBbycfpcxRespVO> pageList = super.baseMapper.selectByPramsMap(pramsMap);
+            log.info("数据库查询结果pageList {}",pageList);
             PageInfo<ExtBbycfpcxRespVO> pageInfo = new PageInfo<>(pageList);
             // 用于页面返回list对象
             if (pageList.size() > 0) {
@@ -104,6 +105,8 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
                     pageList.get(i).setRzzt(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzzt));
                     String rzlx = pageList.get(i).getRzlx();
                     pageList.get(i).setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, rzlx));
+                    String inAccountStatus = pageList.get(i).getInaccountStatus();
+                    pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
 
                     // if (rzlxModels!=null){
                     // for (DictdetaModel model : rzlxModels){

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java

@@ -312,7 +312,7 @@ public class ViolationLogServiceImpl extends MpBaseServiceImpl<ViolationLogDao,
                     if (accountModels != null) {
                         for (DictdetaModel model : accountModels) {
                             if (model.getDictcode().equals(record.getInAccountStatus())) {
-                                vo.setInaccountStatus(model.getDictname());
+                                vo.setInAccountStatus(model.getDictname());
                             }
                         }
                     }

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -7,7 +7,7 @@
                type="com.dxhy.extend.model.ExtBbfpzhcxRespVO">
         <result column="invoice_code" property="invoiceCode"/>
         <result column="bzdh" property="bzdh"/>
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="invoice_no" property="invoiceNo"/>
         <result column="kprq" property="invoiceDate"/>
         <result column="invoice_type" property="invoiceType"/>
@@ -35,7 +35,7 @@
         <result column="bdk_status" property="bdkStatus"/>
         <result column="export_mark" property="exportMark"/>
         <result column="scan_id" property="scanId"/>
-        <result column="in_account_status" property="inAccountStatus"/>
+<!--        <result column="in_account_status" property="inAccountStatus"/>-->
         <result column="settle_source" property="settleSource"/>
         <result column="settlement_no" property="settlementNo"/>
         <result column="settlement_status" property="settlementStatus"/>
@@ -76,8 +76,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
@@ -335,8 +335,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and t.in_account_status = #{inaccountStatus}
+            and t.in_account_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}

dxhy-gateway/src/main/resources/bootstrap-test.yaml

@@ -4,22 +4,24 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.3.224:8848
+        server-addr: nacos-1.itax.local:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-gateway-group
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
-        password: nacos
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-gateway
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 10.1.3.224:8848
+        server-addr: 172.31.36.143:33000
-        username: nacos
+        # Nacos config 登录用户名
-        password: nacos
+        username: admin
+        # Nacos config 登录密码
+        password: Invoice.nacos.!1
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

dxhy-operation-flow/src/main/resources/bootstrap-test.yaml

@@ -4,22 +4,24 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.2.202:8848
+        server-addr: nacos-1.itax.local:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-flow-group
         # Nacos config 登录用户名
-        username: dxhy-jxpt
+        username: admin
         # Nacos config 登录密码
-        password: dxhy-jxpt
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-flow
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 10.1.2.202:8848
+        server-addr: 172.31.36.143:33000
-        username: dxhy-jxpt
+        # Nacos config 登录用户名
-        password: dxhy-jxpt
+        username: admin
+        # Nacos config 登录密码
+        password: Invoice.nacos.!1
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java

@@ -275,7 +275,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
 
         // 1、基础信息校验
         String note = signRulesUtils.validateInvoiceInfo(pramsMap.get("invoiceCode"), pramsMap.get("invoiceNo"));
-        log.info("note======> {}0",note);
+        log.info("note======> {}",note);
         if(pramsMap.get("eleInvoiceNo") != null){
             note = null;
         }

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

@@ -1503,6 +1503,8 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                 eleInvoiceNo = invoiceNo;
                 invoiceCode = invoiceNo.substring(0,12);
                 invoiceNo = invoiceNo.substring(12,20);
+                log.info("invoiceCode=====> {}",invoiceCode);
+                log.info("invoiceNo=====> {}",invoiceNo);
 
             }