From 866d30bde37fda38e7d36f453af7ca1546342763 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 10:32:15 +0800
Subject: [PATCH 1/7] =?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

---
 .../com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index cb380ddf..6b98c724 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -1326,6 +1326,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                 notes = "发票号码不正确";
             }
         }
+        if (invoiceNo != null && invoiceNo.length()==20){
+            notes = null;
+        }
         return notes;
     }
 

From 164124e13170a740b6dc6d4cb044a1461c3f9dc7 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 11:14:33 +0800
Subject: [PATCH 2/7] =?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

---
 .../sign/service/fpqs/impl/SignFpqsServiceImpl.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index 6b98c724..b1db6804 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -1501,7 +1501,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             pramsMap.put("invoiceCode", invoiceCode);
             pramsMap.put("invoiceNo", invoiceNo);
             pramsMap.put("invoiceType", invoiceType);
-            pramsMap.put("invoiceDate", excelFp.getString("invoiceDate"));
+            if (excelFp.getString("invoiceDate") != null){
+                String invoiceDate = excelFp.getString("invoiceDate").substring(0, 10);
+                pramsMap.put("invoiceDate",invoiceDate);
+            }
+
             pramsMap.put("invoiceAmount", excelFp.getString("invoiceAmount"));
             pramsMap.put("checkCode", excelFp.getString("checkCode"));
 
@@ -1586,6 +1590,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                         invoiceUtil.setJym(checkCode);
                         if (!invoiceUtil.jymValid()) {
                             msg = "校验码不正确";
+                            if (invoiceNo !=null && invoiceNo.length() == 20){
+                                msg = null;
+                            }
                         }
                     }
                 } else {
@@ -1598,6 +1605,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                     invoiceUtil.setJym(checkCode);
                     if (!invoiceUtil.jymValid()) {
                         msg = "校验码不正确";
+                        if (invoiceNo !=null && invoiceNo.length() == 20){
+                            msg = null;
+                        }
                     }
                 }
             }

From 0d17ddcb8965e0b67da60a0e95e906fee677c748 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 16:30:38 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E5=92=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 12 ++++---
 .../base/entity/BaseTDxRecordInvoice.java     |  2 ++
 .../com/dxhy/base/model/BaseSggxCxRespVO.java |  5 +++
 .../BaseInvoiceManualCheckServiceImpl.java    |  2 ++
 .../resources/mapper/BaseSggxcxMapper.xml     | 32 ++++++++++++-------
 .../service/fpqs/impl/FpqsServiceImpl.java    | 10 ++++--
 .../fpqs/impl/SignFpqsServiceImpl.java        | 11 ++++++-
 .../com/dxhy/sign/util/SignRulesUtils.java    |  1 +
 8 files changed, 57 insertions(+), 18 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 fec07405..cb0d917c 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
@@ -443,8 +443,12 @@ public class BaseInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String company = (String)map.get("company");
         String menuId = (String)map.get("menuId");
+        String bzdh = (String) map.get("bzdh");
+        String inAccountStatus = (String) map.get("inaccountStatus");
 
         Map<String, Object> pramsMap = new HashMap<>(18);
+        pramsMap.put("bzdh", bzdh);
+        pramsMap.put("inAccountStatus", inAccountStatus);
         pramsMap.put("company", company);
         pramsMap.put("menuId", menuId);
         pramsMap.put("business", getUserInfo().getBusiness());
@@ -468,7 +472,7 @@ public class BaseInvoiceController extends AbstractController {
             log.info("accountPeriod:{}",accountPeriod);
         }
 //        pramsMap.put("accountPeriod", map.get("accountPeriod"));
