From a2c2746af6c114bec6dfd49b2c5df0dee1ef8bd9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 16:00:53 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 0a4ae153..b1e8b840 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
@@ -893,6 +893,10 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("sign","99");
 
 
+        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
+        }
         if (StringUtils.isNotBlank(companyCode)){
             pramsMap.put("companyCode",companyCode);
         }
@@ -961,9 +965,13 @@ public class BaseInvoiceController extends AbstractController {
 //
 //            map.put("sign","88");
 
+        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+            map.put("companyCodes",getUserInfo().getCompanyCodes());
+            log.info("组织机构====>{}",map.get("companyCodes"));
+        }
 
         if (StringUtils.isNotBlank(companyCode)){
-            pramsMap.put("companyCode",companyCode);
+            map.put("companyCode",companyCode);
         }
         String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
         BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class);

From 2594e63f586e239106e83a2c5789f0a1ba2be160 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 16:15:36 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3sql=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/BaseSggxcxMapper.xml     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index a58ddff9..4eda8632 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1381,33 +1381,33 @@
             and invoice_status = '0'
             and company = #{company}
             <if test="sign !='88'">
-                and t.gf_tax_no in
+                and gf_tax_no in
                 <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
 
             <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-                and (t.comp_code in
+                and (comp_code in
                 <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                     #{companyCode}
                 </foreach>
-                or t.comp_code is null or t.comp_code = ''
+                or comp_code is null or comp_code = ''
                 )
             </if>
             <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
-                and t.comp_code = #{companyCode}
+                and comp_code = #{companyCode}
             </if>
             <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
-                and (t.comp_code = '' or t.comp_code is null)
+                and (comp_code = '' or comp_code is null)
             </if>
 
             <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
-                and t.inaccount_status = '1'
+                and inaccount_status = '1'
             </if>
 
             <if test="qsflag != null and qsflag != '' and qsflag != 'null' and qsflag == '1'.toString()">
-                and t.qs_status = '1'
+                and qs_status = '1'
             </if>
 
             ORDER BY tax_amount
@@ -1438,33 +1438,33 @@
         and invoice_status = '0'
         and company = #{company}
         <if test="sign !='88'">
-            and t.gf_tax_no in
+            and gf_tax_no in
             <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
 
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
+            and (comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                 #{companyCode}
             </foreach>
-            or t.comp_code is null or t.comp_code = ''
+            or comp_code is null or comp_code = ''
             )
         </if>
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
-            and t.comp_code = #{companyCode}
+            and comp_code = #{companyCode}
         </if>
         <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
+            and (comp_code = '' or comp_code is null)
         </if>
 
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
-            and t.inaccount_status = '1'
+            and inaccount_status = '1'
         </if>
 
         <if test="qsflag != null and qsflag != '' and qsflag != 'null' and qsflag == '1'.toString()">
-            and t.qs_status = '1'
+            and qs_status = '1'
         </if>
 
         ORDER BY tax_amount

From a10b2693a9efee08761349eaac605050d13bffd8 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 16:26:05 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 4eda8632..998a26cc 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1412,7 +1412,7 @@
 
             ORDER BY tax_amount
         ) AS subquery
-        WHERE  <![CDATA[ max_tax <= #{max_tax} ]]>
+        WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
 
     </select>
 
@@ -1469,7 +1469,7 @@
 
         ORDER BY tax_amount
         ) AS subquery
-        WHERE  <![CDATA[ max_tax <= #{max_tax} ]]>
+        WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
     </select>
 
     <update id="updateSuspendType" parameterType="java.util.Map" databaseId="mysql">

From 6ba3469c638b8d395c086bc5b67b1218c8e27d25 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 16:59:04 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0/*keep=20orderby*/?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=BC=BA=E5=88=B6=E6=89=A7=E8=A1=8Corder=20b?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 998a26cc..da563891 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1410,7 +1410,7 @@
                 and qs_status = '1'
             </if>
 
-            ORDER BY tax_amount
+        /*keep orderby*/ ORDER BY tax_amount
         ) AS subquery
         WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
 

From c2216bf8e5ce722234009a516a9b6cb688ea8d08 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 17:22:14 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=89=8B=E5=86=99=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 63 ++++++++++---------
 .../resources/mapper/BaseSggxcxMapper.xml     |  6 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

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 6f62fe4d..4c80b9eb 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
@@ -486,39 +486,42 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 }
             }
 
