From bca80202fca7cd7ba46a2015b540fffdcb66e349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 24 Nov 2023 08:56:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E9=A1=B9?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E4=B8=8E=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/controller/ExtIndexController.java | 13 ++++---- .../mapper/index/ExtIndexStatisticsMapper.xml | 31 ++++--------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 7922769d..1f27c63f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -241,19 +241,20 @@ public class ExtIndexController extends AbstractController { log.info("任务提醒入参为{}",pramsMap); log.info("首页-任务提醒,params {}", pramsMap); - pramsMap.put("dbName", getUserInfo().getDbName()); - List taxno = getTaxno(); - if (taxno != null && taxno.size() > 0) { - pramsMap.put("taxno", taxno); + + + try { Map map = new HashMap<>(16); List listVO = indexStatisticsService.getInvoiceTaskReminding(pramsMap); for (ExtIndexInvoiceTaskRemindingModel vo : listVO) { map.put(vo.getWarningType(), vo.getCountNum()); } return ResponseEntity.ok(R.ok().put("data", map)); - } else { - return ResponseEntity.ok(R.ok().put("data", "")); + }catch (Exception e) { + return ResponseEntity.ok(R.ok().put("data","")); } + + } /** diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml index 8700e249..21a9136d 100644 --- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml @@ -1636,13 +1636,8 @@ 'ycfpWarning' warningType from t_dx_record_invoice - where gf_tax_no in - - - #{item} - - + where gf_tax_no = #{paramsData.gfsh} + and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null) and invoice_status != 0 and invoice_type in ('01','03','08','14','31') and company = #{paramsData.company} @@ -1679,14 +1674,8 @@ 'rzhyc' warningType from t_dx_record_invoice - where - gf_tax_no in - - - #{item} - - + where gf_tax_no = #{paramsData.gfsh} + and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null) and invoice_status != '0' and (rzh_yesorno = '1' or rzh_yesorno = '2') and invoice_type in ('01','03','08','14','31') @@ -1702,20 +1691,12 @@ 'qshyc' warningType from t_dx_record_invoice - where - gf_tax_no in - - - #{item} - - + where gf_tax_no = #{paramsData.gfsh} + and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null) and invoice_status != '0' and qs_status = '1' and invoice_type in ('01','03','08','14','31') - and company = #{paramsData.company} - and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq} From 233a8b99a865cd56e4badfc138a0ef30d1db84af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 24 Nov 2023 09:26:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/extend/controller/ExtIndexController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 1f27c63f..16561d7c 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -251,6 +251,7 @@ public class ExtIndexController extends AbstractController { } return ResponseEntity.ok(R.ok().put("data", map)); }catch (Exception e) { + log.error("首页任务提醒错误信息 :{}",e); return ResponseEntity.ok(R.ok().put("data","")); } From 315043b095da23502678b5f5c2d04e83442bc2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 24 Nov 2023 09:30:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=B8=A4=E9=A1=B9=E4=B9=9F=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/index/ExtIndexStatisticsMapper.xml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml index 21a9136d..194712ef 100644 --- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml @@ -1622,11 +1622,7 @@ and period_add(tdtc.current_tax_period, 1) >= date_format (date_add(invoice_date, interval 360 day), '%Y%m') and date_format(invoice_date, '%Y%m%d') >= tdtc.select_start_date - AND t.gf_tax_no IN - - #{item} - + AND t.gf_tax_no = #{paramsData.gfsh}