|
@@ -11,10 +11,12 @@ import com.ruoyi.basicData.domain.TFees;
|
|
|
import com.ruoyi.basicData.mapper.TCorpsMapper;
|
|
|
import com.ruoyi.basicData.mapper.TFeesMapper;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
+import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
import com.ruoyi.common.exception.BaseException;
|
|
|
import com.ruoyi.common.exception.WarehouseException;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
+import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.system.domain.SysConfig;
|
|
|
import com.ruoyi.system.mapper.SysConfigMapper;
|
|
@@ -699,11 +701,17 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public Map<String, Object> biContractCount() {
|
|
|
+ public Map<String, Object> biContractCount(Long customerId) {
|
|
|
String beginDate = DateUtils.today() + " 00:00:00";
|
|
|
String endDate = DateUtils.offsetMonth(2) + " 23:59:59";
|
|
|
|
|
|
- return tWarehouseAgreementMapper.biContractCount(beginDate, endDate);
|
|
|
+ String external = null;
|
|
|
+ SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
+ if ("外部用户".equals(user.getDept().getDeptName())) {
|
|
|
+ external = user.getUserName();
|
|
|
+ }
|
|
|
+
|
|
|
+ return tWarehouseAgreementMapper.biContractCount(beginDate, endDate, external, customerId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -712,8 +720,14 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
|
|
|
* @return 仓储费集合
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> biContractList() {
|
|
|
- return tWarehouseAgreementMapper.biContractList();
|
|
|
+ public List<Map<String, Object>> biContractList(Long customerId) {
|
|
|
+ String external = null;
|
|
|
+ SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
+ if ("外部用户".equals(user.getDept().getDeptName())) {
|
|
|
+ external = user.getUserName();
|
|
|
+ }
|
|
|
+
|
|
|
+ return tWarehouseAgreementMapper.biContractList(external, customerId);
|
|
|
}
|
|
|
|
|
|
}
|