+            int curr = (int) pramsMap.get("curr");
+            int size = (int) pramsMap.get("size");
+
+            String hjsl = "0";
+            String hjje = "0";
+            String hjse = "0";
+            List<BaseTDxRecordInvoice> hjList = super.baseMapper.selectChooseHj(pramsMap);
+            BaseTDxRecordInvoice hjxx = hjList.get(0);
+            hjsl = hjxx.getSfygx();
+            if (!"0".equals(hjsl)) {
+                hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
+                hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
+            }
+            json.put("hjsl", AmountFormatUtil.fmtMicrometer(hjsl));
+            json.put("hjje", hjje);
+            json.put("hjse", hjse);
+            if ("0".equals(hjsl)) {
+                json.put("message", "无可操作的数据");
+                json.put("code", "501");
+                return super.responseResult(json);
+            }
 
-            String isChooseAll = (String) pramsMap.get("isChooseAll");
-
-
-            //如果不是勾选所有进行统计和分页
-            if ("N".equalsIgnoreCase(isChooseAll)){
-                int curr = (int) pramsMap.get("curr");
-                int size = (int) pramsMap.get("size");
-
-                // 合计信息,仅第一页时需要统计，减少数据库压力
-                if (curr == 1) {
-                    String hjsl = "0";
-                    String hjje = "0";
-                    String hjse = "0";
-                    List<BaseTDxRecordInvoice> hjList = super.baseMapper.selectChooseHj(pramsMap);
-                    BaseTDxRecordInvoice hjxx = hjList.get(0);
-                    hjsl = hjxx.getSfygx();
-                    if (!"0".equals(hjsl)) {
-                        hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
-                        hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
-                    }
-                    json.put("hjsl", AmountFormatUtil.fmtMicrometer(hjsl));
-                    json.put("hjje", hjje);
-                    json.put("hjse", hjse);
-                    if ("0".equals(hjsl)) {
-                        json.put("message", "无可操作的数据");
-                        json.put("code", "501");
-                        return super.responseResult(json);
-                    }
-                }
+            int total = Integer.parseInt(hjsl);
+
+            int totalPage = total % size == 0?total/size:total/size+1;
 
-                PageHelper.startPage(curr, size);
+            if (curr<1){
+                curr =1;
+            }
+            if (curr>totalPage){
+                curr = totalPage;
             }
+            curr = (curr -1)*size;
+            pramsMap.put("curr",curr);
+
+
 
             List<BaseTDxRecordInvoice> pageList = super.baseMapper.selectInTellingCheck(pramsMap);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index da563891..cd6f421b 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1410,7 +1410,11 @@
                 and qs_status = '1'
             </if>
 
-        /*keep orderby*/ ORDER BY tax_amount
+            ORDER BY tax_amount
+            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'">
+                limit #{curr},#{size}
+            </if>
+
         ) AS subquery
         WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
 

From 8878e178568038f81612e818ea80c5fc078dd95a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 17:35:06 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=89=8B=E5=86=99=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 29 ++++++++++---------
 .../resources/mapper/BaseSggxcxMapper.xml     |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

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 4c80b9eb..1dc3af1d 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
@@ -486,8 +486,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 }
             }
 
-            int curr = (int) pramsMap.get("curr");
-            int size = (int) pramsMap.get("size");
+
 
             String hjsl = "0";
             String hjje = "0";
@@ -508,20 +507,24 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 return super.responseResult(json);
             }
 
-            int total = Integer.parseInt(hjsl);
-
-            int totalPage = total % size == 0?total/size:total/size+1;
+            String isChooseAll = (String) pramsMap.get("isChooseAll");
 
