|
@@ -2,17 +2,21 @@ package com.ruoyi.reportManagement.service.impl;
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.github.pagehelper.PageHelper;
|
|
|
import com.ruoyi.basicData.domain.TCustomerContact;
|
|
|
import com.ruoyi.basicData.mapper.TCustomerContactMapper;
|
|
|
import com.ruoyi.basicData.mapper.TWarehouseMapper;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.domain.entity.TWarehouse;
|
|
|
+import com.ruoyi.common.core.page.PageDomain;
|
|
|
+import com.ruoyi.common.core.page.TableSupport;
|
|
|
import com.ruoyi.common.exception.WarehouseException;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.DictUtils;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
+import com.ruoyi.common.utils.sql.SqlUtil;
|
|
|
import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
|
|
|
import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
|
|
|
import com.ruoyi.reportManagement.domain.TWhgenleg;
|
|
@@ -486,12 +490,11 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg) {
|
|
|
- List<Map<String, Object>> list;
|
|
|
+ public List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg, Integer pageNum, Integer pageSize) {
|
|
|
TCustomerContact customerContact = new TCustomerContact();
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
if ("外部用户".equals(user.getDept().getDeptName())) {
|
|
|
- customerContact.setfTel(SecurityUtils.getLoginUser().getUser().getPhonenumber());
|
|
|
+ customerContact.setfTel(SecurityUtils.getLoginUser().getUser().getUserName());
|
|
|
List<TCustomerContact> tCustomerContacts = customerContactMapper.selectTCustomerContactList(customerContact);
|
|
|
if (CollectionUtils.isNotEmpty(tCustomerContacts)) {
|
|
|
tWhgenleg.setfCorpid(tCustomerContacts.get(0).getfPid());
|
|
@@ -506,11 +509,11 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
tWhgenleg.setfLocation(0L);
|
|
|
}
|
|
|
}
|
|
|
- list = tWhgenlegMapper.selectInventoryMapList(tWhgenleg);
|
|
|
- if ("admin".equals(SecurityUtils.getUsername())) {
|
|
|
- list = tWhgenlegMapper.selectInventoryMapList(tWhgenleg);
|
|
|
+
|
|
|
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
|
}
|
|
|
- return list;
|
|
|
+ return tWhgenlegMapper.selectInventoryMapList(tWhgenleg);
|
|
|
}
|
|
|
|
|
|
/**
|