This commit is contained in:
linfso 2025-04-24 09:51:10 +08:00
parent a801ee8847
commit 1cd38d53f8
2 changed files with 37 additions and 24 deletions

View File

@ -24,6 +24,7 @@ import com.xdadan.erp.common.utils.SecurityUtils;
import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo;
import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo;
import com.xdadan.erp.emis.domain.vo.AddressParseResult; import com.xdadan.erp.emis.domain.vo.AddressParseResult;
import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.service.kefu.RL7moorService; import com.xdadan.erp.emis.service.kefu.RL7moorService;
@ -1126,9 +1127,9 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoDoGenerateNotifyTrigger") @GetMapping("/autoDoGenerateNotifyTrigger")
public AjaxResult autoDoSendNotifyTrigger() { public AjaxResult autoDoSendNotifyTrigger() {
// 0.催款,有超期回款的5分钟催一次 // 0.催款,有超期回款的5分钟催一次
EmisSettleBill emisSettleBill=new EmisSettleBill(); EmisSettleBill queryRecBill=new EmisSettleBill();
emisSettleBill.getParams().put("isNeedRecdPay",1); queryRecBill.getParams().put("isNeedRecdPay",1);
List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill); List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(queryRecBill);
if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){ if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){
for (BillPayStatInfo item:listExpireNoPayStatInfo) { for (BillPayStatInfo item:listExpireNoPayStatInfo) {
String salesmen=item.getSalesmen(); String salesmen=item.getSalesmen();
@ -1139,16 +1140,22 @@ public class EmisCommonController extends EmisBaseController
} }
} }
// 1.销售开票统计通知 // 1.销售开票统计通知
EmisSettleBill queryInvoice=new EmisSettleBill();
queryInvoice.getParams().put("isNeedRecdInvoice",1);
List<OpenBillStatInfo> listExpireNoInvoiceStatInfo = emisSettleBillService.selectOpenBillStatInfoList(queryInvoice);
if(!CollectionUtils.isEmpty(listExpireNoInvoiceStatInfo)){
for (OpenBillStatInfo item:listExpireNoInvoiceStatInfo) {
String salesmen=item.getSalesmen();
String billMonth=item.getBillMonth();
String msg="截止"+DateUtils.parseDateToStr("yyyy-MM-dd HH点",new Date())+"有账单未开票,尽快联系客户开票,账期:"+billMonth+",待收:"+item.getNoRecdPayMoney()+"元,超期:"+item.getExpiredNoRecdPayMoney()+"元!";
AjaxResult rst=NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3);
log.info(msg);
}
}
// 2.开票收款统计通知 // 2.开票收款统计通知
// sysNoticeService.
// if(empcodes!=null && empcodes.length>0) { // if(empcodes!=null && empcodes.length>0) {
// for(int i=0;i<empcodes.length;i++){ // for(int i=0;i<empcodes.length;i++){
// String empCode=empcodes[i]; // String empCode=empcodes[i];

View File

@ -273,7 +273,8 @@
<select id="selectOpenBillStatInfoList" parameterType="EmisSettleBill" resultMap="OpenBillStatInfoResult"> <select id="selectOpenBillStatInfoList" parameterType="EmisSettleBill" resultMap="OpenBillStatInfoResult">
select tba.salesmen, select
tba.salesmen,
tba.billMonth, tba.billMonth,
tba.totalBillCount, tba.totalBillCount,
tbb.hasOpenBillCount, tbb.hasOpenBillCount,
@ -385,6 +386,11 @@
group by salesmen,bill_month group by salesmen,bill_month
) tbd on tba.salesmen=tbd.salesmen and tba.billMonth=tbd.billMonth ) tbd on tba.salesmen=tbd.salesmen and tba.billMonth=tbd.billMonth
where 1=1
<if test="params.isNeedRecdInvoice != null and params.isNeedRecdInvoice == 1">
and tbb.noOpenBillCount <![CDATA[ > ]]> 0
</if>
</select> </select>