-            if (curr<1){
-                curr =1;
-            }
-            if (curr>totalPage){
-                curr = totalPage;
-            }
-            curr = (curr -1)*size;
-            pramsMap.put("curr",curr);
+            if ("N".equals(isChooseAll)){
+                int total = Integer.parseInt(hjsl);
 
+                int curr = (int) pramsMap.get("curr");
+                int size = (int) pramsMap.get("size");
+                int totalPage = total % size == 0?total/size:total/size+1;
 
+                if (curr<1){
+                    curr =1;
+                }
+                if (curr>totalPage){
+                    curr = totalPage;
+                }
+                curr = (curr -1)*size;
+                pramsMap.put("curr",curr);
+            }
 
             List<BaseTDxRecordInvoice> pageList = super.baseMapper.selectInTellingCheck(pramsMap);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index cd6f421b..4ab17fad 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1411,7 +1411,7 @@
             </if>
 
             ORDER BY tax_amount
-            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'">
+            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'.toString()">
                 limit #{curr},#{size}
             </if>
 

From 324d7e68ae2da0f1c05010ee9924affd49817577 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 17:52:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=89=8B=E5=86=99=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 4ab17fad..5e35a52a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1411,7 +1411,7 @@
             </if>
 
             ORDER BY tax_amount
-            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'.toString()">
+            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'N'.toString()">
                 limit #{curr},#{size}
             </if>
 

From 18d115f242613a11be1ebf8ca70a476d62087bba Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 18:37:09 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 1dc3af1d..24e58d08 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
@@ -540,7 +540,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             // 转化为页面展示对象
             List<BaseSggxCxRespVO> returnList = new ArrayList<>();
             //记录数量
-            int count = 0;
+            int count = 1;
             //税额上限
             List<Business> businessList = (List<Business>)pramsMap.get("business");
 
@@ -564,7 +564,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
 
             }
 
-            json.put("total", pageInfo.getTotal());
+            json.put("total", hjsl);
             json.put("datalist", returnList);
 
         } catch (Exception e) {

From 84483e3b307f0db8b264170dc0f56b3c2a7d1fc3 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 19:22:30 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/controller/BaseInvoiceController.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 b1e8b840..331568f8 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
@@ -935,7 +935,7 @@ public class BaseInvoiceController extends AbstractController {
         String companyCode = (String) map.get("companyCode");
         String gfsh = (String)map.get("gfsh");
         List<String> gfshList = new ArrayList<>();
-        if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){
+        if(StringUtils.isNotBlank(gfsh) && "99".equals(gfsh)){
             gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         }else {
             gfshList.add(gfsh);
@@ -963,7 +963,7 @@ public class BaseInvoiceController extends AbstractController {
 //
 //            map.put("gfsh",gfshList);
 //
-//            map.put("sign","88");
+            map.put("sign","99");
 
         if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
             map.put("companyCodes",getUserInfo().getCompanyCodes());
@@ -974,8 +974,10 @@ public class BaseInvoiceController extends AbstractController {
             map.put("companyCode",companyCode);
         }
         String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
+        log.info("sgrzzngxcx{}",sgrzzngxcx);
         BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class);
         String encode = Base64.decodeStr(baseReturnData.getData());
+        log.info("encode{}",encode);
         BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class);
         List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList();
         StringBuilder uuids = new StringBuilder();

From 3d63099f62b41b2d04b418cde0b514c7ed5aa194 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 19:49:53 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=8A=A5=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 331568f8..c5127580 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
@@ -974,11 +974,10 @@ public class BaseInvoiceController extends AbstractController {
             map.put("companyCode",companyCode);
         }
         String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
-        log.info("sgrzzngxcx{}",sgrzzngxcx);
-        BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class);
-        String encode = Base64.decodeStr(baseReturnData.getData());
-        log.info("encode{}",encode);
-        BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class);
+        log.info("sgrzzngxcx======={}",sgrzzngxcx);
+        String decodeStr = Base64.decodeStr(sgrzzngxcx);
+
+        BaseReturnEntity baseReturnEntity = JSON.parseObject(decodeStr, BaseReturnEntity.class);
         List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList();
         StringBuilder uuids = new StringBuilder();
         StringBuilder dkses = new StringBuilder();
