From a12175374a05d2d97087435f62de0a8b995fe6f1 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 24 Apr 2023 08:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java  |  4 ++--
 .../com/dxhy/base/entity/BaseTDxRecordInvoice.java   |  2 +-
 .../java/com/dxhy/base/model/BaseSggxCxRespVO.java   |  2 +-
 .../BaseInvoiceManualCheckServiceImpl.java           | 11 +++++++----
 .../src/main/resources/mapper/BaseSggxcxMapper.xml   | 12 ++++++------
 .../service/bb/impl/ViolationLogServiceImpl.java     |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

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 bd6526c8..3994343d 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
@@ -447,11 +447,11 @@ public class BaseInvoiceController extends AbstractController {
         String company = (String)map.get("company");
         String menuId = (String)map.get("menuId");
         String bzdh = (String) map.get("bzdh");
-        String inAccountStatus = (String) map.get("inaccountStatus");
+        String inAccountStatus = (String) map.get("inAccountStatus");
 
         Map<String, Object> pramsMap = new HashMap<>(18);
         pramsMap.put("bzdh", bzdh);
-        pramsMap.put("inaccountStatus", inAccountStatus);
+        pramsMap.put("inAccountStatus", inAccountStatus);
         pramsMap.put("company", company);
         pramsMap.put("menuId", menuId);
         pramsMap.put("business", getUserInfo().getBusiness());
diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
index 457aade8..c6025ba9 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
@@ -463,7 +463,7 @@ public class BaseTDxRecordInvoice implements Serializable {
     /**
      * 打款状态
      */
-    private String inaccountStatus;
+    private String inAccountStatus;
 
     private String invoiceSource;
     /**
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
index 32f7e393..a9f770a5 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
@@ -106,7 +106,7 @@ public class BaseSggxCxRespVO {
     /**
      * 打款状态
      */
-    private String inaccountStatus;
+    private String inAccountStatus;
 
     /**
      * 付款状态
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 58208eea..3005cb28 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -185,7 +185,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount().toString())));
                     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())) {
@@ -211,14 +212,16 @@ 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());
-                    pageList.get(i).setInaccountStatus(dkzt);
-                    vo.setInaccountStatus(dkzt);
+                    String dkzt= dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
+                    pageList.get(i).setInAccountStatus(dkzt);
+                    vo.setInAccountStatus(dkzt);
                     vo.setSelect(true);
                     if (!"1".equals(pageList.get(i).getAuthStatus())) {
                         vo.setSelect(false);
                     }
 
+                    log.info("手工勾选查询返回对象VO {}",vo);
+
                     String invoiceStatus="07";
                     if ( pageList.get(i).getInvoiceStatus() != null && !invoiceStatus.contains(pageList.get(i).getInvoiceStatus())
                         || pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index db5f06db..5a17c13b 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -22,7 +22,7 @@
         <result column="qs_name" property="qsName"/>
         <result column="invoice_status" property="invoiceStatus"/>
         <result column="authStatus" property="authStatus"/>
-        <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"/>
@@ -61,7 +61,7 @@
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
         else 2 end authStatus,t.bzdh,
-        t.in_account_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
+        t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq}
@@ -95,8 +95,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
@@ -429,8 +429,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="businessCode==''">
             and (t.dept_id is null or t.dept_id='' or t.dept_id='99')
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java
index a684bb82..e6f39ef2 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java
+++ b/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());
                             }
                         }
                     }