From 71fd7cb55fe4b87ad95b0d309ce78d28b63916df Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 22 Aug 2023 14:28:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?ariesy=20=E7=A5=A8=E6=B1=A0=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/controller/ExcelController.java | 13 +------------ .../com/dxhy/core/thread/CustomExportThread.java | 9 +-------- .../com/dxhy/core/thread/QypcsmkpExportThread.java | 1 + .../src/main/resources/mapper/CustomsMapper.xml | 7 ++----- .../src/main/resources/mapper/TicketMapper.xml | 13 +------------ .../main/resources/mapper/ExtInvoicePoolMapper.xml | 2 -- .../src/main/resources/mapper/TicketMapper.xml | 5 ++--- 7 files changed, 8 insertions(+), 42 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java index d37ad1a6..08d36d26 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java @@ -231,18 +231,7 @@ public class ExcelController extends AbstractController { String newCondition = prams.toString(); pramsMap.put("conditions", newCondition); } else { - String gfmc = ""; - List org = getUserInfo().getOrg(); - if (org != null && org.size() > 0) { - for (Tax tax : org) { - if (tax.getTaxno().equals(gfsh)) { - gfmc = tax.getTaxname(); - } - } - } - prams.put("gfmc", gfmc); - String newCondition = prams.toString(); - pramsMap.put("conditions", newCondition); + prams.put("gfsh", gfsh); } } else { pramsMap.put("conditions", condition); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java index 9e98e09a..8c3f2132 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java @@ -176,15 +176,8 @@ public class CustomExportThread extends BaseThread { pramsMap.put("imageNumber",imageNumber); pramsMap.put("postingTimeEnd",postingTimeEnd); pramsMap.put("postingTimeStart",postingTimeStart); + pramsMap.put("gfsh", gfsh); - - List gfshList = new ArrayList<>(); - if (!StringHelper.isBlank(gfsh)) { - gfshList = StringHelper.stringToList(gfsh); - pramsMap.put("gfsh", gfshList); - } else { - pramsMap.put("gfsh", gfshList); - } if (!StringHelper.isBlank(customsCode)) { pramsMap.put("customsCode", customsCode); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index 48de0b06..e42ef5b0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -124,6 +124,7 @@ public class QypcsmkpExportThread extends BaseThread { prams.put("companyCodes",companyCodes); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + prams.put("gfsh", gfsh); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index 50dfc995..a007b033 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -50,10 +50,7 @@ data_sources from t_dx_customs_record t where export_mark = '0' - - - - + and t.gf_tax_no = #{gfsh} and t.customs_code like CONCAT('%',#{keyWord},'%') @@ -149,7 +146,7 @@ and t.account_period = #{accountPeriod} - and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null) + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) order by t.fill_in_date desc diff --git a/dxhy-core/src/main/resources/mapper/TicketMapper.xml b/dxhy-core/src/main/resources/mapper/TicketMapper.xml index cd8932f6..e88bbacb 100644 --- a/dxhy-core/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TicketMapper.xml @@ -113,19 +113,8 @@ and t.sn_voucher_number = #{snVoucherNumber} - - 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 is null or t.comp_code = '') + and (t.comp_code = #{companyCode} or t.comp_code is null or t.comp_code = '') diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 1fd45482..65eaef0f 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -281,7 +281,6 @@ t_dx_invoice_reimburse where invoice_type in ('91','94','95','00','97','98','101','102','103','99') - and gf_tax_no = #{gfsh} and (comp_code = #{companyCode} or comp_code = '' or comp_code is null) AND create_date between #{cjksyf} and #{cjjsyf} @@ -363,7 +362,6 @@ t_dx_invoice_reimburse where invoice_type in ('91','94','95','00','97','98','101','102','103','99') - and gf_tax_no = #{gfsh} and (comp_code = #{companyCode} or comp_code = '' or comp_code is null) AND create_date between #{cjksyf} and #{cjjsyf} diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index b41d970e..1a31fbb5 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -12,9 +12,8 @@ resultMap="InvoicePoolHjResultMap" databaseId="mysql"> select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_invoice_reimburse t - where t.gf_tax_no = #{gfsh} + where 1=1 and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) - and t.invoice_date between #{kpksrq} and #{kpjsrq} @@ -82,7 +81,7 @@ resultType="com.dxhy.extend.entity.ExtTicketInvoiceModel" databaseId="mysql"> select * from t_dx_invoice_reimburse t - where t.gf_tax_no = #{gfsh} + where 1=1 and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) and t.invoice_date between #{kpksrq} and #{kpjsrq} From 80745feb3ebe375e49e592c96540cc6acd123bc4 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 22 Aug 2023 20:19:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?ariesy=20=E9=80=92=E5=BD=92=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E8=BF=9B=E9=A1=B9=E7=A8=8E=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml | 3 +++ dxhy-core/src/main/resources/mapper/QsxxMapper.xml | 2 +- .../service/caution/ExtCautionExpirationServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml index a54f165f..8e9064ef 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml @@ -61,6 +61,9 @@ and t.invoice_source = #{invoiceSource} + + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + order by t.invoice_date desc diff --git a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml index cde4c27d..b7ccad96 100644 --- a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml @@ -31,7 +31,7 @@ t.id,t.notes,t.qs_type,t.gf_name,t.xf_name,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no ,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name ,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code - from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid + from t_dx_invoice t left join t_dx_record_invoice r on t.uuid = r.uuid WHERE t.valid = '1' and t.user_account = #{userid} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java index d4d0de03..ea0286ec 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java @@ -213,7 +213,7 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl Date: Tue, 22 Aug 2023 21:06:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?ariesy=20=E6=8E=A8=E9=80=81sap=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E5=A0=B1=E9=8C=AF=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 7 ++++--- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 008e54f5..17b66682 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -25,6 +25,7 @@ import com.dxhy.erp.utils.HmacSHA1Util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.*; @@ -927,7 +928,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT))); + return ResponseEntity.status(HttpStatus.GATEWAY_TIMEOUT).body(JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT))); } catch(NullPointerException exception){ log.error("同步SAP失败,报错信息为:{}", exception); exception.printStackTrace(); @@ -940,7 +941,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT))); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT))); } catch(Exception exception){ log.error("同步SAP失败,报错信息为:{}", exception); exception.printStackTrace(); @@ -953,7 +954,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); } } 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 e1da36d4..a2972213 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 @@ -770,7 +770,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setInvoiceType(fplxdm); reimburse.setInvoiceCode(invoice.getInvoiceCode()); reimburse.setInvoiceNo(invoice.getInvoiceNumber()); - reimburse.setInvoiceDate(invoice.getBillingDate()); + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = formatter.format(new Date()); + + reimburse.setInvoiceDate(StringUtils.isEmpty(invoice.getBillingDate()) ? dateString : invoice.getBillingDate()); + reimburse.setPassenger(invoice.getRiderName()); if (invoice.getTotalAmount() != null) { reimburse.setInvoiceAmount(new BigDecimal(invoice.getTotalAmount())); From ce8c3fa6351b84af0a911d33040bd41e18cd51c9 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 22 Aug 2023 22:18:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?ariesy=20=E6=8E=A8=E9=80=81sap=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E5=A0=B1=E9=8C=AF=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/FpmxExportThread.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpmxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpmxExportThread.java index ba973084..0120feb3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpmxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpmxExportThread.java @@ -104,6 +104,7 @@ public class FpmxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String xfmc = prams.getString("xfmc"); String invoiceType = prams.getString("invoiceType"); String kpksrq = prams.getString("kpksrq"); @@ -125,6 +126,7 @@ public class FpmxExportThread extends BaseThread { pramsMap.put("gfsh", gfshList); } pramsMap.put("xfmc", xfmc); + pramsMap.put("companyCode", companyCode); if (!StringHelper.isBlank(invoiceType)) { if (!"99".equals(invoiceType)) { pramsMap.put("invoiceType", invoiceType); From 7e7945536d315d2ec6d7923c33cdb032b468b81a Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 23 Aug 2023 09:13:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?ariesy=20=E7=B0=BD=E6=94=B6=E5=B0=8E?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/export/impl/ExportCautionServiceImpl.java | 8 +++----- .../src/main/resources/mapper/TDxCustomsRecordMapper.xml | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java index d9d85fbc..74da9d6c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java @@ -79,12 +79,10 @@ public class ExportCautionServiceImpl extends MpBaseServiceImpl 0) { - queryWrapper.lambda().in(TDxRecordInvoice::getGfTaxNo, reqVO.getAllTaxNo()); - } + queryWrapper.eq("gf_tax_no",reqVO.getGfsh()); + queryWrapper.eq("comp_code",reqVO.getCompanyCode()); // 发票号码 if (!StringHelper.isBlank(reqVO.getInvoiceNo())) { queryWrapper.lambda().eq(TDxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo()); diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml index 4181b9a0..0a9fabd7 100644 --- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml @@ -1034,7 +1034,7 @@ t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code where t.user_account = #{queryParams.userAccount} - and t.gf_tax_no =#{gfsh} + and t.gf_tax_no =#{queryParams.gfsh} and t.comp_code =#{companyCode} From 69c63eb59be2bda1849e7c5d69f5f5073c81b76e Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 23 Aug 2023 10:07:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?ariesy=20=E7=B9=B3=E6=AC=BE=E6=9B=B8?= =?UTF-8?q?=E8=AA=8D=E8=AD=89=E6=9F=A5=E8=A9=A2=E5=B0=8E=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/TDxCustomsRecordMapper.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml index 0a9fabd7..f62c41d7 100644 --- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml @@ -437,14 +437,14 @@ p.cxrz_status as cxrzStatus, p.bdk_status as bdkStatus, p.dept_name as businessName, - t.sn_voucher_number as snVoucherNumber, - t.posting_time as postingTime, - t.image_id as imageId, - t.account_period as account_period, - t.bzdh, - t.bzr, - t.inaccount_status as inaccountStatus, - t.comp_code as compCode + p.sn_voucher_number as snVoucherNumber, + p.posting_time as postingTime, + p.image_id as imageId, + p.account_period as account_period, + p.bzdh, + p.bzr, + p.inaccount_status as inaccountStatus, + p.comp_code as compCode FROM t_dx_customs_record p where