@@ -991,6 +990,8 @@ public class BaseInvoiceController extends AbstractController {
                     dkses.append(",");
                 }
             }
+            log.info("uuids====>{}",uuids);
+            log.info("dkses====>{}",dkses);
         }else {
             return ResponseEntity.ok(R.error("没有可操作的数据"));
 

From f1d383358bfe6f37194b9a878bfb5ac36c80f8a6 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 20:07:43 +0800
Subject: [PATCH 11/12] =?UTF-8?q?uuid=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/base/model/BaseSggxCxRespVO.java    | 1 +
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java    | 1 +
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml   | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

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 ee54d389..085f0547 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
@@ -165,4 +165,5 @@ public class BaseSggxCxRespVO {
 
     private String bzr;
 
+    private String uuid;
 }
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 24e58d08..a96e9bcc 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
@@ -601,6 +601,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         String businessName = this.getBusinessName(businessCode, businessList);
 
 //                        log.info("businessName={}",businessName);
+        vo.setUuid(baseTDxRecordInvoice.getUuid());
         vo.setVoucherNumber(baseTDxRecordInvoice.getVoucherNumber());
         vo.setSnVoucherNumber(baseTDxRecordInvoice.getSnVoucherNumber());
         vo.setImageNumber(baseTDxRecordInvoice.getImageNumber());
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 5e35a52a..4e52fd77 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1411,12 +1411,11 @@
             </if>
 
             ORDER BY tax_amount
-            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'N'.toString()">
-                limit #{curr},#{size}
-            </if>
-
         ) AS subquery
         WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
+        <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'N'.toString()">
+            limit #{curr},#{size}
+        </if>
 
     </select>
 

From e4d593350c178a0aa1e312dc0f90913ab8596255 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 21:21:03 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=80=E4=BB=B6=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseRzTDxRecordInvoiceController.java     |  79 ++++++++++-
 .../resources/mapper/BaseSggxcxMapper.xml     | 134 +++++++++++++++++-
 2 files changed, 207 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
index 4574ac2a..805402fe 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
@@ -136,9 +136,37 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String xfmc = (String)map.get("xfmc");
         String position = (String)map.get("position");
         String fpzt = (String)map.get("invoiceStatus");
-
+        String companyCode = (String) map.get("companyCode");
         String qsr = (String)map.get("qsr");
+        String bzdh = (String) map.get("bzdh");
+        String bzr = (String) map.get("bzr");
+        String inAccountStatus = (String) map.get("inAccountStatus");
+        String sfkrz = (String)map.get("sfkrz");
+        String suspendDate = (String) map.get("suspendDate");
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
+            suspendDate = suspendDate.substring(0,7);
+        }
+        String suspendStatus = (String) map.get("suspendStastus");
+
+
         Map<String, Object> pramsMap = new HashMap<>(20);
+        pramsMap.put("bzdh",bzdh);
+        pramsMap.put("bzr",bzr);
+        pramsMap.put("inAccountStatus",inAccountStatus);
+        pramsMap.put("suspendDate",suspendDate);
+        pramsMap.put("suspendStatus",suspendStatus);
+        if (sfkrz != null) {
+            if (!"99".equals(sfkrz)) {
+                pramsMap.put("sfkrz", sfkrz);
+            }
+        }
+        if(pramsMap.get("imageNumber") != null){
+            pramsMap.put("imageNumber",pramsMap.get("imageNumber"));
+        }
+        pramsMap.put("postingTimeEnd", map.get("postingTimeEnd"));
+        pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
+        pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
+        pramsMap.put("company", map.get("company"));
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("name", getUserName());
@@ -146,6 +174,13 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
         pramsMap.put("qsflag", getUserInfo().getQsStatus());
+        if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
+            String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
+
+
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
@@ -155,6 +190,14 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         }
         pramsMap.put("gfsh", gfshList);
 
