From 30d657de5289e7f696b7638b2087b7e7000598c7 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 5 Jun 2023 10:17:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=8C=89=E7=85=A7=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtFpzhcxController.java | 12 +++++ .../main/resources/mapper/ExtBbfpzhMapper.xml | 53 ++++++++++++++++--- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index d9456436..3746f625 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -3,6 +3,7 @@ package com.dxhy.extend.controller; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.StringHelper; import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.DateUtils; import com.dxhy.common.utils.R; @@ -115,6 +116,17 @@ public class ExtFpzhcxController extends AbstractController { } pramsMap.put("gfsh", gfshList); + String companyCode = (String) pramsMap.get("companyCode"); + if (org.apache.commons.lang3.StringUtils.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织机构====>{}",pramsMap.get("companyCodes")); + } + if (StringUtils.isNotBlank(companyCode)){ + pramsMap.put("companyCode",companyCode); + }else { + return ResponseEntity.ok(R.error("所属组织不能为空")); + } + if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) { pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString()))); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index a565392a..10146aa9 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -70,10 +70,28 @@ t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period from t_dx_record_invoice t WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq} - and t.gf_tax_no in - - #{item} - + + + and t.gf_tax_no in + + #{item} + + + + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + and t.bzdh = #{bzdh} @@ -331,10 +349,29 @@ select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_record_invoice t where t.invoice_date between #{kpksrq} and #{kpjsrq} - and t.company = #{company} and t.gf_tax_no in - - #{item} - + and t.company = #{company} + + + and t.gf_tax_no in + + #{item} + + + + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + and t.invoice_status = #{invoiceStatus} From eaa952843065be85f55ad698eaec2e89e56f342c Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 5 Jun 2023 10:53:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A8=8E=E5=8F=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtFpzhcxController.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index 3746f625..86b5b841 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -116,6 +116,14 @@ public class ExtFpzhcxController extends AbstractController { } pramsMap.put("gfsh", gfshList); + boolean flag = checkList(gfshList); + + if (flag){ + pramsMap.put("sign","88"); + }else { + pramsMap.put("sign","99"); + } + String companyCode = (String) pramsMap.get("companyCode"); if (org.apache.commons.lang3.StringUtils.isNotBlank(companyCode) && "99".equals(companyCode)){ pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); @@ -211,6 +219,25 @@ public class ExtFpzhcxController extends AbstractController { } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } + /** * 报表异常发票查询 * From b0eae65fa3e7cd92ed98cef01f49aae72689c7af Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 5 Jun 2023 14:15:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96date=5Fformat=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/BaseSggxcxMapper.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index f4ba951e..c64a71af 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -71,7 +71,7 @@ t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq - 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.rzh_yesorno = '0' and t.auth_status in('0','5','6') @@ -81,14 +81,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') and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount <0 or t.tax_amount <0 or - date_format(t.invoice_date,'%Y%m%d') <= c.select_start_date or - date_format(t.invoice_date,'%Y%m%d') >= + t.invoice_date <= c.select_start_date or + t.invoice_date >= c.select_end_date or d.tj_status in ('1','2')) @@ -395,7 +395,7 @@ select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq - 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.rzh_yesorno = '0' and t.auth_status in('0','5','6') @@ -408,14 +408,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') and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount <0 or t.tax_amount <0 or - date_format(t.invoice_date,'%Y%m%d') <= c.select_start_date or - date_format(t.invoice_date,'%Y%m%d') >= + t.invoice_date <= c.select_start_date or + t.invoice_date >= c.select_end_date or d.tj_status in ('1','2')) From abbbdeb0553eb5b76fb4b6acd9ff0da5ae7f5e9c Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 5 Jun 2023 14:49:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=81=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96date=5Fformat=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 4 ++-- dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml | 3 ++- dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 714c6539..18b4e39f 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -73,7 +73,7 @@ bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date, voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id 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' @@ -353,7 +353,7 @@ resultMap="RzcxhjResultMap" databaseId="mysql"> select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse 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.auth_status != '0' and t.bdk_status in ('1','2') diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 10146aa9..7cdc8932 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -69,7 +69,8 @@ t.settlement_no,t.inaccount_status,t.bzdh, t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period from t_dx_record_invoice t - WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq} + WHERE t.company = #{company} + and t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no in diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 3915015b..60b6c659 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -182,7 +182,7 @@ where t.invoice_status != '0' and t.invoice_type in ('01','03','08','14','31') and t.company = #{company} - and DATE_FORMAT(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} + and t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no in #{item}