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

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java

@@ -127,6 +127,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                             boolean deleteDetail =
                                     signInvoiceDetailService.deleteDetail(recordInvoice.getUuid(), dbName);
                             if (deleteDetail) {
+                                log.info("保存明细表的字段和字段值为{}",recordInvoiceDetail);
                                 signInvoiceDetailService.saveInvoiceDetail(recordInvoiceDetail, dbName);
                             }
                         }
@@ -300,10 +301,12 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                         invoiceDetail.setInvoiceNo(invoiceNo);
                     }
                     invoiceDetail.setDetailNo(invoiceDetailQuery.getString("detailNo"));
-                    invoiceDetail.setGoodsName(invoiceDetailQuery.getString("goodsName"));
+//                    invoiceDetail.setGoodsName(invoiceDetailQuery.getString("goodsName"));
                     invoiceDetail.setModel(invoiceDetailQuery.getString("specificationModel"));
                     invoiceDetail.setUnit(invoiceDetailQuery.getString("unit"));
-                    invoiceDetail.setNum(invoiceDetailQuery.getString("num"));
+//                    invoiceDetail.setNum(invoiceDetailQuery.getString("num"));
+                    invoiceDetail.setNum(invoiceDetailQuery.getString("spsl"));
+                    invoiceDetail.setGoodsName(invoiceDetailQuery.getString("hwmc"));
                     invoiceDetail.setUnitPrice(invoiceDetailQuery.getString("unitPrice"));
                     invoiceDetail.setDetailAmount(invoiceDetailQuery.getString("detailAmount"));
                     invoiceDetail.setTaxRate(invoiceDetailQuery.getString("taxRate"));

dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml

@@ -1628,8 +1628,8 @@
             </foreach>
         </if>
         and invoice_status != 0
-        and DATE_FORMAT( status_update_date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
     </select>
+<!--    and DATE_FORMAT( status_update_date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )-->
     <!-- 普票跨年度发票 -->
     <select id="getInvoiceTaskRemindingPpknd" resultMap="indexInvoiceTaskRemindingMap"
             databaseId="mysql">
@@ -1671,9 +1671,8 @@
         and invoice_status != '0'
         and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08'))
         and auth_status = '4'
-        and date_format(rzh_date,'%Y-%m') = date_format(now(),'%Y-%m')
-
     </select>
+<!--    and date_format(rzh_date,'%Y-%m') = date_format(now(),'%Y-%m')-->
     <!-- 签收异常发票 -->
     <select id="getInvoiceTaskRemindingQsyc" resultMap="indexInvoiceTaskRemindingMap"
             databaseId="mysql">
@@ -1692,8 +1691,9 @@
         </if>
         and invoice_status != '0'
         and qs_status = '1'
-        and date_format(qs_date,'%Y-%m') = date_format(now(),'%Y-%m')
     </select>
+<!--&#45;&#45;         and date_format(qs_date,'%Y-%m') = date_format(now(),'%Y-%m')-->
+
 
 
     <!-- 逾期发票 -->