+        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(companyCode)){
+            pramsMap.put("companyCode",companyCode);
+        }
+
         if (!StringUtils.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
                 pramsMap.put("invoiceType", invoiceType);
@@ -272,15 +315,47 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String xfmc = (String)map.get("xfmc");
         String position = (String)map.get("position");
         String fpzt = (String)map.get("invoiceStatus");
-
+        String companyCode = (String) map.get("companyCode");
         String qsr = (String)map.get("qsr");
+        String bzdh = (String) map.get("bzdh");
+        String bzr = (String) map.get("bzr");
+        String inAccountStatus = (String) map.get("inAccountStatus");
+        String sfkrz = (String)map.get("sfkrz");
+        String suspendDate = (String) map.get("suspendDate");
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
+            suspendDate = suspendDate.substring(0,7);
+        }
+        String suspendStatus = (String) map.get("suspendStastus");
+
         Map<String, Object> pramsMap = new HashMap<>(20);
+        pramsMap.put("bzdh",bzdh);
+        pramsMap.put("bzr",bzr);
+        pramsMap.put("inAccountStatus",inAccountStatus);
+        pramsMap.put("suspendDate",suspendDate);
+        pramsMap.put("suspendStatus",suspendStatus);
+        if (sfkrz != null) {
+            if (!"99".equals(sfkrz)) {
+                pramsMap.put("sfkrz", sfkrz);
+            }
+        }
+        if(pramsMap.get("imageNumber") != null){
+            pramsMap.put("imageNumber",pramsMap.get("imageNumber"));
+        }
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("name", getUserName());
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
         pramsMap.put("qsflag", getUserInfo().getQsStatus());
+        if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
+            String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
+        pramsMap.put("postingTimeEnd", map.get("postingTimeEnd"));
+        pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
+        pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
+        pramsMap.put("company", map.get("company"));
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 4e52fd77..9fc66af3 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -409,14 +409,14 @@
             and t.invoice_status in ('0','7')
             and t.invoice_amount>0
             and t.tax_amount>=0
-            and date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date
+            and t.invoice_date between c.select_start_date and c.select_end_date
             and d.tj_status in('0','3')
         </if>
 
         <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
             and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
-            date_format(t.invoice_date,'%Y%m%d') &lt;= c.select_start_date or
-            date_format(t.invoice_date,'%Y%m%d') &gt;=
+            t.invoice_date &lt;= c.select_start_date or
+            t.invoice_date &gt;=
             c.select_end_date or d.tj_status in ('1','2'))
 
         </if>
@@ -1031,11 +1031,74 @@
         and t.invoice_amount>0
         and t.tax_amount>=0
         and d.tj_status in('0','3')
-        and date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date
+        and invoice_date between c.select_start_date and c.select_end_date
+        and t.company = #{company}
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
+        </if>
+
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
+            and t.invoice_status in ('0','7')
+            and t.invoice_amount>0
+            and t.tax_amount>=0
+            and t.invoice_date between c.select_start_date and c.select_end_date
+            and d.tj_status in('0','3')
+        </if>
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
+            and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
+            t.invoice_date &lt;= c.select_start_date or
+            t.invoice_date &gt;=
+            c.select_end_date or d.tj_status in ('1','2'))
+
+        </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
+            and t.suspend_status = '1'
+        </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '0'.toString()">
+            and (t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0')
+        </if>
+        <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
+            and t.suspend_date = #{suspendDate}
+        </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
@@ -1201,10 +1264,73 @@
         and t.tax_amount>=0
         and d.tj_status in('0','3')
         and date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date
+        and t.company = #{company}
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
+        </if>
+
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
+            and t.invoice_status in ('0','7')
+            and t.invoice_amount>0
+            and t.tax_amount>=0
+            and t.invoice_date between c.select_start_date and c.select_end_date
+            and d.tj_status in('0','3')
+        </if>
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
+            and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
+            t.invoice_date &lt;= c.select_start_date or
+            t.invoice_date &gt;=
+            c.select_end_date or d.tj_status in ('1','2'))
+
+        </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
+            and t.suspend_status = '1'
+        </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '0'.toString()">
+            and (t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0')
+        </if>
+        <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
+            and t.suspend_date = #{suspendDate}
+        </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>