-        String inAccountStatus = (String)map.get("inAccountStatus");
+//        String inAccountStatus = (String)map.get("inAccountStatus");
 
         if (sfkrz != null) {
             if (!"99".equals(sfkrz)) {
@@ -566,9 +570,9 @@ public class BaseInvoiceController extends AbstractController {
         if (!StringUtils.isBlank(qsr)) {
             pramsMap.put("qsr", qsr);
         }
-        if (StringUtils.isNotBlank(inAccountStatus)) {
-            pramsMap.put("inAccountStatus", inAccountStatus);
-        }
+//        if (StringUtils.isNotBlank(inAccountStatus)) {
+//            pramsMap.put("inAccountStatus", inAccountStatus);
+//        }
         try {
             return ResponseEntity
                 .ok(R.ok().put("data", baseInvoiceManualCheckService.selectByManualCheck(pramsMap, curr, size)));
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 856c6a67..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
@@ -509,4 +509,6 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String postingTime;
     //影像号
     private String imageId;
+    //报账单号
+    private String bzdh;
 }
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 b9e2c0cc..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
@@ -149,4 +149,9 @@ public class BaseSggxCxRespVO {
      */
     private String accountPeriod;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
 }
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 098ea695..ec5de2f0 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,6 +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.setBzdh(pageList.get(i).getBzdh());
                     // 签收方式为已经签收时展示签收信息
                     if ("1".equals(pageList.get(i).getQsStatus())) {
                         if (pageList.get(i).getQsDate() != null) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index cf7ba4ca..e6bf33f9 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -22,11 +22,13 @@
         <result column="qs_name" property="qsName"/>
         <result column="invoice_status" property="invoiceStatus"/>
         <result column="authStatus" property="authStatus"/>
-        <result column="in_account_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"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
     </resultMap>
     <resultMap id="hjResultMap"
                type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@@ -91,6 +93,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
+        <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>
         <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}
         </if>
@@ -151,9 +159,6 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
@@ -354,8 +359,7 @@
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
         and t.company = #{company}
-        <if
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
+        <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
@@ -363,8 +367,7 @@
             and d.tj_status in('0','3')
         </if>
 
-        <if
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
+        <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;=
@@ -424,6 +427,12 @@
         <if test="invoiceSource!=null and invoiceSource!='99' and invoiceSource!='null' and invoiceSource!=''">
             and t.invoice_source =#{invoiceSource}
         </if>
+        <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>
         <if test="businessCode==''">
             and (t.dept_id is null or t.dept_id='' or t.dept_id='99')
         </if>
@@ -435,6 +444,7 @@
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
 
+
         <!-- 按签收人查询 -->
         <if
                 test="position != null and position != '' and position != 'null' and position == '1'.toString()">
@@ -443,9 +453,9 @@
         <if test="settlementNo != null and settlementNo != ''">
             and t.settlement_no like concat(#{settlementNo},'%')
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
+<!--        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
+<!--            and t.inaccount_status = #{inAccountStatus}-->
+<!--        </if>-->
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
index a24970b6..150ba6d1 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
@@ -275,7 +275,10 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
 
         // 1、基础信息校验
         String note = signRulesUtils.validateInvoiceInfo(pramsMap.get("invoiceCode"), pramsMap.get("invoiceNo"));
-
+        log.info("note======> {}0",note);
+        if(pramsMap.get("eleInvoiceNo") != null){
+            note = null;
+        }
         // uuid = 发票代码+发票号码
         String uuid = pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo");
         // 2、查询扫描表是否有数据，有（重复扫描）且签收结果为成功则return，下一个
@@ -342,7 +345,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
             // 接口不通
             result[0] = false;
             result[1] = queryInvoiceResult.getString("returnMessage");
-            log.error("发票号码：" + pramsMap.get("invoiceNo") + "签收失败，失败原因:" + result[1]);
+            log.error("发票号码：" + pramsMap.get("invoiceNo") +"发票代码"+pramsMap.get("invoiceCode")+ "签收失败，失败原因:" + result[1]);
             // insertOrUpdate 扫描表
             createFailScanInvoice(pramsMap, result[1].toString(), scanInvoice, userInfo, invoiceType, qsType);
             return result;
@@ -719,6 +722,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
         if(StringUtils.isNotBlank(pramsMap.get("eleInvoiceNo"))){
             //全电号码
             scanInvoicce.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
+            if (pramsMap.get("eleInvoiceNo") == null){
+                scanInvoicce.setEleInvoiceNo(pramsMap.get("invoiceNo"));
+            }
         }
         //uuid
         scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index b1db6804..18d0642a 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -774,6 +774,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         tDxInvoice.setDeptName(pramsMap.get("businessName"));
         tDxInvoice.setScanId(pramsMap.get("scanId"));
         tDxInvoice.setCompany(pramsMap.get("company"));
+        tDxInvoice.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
         try {
             tDxInvoice.setInvoiceDate(new SimpleDateFormat("yyyy-MM-dd").parse(pramsMap.get("invoiceDate")));
         } catch (Exception e) {
@@ -1494,10 +1495,18 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         for (int i = 0; i < detailArray.size(); i++) {
             JSONObject excelFp = detailArray.getJSONObject(i);
             // 入参统一在入口处理
-
             String invoiceType = excelFp.getString("invoiceType");
             String invoiceCode = excelFp.getString("invoiceCode");
             String invoiceNo = excelFp.getString("invoiceNo");
+            String eleInvoiceNo = excelFp.getString("eleInvoiceNo");
+            if (invoiceNo != null && invoiceNo.length() == 20){
+                eleInvoiceNo = invoiceNo;
+                invoiceCode = invoiceNo.substring(0,12);
+                invoiceNo = invoiceNo.substring(12,20);
+
+            }
+
+            pramsMap.put("eleInvoiceNo",eleInvoiceNo);
             pramsMap.put("invoiceCode", invoiceCode);
             pramsMap.put("invoiceNo", invoiceNo);
             pramsMap.put("invoiceType", invoiceType);
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java b/dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java
index a56f5ca7..57c1c3a9 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java
@@ -68,6 +68,7 @@ public class SignRulesUtils {
         InvoiceUtil invoiceUtil = new InvoiceUtil(invoiceCode);
         if (!invoiceUtil.fpdmValid() || invoiceUtil.getFplxdm() == null) {
             notes = "发票代码不正确";
+
         } else {
             invoiceUtil.setFphm(invoiceNo);
             if (!invoiceUtil.fphmValid()) {

From 843607e3a9e64622f3d3373e4b02555f98dcb323 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sun, 23 Apr 2023 17:08:28 +0800
Subject: [PATCH 4/7] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=20=E7=9B=B8=E5=85=B3bug=20v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailGather/EmailMaintainController.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
index 1f882266..a4e1480e 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
@@ -130,6 +130,16 @@ public class EmailMaintainController extends AbstractController  {
         if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
             return ResponseEntity.ok(R.error("邮箱地址已存在！"));
         }
+
+        String userId = emailMaintain.getUserId();
+
+        String userName = emailMaintainService.getUserName(userId);
+        if(StringUtils.isBlank(userName)){
+            R data = new R(101, "用户编码在系统中查询不到，请核实！");
+            data.put("data", "");
+            return ResponseEntity.ok(data);
+        }
+
         boolean b = emailMaintainService.update(emailMaintain);
         if(b){
             return ResponseEntity.ok(R.ok());
@@ -242,7 +252,11 @@ public class EmailMaintainController extends AbstractController  {
             if (ObjectUtil.isNotEmpty(errorMsgList)) {
                 JSONObject json = new JSONObject();
                 json.put("datalist", errorMsgList);
-                return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString())));
+
+                R data = new R(101, "校验信息有误");
+                data.put("data", json);
+                return ResponseEntity.ok(data);
+
             }
             int i = emailMaintainService.insertBatch(mailList);
             if(i > 0){

From f22926ca44d286610145cf53f99cd1ccccd59733 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sun, 23 Apr 2023 17:33:30 +0800
Subject: [PATCH 5/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/bootstrap-std.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml
index 466beb99..76a3f1d5 100644
--- a/dxhy-core/src/main/resources/bootstrap-std.yaml
+++ b/dxhy-core/src/main/resources/bootstrap-std.yaml
@@ -4,13 +4,13 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-core-group
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
         password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
@@ -21,7 +21,7 @@ spring:
       discovery:
         server-addr: 172.31.36.147:33000
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
         password: Invoice.nacos.!1
-        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
\ No newline at end of file
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
\ No newline at end of file

From 55f9501834b0c7d17baccdef6c6a9007ca40fe7b Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 18:26:36 +0800
Subject: [PATCH 6/7] =?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

---
 .../controller/BaseInvoiceController.java     |  3 +++
 .../com/dxhy/base/model/BaseFpRzRespVO.java   |  2 ++
 .../service/fpxxrz/BaseRzFpxxServiceImpl.java |  2 ++
 .../main/resources/mapper/BaseFpZhMapper.xml  | 27 ++++++++++++++-----
 .../erp/service/SNPushCheckRecordService.java | 16 +++++------
 .../com/dxhy/sign/entity/QsExcelEntity.java   |  3 ++-
 .../mapper/SignRecordInvoiceMapper.xml        | 10 +++----
 7 files changed, 42 insertions(+), 21 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 cb0d917c..65413185 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
@@ -130,8 +130,11 @@ public class BaseInvoiceController extends AbstractController {
         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("qszt", map.get("qszt"));
         pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
         pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
index f3b2f9b6..580ed7c0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
@@ -203,6 +203,8 @@ public class BaseFpRzRespVO implements Serializable {
     //影像号  SN
     private String imageNumber;
     private String imageId;
+    //报账单号
+    private String bzdh;
 
 
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index 833d2cfd..74333893 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -137,6 +137,8 @@ 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).setBzdh(pageList.get(i).getBzdh());
                         pageList.get(i).setXh(String.valueOf(i + start));
                         pageList.get(i).setTaxAmount(
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount())));
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 2909d2bd..c4b14168 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -41,7 +41,8 @@
         <result column="bdk_status" property="bdkStatus"/>
         <result column="bdk_current_period" property="bdkCurrentPeriod"/>
         <result column="bdk_date" property="bdkDate"/>
-        <result column="in_account_status" property="inAccountStatus"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="payment_date" property="paymentDate"/>
         <result column="payment_status" property="paymentStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
@@ -84,6 +85,12 @@
         <if test="voucherNumber != null and voucherNumber != ''">
             and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
         </if>
+        <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>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
@@ -182,9 +189,9 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
+<!--        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
+<!--            and t.in_account_status = #{inAccountStatus}-->
+<!--        </if>-->
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -332,6 +339,12 @@
         <if test="voucherNumber != null and voucherNumber != ''">
             and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
         </if>
+        <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>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
@@ -408,9 +421,9 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
+<!--        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
+<!--            and t.in_account_status = #{inAccountStatus}-->
+<!--        </if>-->
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index cadc6110..e106a7a5 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -469,17 +469,17 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                         snDetailMap.put("specificationModel", detail.getString("ggxh"));
                         snDetailMap.put("unit", detail.getString("jldw"));
                         String quantity = detail.getString("spsl");
-                        if (quantity.length() > 3) {
-                            int index = quantity.indexOf(".");
-                            quantity = quantity.substring(0, index + 2);
-                        }
+//                        if (quantity.length() > 3) {
+//                            int index = quantity.indexOf(".");
+//                            quantity = quantity.substring(0, index + 2);
+//                        }
                         snDetailMap.put("quantity", quantity);
 
                         String unitPrice = detail.getString("bhsdj");
-                        if (unitPrice.length() > 3) {
-                            int index = unitPrice.indexOf(".");
-                            unitPrice = unitPrice.substring(0, index + 3);
-                        }
+//                        if (unitPrice.length() > 3) {
+//                            int index = unitPrice.indexOf(".");
+//                            unitPrice = unitPrice.substring(0, index + 3);
+//                        }
 
                         snDetailMap.put("unitPrice", unitPrice);
 
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
index 4073adf6..5afa2ef8 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 
 @Data
-@ColumnWidth(11)
+@ColumnWidth(30)
 @ContentFontStyle(fontHeightInPoints = 10)
 @HeadFontStyle(fontHeightInPoints = 12,fontName = "等线")
 @HeadStyle(borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderLeft = BorderStyleEnum.THIN,
@@ -32,6 +32,7 @@ public class QsExcelEntity {
     /**
      * 开票日期
      */
+
     @ExcelProperty("开票日期")
     private Date invoiceDate;
     /**
diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
index f9a1fe9c..e4fbafb8 100644
--- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
@@ -91,11 +91,11 @@
                 #{item}
             </foreach>
         </if>
-        <if test="company !=null and company != ''">
-           and t.company = #{company}
-        </if>
-        and t.qs_status = '0'
-        and t.source_system='0'
+<!--        <if test="company !=null and company != ''">-->
+<!--           and t.company = #{company}-->
+<!--        </if>-->
+<!--        and t.qs_status = '0'-->
+<!--        and t.source_system='0'-->
     </select>
 
     <select id="selectWqsfp" parameterType="java.util.Map"

From b364d242e2b6e6d6037c9d4bee54a39d565ec1cf Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Sun, 23 Apr 2023 20:49:59 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/model/mailGather/MailGatherLogVo.java   | 3 +++
 .../service/mailGather/impl/MailGatherLogServiceImpl.java | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
index 5e8a9a96..a35a3b72 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
@@ -2,6 +2,7 @@ package com.dxhy.core.model.mailGather;
 
 
 import com.dxhy.core.model.CommonDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,6 +13,7 @@ import java.util.Date;
 public class MailGatherLogVo extends CommonDTO {
 
     private String id;
+    public String xh;
     //主题
     private String subject;
     private String fromAddress;
@@ -24,6 +26,7 @@ public class MailGatherLogVo extends CommonDTO {
     private String ocrType;
     private String errorMsg;
     private String fileName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
index 12e63f4f..046f7d0c 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
@@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
 import com.dxhy.common.util.UUIDUtils;
+import com.dxhy.common.utils.Base64Encoding;
 import com.dxhy.core.dao.mailGather.MailGatherLogDao;
+import com.dxhy.core.model.mailGather.EmailMaintainVo;
 import com.dxhy.core.model.mailGather.MailGatherLogVo;
 import com.dxhy.core.service.mailGather.MailGatherLogService;
 import com.github.pagehelper.PageHelper;
@@ -53,6 +55,12 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
         int size = (int)pramsMap.get("size");
         PageHelper.startPage(curr, size);
         List<MailGatherLogVo> emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap);
+        if(emailMaintainVos !=null && emailMaintainVos.size() > 0) {
+            for (int i = 0; i < emailMaintainVos.size(); i++) {
+                MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i);
+                mailGatherLogVo.setXh(i + 1 + "");
+            }
+        }
         PageInfo<MailGatherLogVo> pageInfo = new PageInfo<>(emailMaintainVos);
         // 设置记录总数
         json.put("total", pageInfo.getTotal());