ariesy 去掉慢sqlDATE_FORMAT

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -336,12 +336,14 @@ public class BaseInvoiceController extends AbstractController {
         }
 
         if (!StringHelper.isBlank(kpksrq)) {
-            pramsMap.put("kpksrq", kpksrq);
+            String morning = DateUtils.getMorning(DateUtils.strToDate(kpksrq));
+            pramsMap.put("kpksrq", morning);
         } else {
             return ResponseEntity.ok(R.error("开票开始日期不能为空！"));
         }
         if (!StringHelper.isBlank(kpjsrq)) {
-            pramsMap.put("kpjsrq", kpjsrq);
+            String night = DateUtils.getMorning(DateUtils.strToDate(kpjsrq));
+            pramsMap.put("kpjsrq", night);
         } else {
             return ResponseEntity.ok(R.error("开票结束日期不能为空！"));
         }

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

@@ -129,7 +129,7 @@
            and rzh_yesorno = '0' and date_format(t.invoice_date,'%Y-%m-%d') between #{wrzfpStart} and #{wrzfpEnd}
         </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}
+            and t.qs_date between #{qsksrq} and #{qsjsrq}
         </if>
         <if
                 test="rzksrq != null and rzksrq != '' and rzksrq != 'null' and rzjsrq != null and rzjsrq != '' and rzjsrq != 'null'">

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

@@ -11,6 +11,7 @@ import com.dxhy.common.service.DictdetaServcice;
 import com.dxhy.common.util.AmountFormatUtil;
 import com.dxhy.common.util.MathUtil;
 import com.dxhy.common.util.StringHelper;
+import com.dxhy.common.utils.DateUtils;
 import com.dxhy.common.vo.DictdetaModel;
 import com.dxhy.core.dao.ViolationMapper;
 import com.dxhy.core.model.*;
@@ -75,9 +76,7 @@ public class ViolationSearchServiceImpl implements ViolationSearchService {
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
 
         try {
-            @SuppressWarnings("unchecked")
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
-            String date = df.format(new Date());
+            String date = DateUtils.getNight(new Date());
             pramsMap.put("currentTime", date);
             List<String> gfshList = (List<String>)pramsMap.get("gfsh");
             if (gfshList.size() == 0) {

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

@@ -226,10 +226,12 @@ public class RzFpxxExportThread extends BaseThread {
                     pramsMap.put("rzzt", rzzt);
                     if ("1".equals(rzzt) || "2".equals(rzzt)) {
                         if (StringUtils.isNotBlank(rzksrq)) {
-                            pramsMap.put("rzksrq", rzksrq);
+                            String morning = DateUtils.getMorning(DateUtils.strToDate(kpksrq));
+                            pramsMap.put("rzksrq", morning);
                         }
                         if (StringUtils.isNotBlank(rzjsrq)) {
-                            pramsMap.put("rzjsrq", rzjsrq);
+                            String night = DateUtils.getMorning(DateUtils.strToDate(kpksrq));
+                            pramsMap.put("rzjsrq", night);
                         }
                         if (StringUtils.isNotBlank(skssq)) {
                             pramsMap.put("skssq", skssq);

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

@@ -95,7 +95,7 @@
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.bdk_status, t.ele_invoice_no,
         t.export_mark,t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.voucher_number
         from t_dx_record_invoice t
-        WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq}
+        WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'

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

@@ -13,8 +13,8 @@
     <select id="selectRiskSupplier" resultType="com.dxhy.core.model.RiskSupplierVO">
         select xf_tax_no taxNo,xf_name taxName,count(1) invoiceNum,sum(total_amount) invoiceAmount
         from t_dx_record_invoice
-        where illegal_supplier = '1'
-        and DATE_FORMAT(create_date,'%Y-%m-%d') BETWEEN '2000-01-01' and #{currentTime}
+        where create_date BETWEEN '2000-01-01 00:00:00' and #{currentTime}
+        and illegal_supplier = '1'
         and gf_tax_no in
         <foreach collection="gfsh" item="item" index="index" open="(" separator="," close=")">
             #{item}

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

@@ -262,7 +262,7 @@ public class SDNYMainProcessController extends AbstractController {
                     List<BaseTDxRecordInvoiceDetail> baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper);
                     DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ);
 
-                    if(baseTDxRecordInvoiceDetail != null && baseTDxRecordInvoiceDetail.size() == 0){
+                    if(baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0){
                         //先删除原有主数据,再查验更新主数据和明细数据
                         int delete = baseTDxRecordInvoiceDao.delete(recordWrapper);
                         if(delete > 0) {