Browse Source

资金预警需求:
1.修改代码引用类,删除没有引用的类

lisheng 3 weeks ago
parent
commit
27c8bfef5e

+ 1 - 1
main/java/kd/cosmic/jkjt/tmc/bei/common/FeishuSendMessageUtils.java

@@ -3,7 +3,6 @@ package kd.cosmic.jkjt.tmc.bei.common;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.kingdee.bos.util.backport.Collections;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.utils.StringUtils;
@@ -22,6 +21,7 @@ import kd.cosmic.jkjt.msg.feishu.UUIDUtil;
 import kd.cosmic.jkjt.tmc.bei.common.entity.MsgWarnMessageInfo;
 
 import java.rmi.ConnectException;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

+ 0 - 3
main/java/kd/cosmic/jkjt/tmc/bei/report/plugin/DailyReimQueryListDataPlugin.java

@@ -1,9 +1,6 @@
 package kd.cosmic.jkjt.tmc.bei.report.plugin;
 
-import kd.bos.algo.Algo;
 import kd.bos.algo.DataSet;
-import kd.bos.algo.DataType;
-import kd.bos.algo.RowMeta;
 import kd.bos.entity.report.AbstractReportListDataPlugin;
 import kd.bos.entity.report.FilterInfo;
 import kd.bos.entity.report.FilterItemInfo;

+ 0 - 2
main/java/kd/cosmic/jkjt/tmc/bei/task/DailyReimMsgWarnTask.java

@@ -1,7 +1,6 @@
 package kd.cosmic.jkjt.tmc.bei.task;
 
 import kd.bos.algo.DataSet;
-import kd.bos.algo.Row;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -20,7 +19,6 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.workflow.engine.msg.info.MessageInfo;
 import kd.cosmic.jkjt.tmc.bei.common.CommonUtils;
-import kd.cosmic.jkjt.tmc.bei.common.DateUtils;
 import kd.cosmic.jkjt.tmc.bei.common.FeishuSendMessageUtils;
 import kd.cosmic.jkjt.tmc.bei.common.constant.BeiBeTransDetailConstant;
 import kd.cosmic.jkjt.tmc.bei.common.constant.MsgWarnConfigConstant;

+ 0 - 2
main/java/kd/cosmic/jkjt/tmc/bei/task/DailyReimNightMsgWarnTask.java

@@ -18,7 +18,6 @@ import kd.bos.schedule.executor.AbstractTask;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.workflow.engine.msg.info.MessageInfo;
-import kd.cosmic.jkjt.tmc.bei.common.CommonUtils;
 import kd.cosmic.jkjt.tmc.bei.common.DateUtils;
 import kd.cosmic.jkjt.tmc.bei.common.FeishuSendMessageUtils;
 import kd.cosmic.jkjt.tmc.bei.common.constant.BeiBeTransDetailConstant;
@@ -28,7 +27,6 @@ import kd.cosmic.jkjt.tmc.bei.common.entity.MsgWarnMessageInfo;
 import kd.cosmic.jkjt.tmc.bei.common.enums.MsgWarnTypeEnum;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 

+ 3 - 5
main/java/kd/cosmic/jkjt/tmc/bei/task/OtherAccountMsgWarnTask.java

@@ -69,12 +69,7 @@ public class OtherAccountMsgWarnTask extends AbstractTask implements StopTask {
         List<Long> receiverIdList = new ArrayList<>();
         receiverIdList.add(financeDirectors.getLong("id"));
         receiverIdList.add(financeLeader.getLong("id"));
-        // 获取昨天晚上九点到第二天早上九点的数据
         Date beginDate = DateUtils.getMinutesBefore(changeMinute);
-        // 获取公司下,发生笔数超过20笔的账户
-        // 最大交易次数默认20
-        int maxTimes = 20;
-        BigDecimal maxAmount = new BigDecimal("100000000");
         DynamicObjectCollection transDetailData = getTransDetailData(company, beginDate);
         if(transDetailData == null || transDetailData.isEmpty()){
             BizLog.log("没有符合条件的数据,不进行消息发送。");
@@ -141,6 +136,9 @@ public class OtherAccountMsgWarnTask extends AbstractTask implements StopTask {
         if(beginDate != null){
             filterList.add(new QFilter(BeiBeTransDetailConstant.KEY_BIZTIME, QFilter.large_equals, beginDate));
         }
+        // 除默认付款付之外的付款
+        filterList.add(new QFilter("accountbank.isdefaultpay", QFilter.equals, false));
+
         return QueryServiceHelper.queryDataSet(this.getClass().getName() ,BeiBeTransDetailConstant.ENTITYID,
                 "id,billno,company.name,accountbank.name,accountbank.bankaccountnumber,bank.name,debitamount,oppunit,description,bizdate,biztime",
                 filterList.toArray(new QFilter[0]),"bizdate desc");