From 975908717b85570df9408dace8d9352daf27a8b6 Mon Sep 17 00:00:00 2001 From: ic_excellent <2570192571@qq.com> Date: Thu, 27 Jul 2023 12:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bokang/xiao/sh_bigdata/service/ReportService.java | 4 ++-- .../com/api/bokang/xiao/zhenn/mapper/BankMapper.java | 2 +- .../api/bokang/xiao/zhenn/service/BankService.java | 11 +++++++++++ .../bokang/xiao/dloa/schedule/HrmSyncSchedule.java | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/api/bokang/xiao/sh_bigdata/service/ReportService.java b/src/main/java/com/api/bokang/xiao/sh_bigdata/service/ReportService.java index bc47347..423efda 100644 --- a/src/main/java/com/api/bokang/xiao/sh_bigdata/service/ReportService.java +++ b/src/main/java/com/api/bokang/xiao/sh_bigdata/service/ReportService.java @@ -52,11 +52,11 @@ public class ReportService { whereSql += " and dyjbr = #{param.registrationPeople} "; } if(!"".equals(flightAndTrain)){ - whereSql += " and hbcc like '%"+flightAndTrain+"%' "; + whereSql += " and hbwb like '%"+flightAndTrain+"%' "; } if(!"".equals(project)){ //whereSql += " and exits (select 1 from uf_zwfwdjjmb_dt1 where mainid = main.id and ysdx = #{param.project}) "; - whereSql += " and exits (select 1 from uf_zwfwdjjmb_dt1 where mainid = main.id and wb like '%"+project+"%') "; + whereSql += " and EXISTS (select 1 from uf_zwfwdjjmb_dt1 where mainid = main.id and wb like '%"+project+"%') "; } if(("".equals(beginDate) || "".equals(endDate)) && "".equals(registrationPeople) && "".equals(flightAndTrain)){ param.put("today", TimeUtil.getCurrentDateString()); diff --git a/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java b/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java index bbea146..d0df5b5 100644 --- a/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java +++ b/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java @@ -39,7 +39,7 @@ public interface BankMapper { */ @Select("SELECT t.requestid requestId,t.$t{amountField} amount,t.$t{amountField} outAmount," + " $t{inCompany} inCompany,wb.lastoperatedate outDate," + - " (select top 1 xmlsend from workflowToFinanceUrl where wb.requestid = t.requestId and xmlsend IS NOT NULL order by id desc) xmlsend " + + " (select top 1 xmlsend from workflowToFinanceUrl where requestid = t.requestId and xmlsend IS NOT NULL order by id desc) xmlsend " + "FROM $t{tableName} t " + "INNER JOIN workflow_requestbase wb ON t.requestid = wb.requestid " + "WHERE wb.currentnodetype = 3 " + diff --git a/src/main/java/com/api/bokang/xiao/zhenn/service/BankService.java b/src/main/java/com/api/bokang/xiao/zhenn/service/BankService.java index dfd4da3..e3fa78f 100644 --- a/src/main/java/com/api/bokang/xiao/zhenn/service/BankService.java +++ b/src/main/java/com/api/bokang/xiao/zhenn/service/BankService.java @@ -98,10 +98,14 @@ public class BankService { for (Map tempOut : tempOutList) { String xmlSend = Util.null2String(tempOut.get("xmlsend")); String insId = CommonUtil.getNodeValue(xmlSend, "insid"); + if(insId.length() > 12){ + insId = insId.substring(insId.length() - 12); + } tempOut.put("insId",insId); } return tempOutList.stream(); }) + .filter(item -> !"".equals(item.get("insid"))) .collect(Collectors.toList()); //List> oaOutOtherList = outOtherParam.stream().flatMap(item -> { // item.put("beginDate", Util.null2String(param.get("beginDate"))); @@ -152,6 +156,13 @@ public class BankService { .collect(Collectors.toList()); List> bankTempOutList = bankMapper.queryBankOutInfo(param); List> bankTempInList = bankMapper.queryBankInInfo(param); + log.info(Util.logStr("oaOutList =>{} \n oaOutOtherList =>{} \n oaInList =>{} \n bankTempOutList =>{} \n bankTempInList =>{} \n" + ,JSON.toJSONString(oaOutList) + ,JSON.toJSONString(oaOutOtherList) + ,JSON.toJSONString(oaInList) + ,JSON.toJSONString(bankTempOutList) + ,JSON.toJSONString(bankTempInList) + )); //将银行流水信息进行分组，有Insid为一组（走银企直联），无Insid（代收，划转）为一组 Map>> bankOutMap = bankTempOutList.stream().collect(Collectors.partitioningBy(item -> StringUtils.isNotBlank(Util.null2String(item.get("insid"))))); Map>> bankInMap = bankTempInList.stream().collect(Collectors.partitioningBy(item -> StringUtils.isNotBlank(Util.null2String(item.get("insid"))))); diff --git a/src/main/java/weaver/bokang/xiao/dloa/schedule/HrmSyncSchedule.java b/src/main/java/weaver/bokang/xiao/dloa/schedule/HrmSyncSchedule.java index 1c80ca2..d440501 100644 --- a/src/main/java/weaver/bokang/xiao/dloa/schedule/HrmSyncSchedule.java +++ b/src/main/java/weaver/bokang/xiao/dloa/schedule/HrmSyncSchedule.java @@ -163,6 +163,9 @@ public class HrmSyncSchedule extends CusBaseCronJob { logEntity.setRequestJson(JSON.toJSONString(requestParam)); if (syncType == 0) { logEntity.setSyncHrm(Util.null2String(syncMap.get("id"))); + if(dataType == 0){ + //TODO 判断人员部门是否是末级部门 + } } else { logEntity.setSyncDepart(Util.null2String(syncMap.get("id"))); }