This commit is contained in:
linfso 2025-01-05 13:47:02 +08:00
parent 28f5c0a2e5
commit a61e6e09be

View File

@ -11,31 +11,32 @@
package com.xdadan.erp.web.emis;
import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.NoticeUtils;
import com.xdadan.erp.emis.domain.EmisCommissionProfit;
import com.xdadan.erp.emis.domain.EmisSettleBill;
import com.xdadan.erp.emis.domain.EmisSite;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.BillPayStatInfo;
import com.xdadan.erp.emis.domain.vo.AddressParseResult;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisElectronicPagService;
import com.xdadan.erp.emis.service.IEmisRegionService;
import com.xdadan.erp.emis.service.IEmisWaybillService;
import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.service.kefu.RL7moorService;
import com.xdadan.erp.system.domain.SysNotice;
import com.xdadan.erp.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.*;
/**
* Statistics 公共 Controller
@ -57,6 +58,12 @@ public class EmisCommonToolsController extends EmisBaseController
@Autowired
private EmisBaseService emisBaseService;
@Autowired
private IEmisCommissionProfitService emisCommissionProfitService;
@Autowired
private IEmisSettleBillService emisSettleBillService;
@ -93,15 +100,33 @@ public class EmisCommonToolsController extends EmisBaseController
// List<Map> statList=emisBaseService.selectCommissionStatData(getLoginUser().getUser().getEmpCode());
Map commissionStatMap = new HashMap();
int estMoney=(int)(Math.random()*10000+100);
// commissionStatMap.put("estMoney", (float)estMoney+0.80f);
// commissionStatMap.put("waitPay", (float)(estMoney-100)+0.80f);
commissionStatMap.put("estMoney", 0.0f);
commissionStatMap.put("waitPay", 0.0f);
String billMonth=DateUtils.parseDateToStr(DateUtils.YYYY_MM,new Date());
// 计提预估
String empName=getLoginUser().getUser().getEmpName();
EmisCommissionProfit emisCommissionProfit = new EmisCommissionProfit();
emisCommissionProfit.setEmpName(empName);
emisCommissionProfit.setBillMonth(billMonth);
List<EmisCommissionProfit> listProfit= emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
if(!CollectionUtils.isEmpty(listProfit)){
EmisCommissionProfit item0=listProfit.get(0);
commissionStatMap.put("estMoney",item0.getMoney().stripTrailingZeros().toPlainString());
}
// 待回款
EmisSettleBill emisSettleBill=new EmisSettleBill();
emisSettleBill.getParams().put("isNeedRecdPay",1);
emisSettleBill.setSalesmen(empName);
emisSettleBill.setBillMonth(billMonth);
List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill);
if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){
BillPayStatInfo item0=listExpireNoPayStatInfo.get(0);
commissionStatMap.put("waitPay",item.getNoRecdPayMoney().stripTrailingZeros().toPlainString());
}
statMap.put("commStat",commissionStatMap);