1.修改分页相关代码

master
x_z 3 years ago
parent c747c4b55a
commit 896c73a563

@ -1,6 +1,5 @@
package com.glxp.udi; package com.glxp.udi;
import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
@ -9,7 +8,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement @EnableTransactionManagement
@SpringBootApplication(exclude = PageHelperAutoConfiguration.class) @SpringBootApplication
public class ApiAdminApplication extends SpringBootServletInitializer { public class ApiAdminApplication extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {

@ -31,6 +31,7 @@ public class MybatisPlusConfig {
paginationInnerInterceptor.setMaxLimit(-1L); paginationInnerInterceptor.setMaxLimit(-1L);
// 分页合理化 // 分页合理化
paginationInnerInterceptor.setOverflow(true); paginationInnerInterceptor.setOverflow(true);
paginationInnerInterceptor.setOptimizeJoin(true);
//设置分页插件属性 //设置分页插件属性
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty("helperDialect", "mysql"); properties.setProperty("helperDialect", "mysql");

@ -1,6 +1,7 @@
package com.glxp.udi.admin.controller.auth; package com.glxp.udi.admin.controller.auth;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
@ -73,7 +74,7 @@ public class AuthAdminController {
} }
authAdminQueryRequest.setIds(ids); authAdminQueryRequest.setIds(ids);
} }
Page<AuthAdmin> page = authAdminService.listAdminPage(authAdminQueryRequest); IPage<AuthAdmin> page = authAdminService.listAdminPage(authAdminQueryRequest);
// 查询所有的权限 // 查询所有的权限
@ -311,7 +312,7 @@ public class AuthAdminController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/admin/auth/admin/getUserList") @GetMapping("/admin/auth/admin/getUserList")
public BaseResponse getUserList(QueryRequest queryRequest) { public BaseResponse getUserList(QueryRequest queryRequest) {
Page<AuthAdmin> page = authAdminService.getUserList(queryRequest); IPage<AuthAdmin> page = authAdminService.getUserList(queryRequest);
PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setList(page.getRecords());

@ -1,7 +1,7 @@
package com.glxp.udi.admin.controller.auth; package com.glxp.udi.admin.controller.auth;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.auth.AuthPermission; import com.glxp.udi.admin.entity.auth.AuthPermission;
@ -59,7 +59,7 @@ public class AuthRoleController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Page<AuthRole> authRolePage = authRoleService.listAdminPage(authRoleQueryRequest); IPage<AuthRole> authRolePage = authRoleService.listAdminPage(authRoleQueryRequest);
List<AuthRoleResponse> authRoleResponseList = authRolePage.getRecords().stream().map(item -> { List<AuthRoleResponse> authRoleResponseList = authRolePage.getRecords().stream().map(item -> {
AuthRoleResponse authRoleResponse = new AuthRoleResponse(); AuthRoleResponse authRoleResponse = new AuthRoleResponse();
BeanUtils.copyProperties(item, authRoleResponse); BeanUtils.copyProperties(item, authRoleResponse);

@ -1,7 +1,7 @@
package com.glxp.udi.admin.controller.auth; package com.glxp.udi.admin.controller.auth;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.auth.CustomerDetailEntity; import com.glxp.udi.admin.entity.auth.CustomerDetailEntity;
@ -49,7 +49,7 @@ public class CustomerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("udi/customer/list") @GetMapping("udi/customer/list")
public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) { public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) {
Page<CustomerDetailEntity> page = customerInfoService.filterDetailCustomer(customerFilterRequest); IPage<CustomerDetailEntity> page = customerInfoService.filterDetailCustomer(customerFilterRequest);
List<CustomerDetailResponse> responses = new ArrayList<>(page.getRecords().size()); List<CustomerDetailResponse> responses = new ArrayList<>(page.getRecords().size());
for (CustomerDetailEntity customerDetailEntity : page.getRecords()) { for (CustomerDetailEntity customerDetailEntity : page.getRecords()) {

@ -1,6 +1,7 @@
package com.glxp.udi.admin.controller.basic; package com.glxp.udi.admin.controller.basic;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
@ -59,7 +60,7 @@ public class BussinessTypeController {
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true); bussinessTypeFilterRequest.setSpUse(true);
} }
Page<BussinessTypeEntity> page = bussinessTypeService.filterList(bussinessTypeFilterRequest); IPage<BussinessTypeEntity> page = bussinessTypeService.filterList(bussinessTypeFilterRequest);
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setList(page.getRecords());
@ -83,7 +84,7 @@ public class BussinessTypeController {
} }
bussinessTypeFilterRequest.setCustomerId(customerId); bussinessTypeFilterRequest.setCustomerId(customerId);
bussinessTypeFilterRequest.setEnabled(true); bussinessTypeFilterRequest.setEnabled(true);
Page<BussinessTypeEntity> page = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest); IPage<BussinessTypeEntity> page = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setList(page.getRecords());

@ -2,7 +2,7 @@ package com.glxp.udi.admin.controller.inout;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.ConstantType; import com.glxp.udi.admin.constant.ConstantType;
@ -61,7 +61,7 @@ public class InvProductsController {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(filterInvProductRequest.getNameCode()); filterUdiInfoRequest.setNameCode(filterInvProductRequest.getNameCode());
filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName()); filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName());
Page<UdiInfoEntity> page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
List<String> uuids = new ArrayList<>(); List<String> uuids = new ArrayList<>();
for (UdiInfoEntity udiInfoEntity : page.getRecords()) { for (UdiInfoEntity udiInfoEntity : page.getRecords()) {
uuids.add(udiInfoEntity.getUuid()); uuids.add(udiInfoEntity.getUuid());
@ -106,7 +106,7 @@ public class InvProductsController {
filterUdiInfoRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); filterUdiInfoRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
} }
filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName()); filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName());
Page<UdiInfoEntity> page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
List<String> uuids = new ArrayList<>(); List<String> uuids = new ArrayList<>();
for (UdiInfoEntity udiInfoEntity : page.getRecords()) { for (UdiInfoEntity udiInfoEntity : page.getRecords()) {
uuids.add(udiInfoEntity.getUuid()); uuids.add(udiInfoEntity.getUuid());

@ -2,7 +2,6 @@ package com.glxp.udi.admin.controller.inout;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.Constant; import com.glxp.udi.admin.constant.Constant;
@ -218,9 +217,9 @@ public class StockQRCodeTextController {
filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId()); filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
} }
stockPrintTempService.deleteById(deleteStPrintTempRequest); stockPrintTempService.deleteById(deleteStPrintTempRequest);
List<StockPrintEntity> stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest); Page<StockPrintEntity> page = stockPrintService.filterJoinStockPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) { if (page.getTotal() > 0) {
mStockPrintEntities.addAll(stockPrintEntities); mStockPrintEntities.addAll(page.getRecords());
} }
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) { for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity); PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity);
@ -266,9 +265,8 @@ public class StockQRCodeTextController {
stockPrintEntity.setPrintStatus("102"); stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity); stockPrintService.updateStockPrint(stockPrintEntity);
} }
PageInfo<StockPrintTempEntity> pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal((long) stockPrintTempEntities.size());
pageSimpleResponse.setList(stockPrintTempEntities); pageSimpleResponse.setList(stockPrintTempEntities);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@ -279,12 +277,10 @@ public class StockQRCodeTextController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<StockPrintTempEntity> stockQRCodeTextEntityList Page<StockPrintTempEntity> page = stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest);
= stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest);
PageInfo<StockPrintTempEntity> pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(stockQRCodeTextEntityList); pageSimpleResponse.setList(page.getRecords());
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@ -310,11 +306,11 @@ public class StockQRCodeTextController {
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setLocalAction(orderMdEntity.getAction()); systemPDFTemplateRelevanceRequest.setLocalAction(orderMdEntity.getAction());
systemPDFTemplateRelevanceRequest.setModuleId(inspectionPDFTemplateRequest.getModuleId()); systemPDFTemplateRelevanceRequest.setModuleId(inspectionPDFTemplateRequest.getModuleId());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); Page<SystemPDFTemplateRelevanceResponse> page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses.isEmpty()) { if (page.getTotal() == 0) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到模板文件"); return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到模板文件");
} else { } else {
SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = page.getRecords().get(0);
SystemPDFTemplateEntity systemPDFTemplateEntity = SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId())); systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
if (systemPDFTemplateEntity == null) { if (systemPDFTemplateEntity == null) {
@ -339,12 +335,12 @@ public class StockQRCodeTextController {
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId()); systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType()); systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); Page<SystemPDFTemplateRelevanceResponse> page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) { if (page.getTotal() == 0) {
return; return;
} }
SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = page.getRecords().get(0);
SystemPDFTemplateEntity systemPDFTemplateEntity = SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId())); systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));

@ -3,6 +3,7 @@ package com.glxp.udi.admin.controller.inout;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
@ -85,11 +86,11 @@ public class UdiInfoController {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setCustomerId(customerId); filterUdiInfoRequest.setCustomerId(customerId);
filterUdiInfoRequest.setUuid(udiInfoEntity.getUuid()); filterUdiInfoRequest.setUuid(udiInfoEntity.getUuid());
Page<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
if (page != null && page.getTotal() > 0) { if (page != null && page.getTotal() > 0) {
udiInfoEntity.setCheck(true); udiInfoEntity.setIsCheck(true);
} else { } else {
udiInfoEntity.setCheck(false); udiInfoEntity.setIsCheck(false);
} }
udiInfoEntity.setIsUseDy(0); udiInfoEntity.setIsUseDy(0);
} }
@ -97,6 +98,7 @@ public class UdiInfoController {
} }
return udiDlDeviceResponse; return udiDlDeviceResponse;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e);
return ResultVOUtils.error(500, "连接UDI数据下载服务出错"); return ResultVOUtils.error(500, "连接UDI数据下载服务出错");
} }
} }
@ -122,7 +124,7 @@ public class UdiInfoController {
@GetMapping("udims/udiinfo/local/filterByUuid") @GetMapping("udims/udiinfo/local/filterByUuid")
public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
productInfoFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); productInfoFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId());
Page<UdiInfoEntity> page = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(productInfoFilterRequest);
return ResultVOUtils.success(page.getRecords()); return ResultVOUtils.success(page.getRecords());
} }

@ -2,8 +2,8 @@ package com.glxp.udi.admin.controller.inout;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.inout.UdiInfoEntity; import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
@ -63,7 +63,7 @@ public class UdiRelevanceController {
filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId());
filterUdiInfoRequest.setDisable(false); filterUdiInfoRequest.setDisable(false);
Page<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
List<UdiRelevanceResponse> udiRelevanceResponses = page.getRecords().stream().map(e -> { List<UdiRelevanceResponse> udiRelevanceResponses = page.getRecords().stream().map(e -> {
UdiRelevanceResponse authAdminRoleResponse = new UdiRelevanceResponse(); UdiRelevanceResponse authAdminRoleResponse = new UdiRelevanceResponse();
BeanUtils.copyProperties(e, authAdminRoleResponse); BeanUtils.copyProperties(e, authAdminRoleResponse);
@ -85,7 +85,7 @@ public class UdiRelevanceController {
filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId());
Page<UdiInfoEntity> page = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest);
PageSimpleResponse<UdiInfoEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setList(page.getRecords());
@ -128,7 +128,7 @@ public class UdiRelevanceController {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setUuid(key); filterUdiInfoRequest.setUuid(key);
filterUdiInfoRequest.setCustomerId(customerId); filterUdiInfoRequest.setCustomerId(customerId);
Page<UdiInfoEntity> page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); IPage<UdiInfoEntity> page = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
List<UdiInfoEntity> udiInfoEntities = page.getRecords(); List<UdiInfoEntity> udiInfoEntities = page.getRecords();
if (udiInfoEntities == null || udiInfoEntities.isEmpty()) { if (udiInfoEntities == null || udiInfoEntities.isEmpty()) {
udiInfoEntities = udidlClient.getUdiByUuid(key); udiInfoEntities = udidlClient.getUdiByUuid(key);
@ -136,7 +136,7 @@ public class UdiRelevanceController {
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
udiInfoEntity.setCustomerId(customerId); udiInfoEntity.setCustomerId(customerId);
udiInfoEntity.setIsUseDy(0); udiInfoEntity.setIsUseDy(0);
udiInfoEntity.setDisable(false); udiInfoEntity.setIsDisable(false);
if (StrUtil.isBlank(udiInfoEntity.getManufactory())) { if (StrUtil.isBlank(udiInfoEntity.getManufactory())) {
//生产厂家为空 //生产厂家为空
udiInfoEntity.setManufactory(udiInfoEntity.getYlqxzcrbarmc()); udiInfoEntity.setManufactory(udiInfoEntity.getYlqxzcrbarmc());
@ -176,7 +176,7 @@ public class UdiRelevanceController {
} }
} }
udiInfoEntity.setDisable(combineRequest.getIsDisable()); udiInfoEntity.setIsDisable(combineRequest.getIsDisable());
udiInfoService.updateUdiInfo(udiInfoEntity); udiInfoService.updateUdiInfo(udiInfoEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }
@ -189,9 +189,8 @@ public class UdiRelevanceController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(filterUdiInfoRequest.getNameCode()); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(filterUdiInfoRequest.getNameCode());
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal((long) udiRelevanceResponses.size());
pageSimpleResponse.setList(udiRelevanceResponses); pageSimpleResponse.setList(udiRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

@ -3,7 +3,7 @@ package com.glxp.udi.admin.controller.inout;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.inout.InvProductDetailEntity; import com.glxp.udi.admin.entity.inout.InvProductDetailEntity;
import com.glxp.udi.admin.entity.inout.OrderMdEntity; import com.glxp.udi.admin.entity.inout.OrderMdEntity;
@ -97,11 +97,11 @@ public class UdiTraceController {
} }
responses.addAll(set); responses.addAll(set);
PageInfo<UdiTraceResponse> pageInfo; Page<UdiTraceResponse> page = new Page<>(warehouseQueryRequest.getPage(), warehouseQueryRequest.getLimit());
pageInfo = new PageInfo<>(responses); page.setRecords(responses);
PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(responses); pageSimpleResponse.setList(page.getRecords());
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@ -149,10 +149,11 @@ public class UdiTraceController {
orderMdEntities = orderMdEntities.stream().sorted(Comparator.comparing(OrderMdEntity::getActDate, Comparator.reverseOrder())).collect(Collectors.toList()); orderMdEntities = orderMdEntities.stream().sorted(Comparator.comparing(OrderMdEntity::getActDate, Comparator.reverseOrder())).collect(Collectors.toList());
} }
PageInfo<OrderMdEntity> pageInfo = new PageInfo<>(orderMdEntities); Page<OrderMdEntity> pageResult = new Page<>(warehouseQueryRequest.getPage(), warehouseQueryRequest.getLimit());
pageResult.setRecords(orderMdEntities);
PageSimpleResponse<OrderMdEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<OrderMdEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageResult.getTotal());
pageSimpleResponse.setList(orderMdEntities); pageSimpleResponse.setList(pageResult.getRecords());
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

@ -1,5 +1,6 @@
package com.glxp.udi.admin.controller.inout; package com.glxp.udi.admin.controller.inout;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
@ -39,7 +40,7 @@ public class UnitMaintainController {
String customerId = authAdminService.getCurrentUserCustomerId(); String customerId = authAdminService.getCurrentUserCustomerId();
unitMaintainFilterRequest.setCustomerId(customerId); unitMaintainFilterRequest.setCustomerId(customerId);
Page<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest); IPage<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest);
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setList(page.getRecords());
@ -77,7 +78,7 @@ public class UnitMaintainController {
} }
unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId());
Page<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest); IPage<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest);
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
@ -94,7 +95,7 @@ public class UnitMaintainController {
unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId());
Page<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest); IPage<UnitMaintainEntity> page = unitMaintainService.filterList(unitMaintainFilterRequest);
for (UnitMaintainEntity unitMaintainEntity : page.getRecords()) { for (UnitMaintainEntity unitMaintainEntity : page.getRecords()) {
unitMaintainEntity.setErpId(unitMaintainEntity.getUnitId()); unitMaintainEntity.setErpId(unitMaintainEntity.getUnitId());
} }

@ -1,7 +1,7 @@
package com.glxp.udi.admin.controller.inventory; package com.glxp.udi.admin.controller.inventory;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.auth.AuthAdmin; import com.glxp.udi.admin.entity.auth.AuthAdmin;
@ -52,8 +52,8 @@ public class InvWarehouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filter") @GetMapping("spms/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); IPage<InvWarehouseEntity> page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
List<InvWarehouseResponse> merge = merge(invWarehouseEntities, 0); List<InvWarehouseResponse> merge = merge(page.getRecords(), 0);
Map<String, Object> restMap = new HashMap<>(); Map<String, Object> restMap = new HashMap<>();
restMap.put("list", merge); restMap.put("list", merge);
return ResultVOUtils.success(restMap); return ResultVOUtils.success(restMap);
@ -64,8 +64,8 @@ public class InvWarehouseController {
public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); IPage<InvWarehouseEntity> page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(page.getRecords());
} }
@ -76,7 +76,7 @@ public class InvWarehouseController {
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
long customerId = customerService.getCustomerId(); long customerId = customerService.getCustomerId();
filterInvWarehouseRequest.setCustomerId(String.valueOf(customerId)); filterInvWarehouseRequest.setCustomerId(String.valueOf(customerId));
Page<InvWarehouseEntity> page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); IPage<InvWarehouseEntity> page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
SystemParamConfigEntity systemParamConfigEntity = systemParamCustomerConfigService.getParamByKey("corp_innor_inv", customerId); SystemParamConfigEntity systemParamConfigEntity = systemParamCustomerConfigService.getParamByKey("corp_innor_inv", customerId);
List<InvWarehouseEntity> temps = new ArrayList<>(); List<InvWarehouseEntity> temps = new ArrayList<>();
if (systemParamConfigEntity.getParamValue().equals("1")) { if (systemParamConfigEntity.getParamValue().equals("1")) {
@ -99,7 +99,6 @@ public class InvWarehouseController {
} }
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllByUser") @GetMapping("spms/inv/warehouse/filterAllByUser")
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
@ -122,7 +121,6 @@ public class InvWarehouseController {
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities, Integer pid) { public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities, Integer pid) {
List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>(); List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
@ -265,9 +263,9 @@ public class InvWarehouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/downloadByStatus") @PostMapping("/spms/inv/warehouse/downloadByStatus")
public BaseResponse downloadByStatus(@RequestBody FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse downloadByStatus(@RequestBody FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); IPage<InvWarehouseEntity> page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
InvWarehouseExportResponse invWarehouseExportResponse = new InvWarehouseExportResponse(); InvWarehouseExportResponse invWarehouseExportResponse = new InvWarehouseExportResponse();
invWarehouseExportResponse.setInvWarehouseEntities(invWarehouseEntities); invWarehouseExportResponse.setInvWarehouseEntities(page.getRecords());
return ResultVOUtils.success(invWarehouseExportResponse); return ResultVOUtils.success(invWarehouseExportResponse);
} }

@ -1,5 +1,6 @@
package com.glxp.udi.admin.controller.param; package com.glxp.udi.admin.controller.param;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
@ -88,7 +89,7 @@ public class SystemPDFModuleController {
if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) {
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
bussinessTypeFilterRequest.setCustomerId(systemPDFModuleRequest.getCustomerId()); bussinessTypeFilterRequest.setCustomerId(systemPDFModuleRequest.getCustomerId());
Page<BussinessTypeEntity> page = bussinessTypeService.filterList(bussinessTypeFilterRequest); IPage<BussinessTypeEntity> page = bussinessTypeService.filterList(bussinessTypeFilterRequest);
for (BussinessTypeEntity bussinessTypeEntity : page.getRecords()) { for (BussinessTypeEntity bussinessTypeEntity : page.getRecords()) {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
systemPDFTemplateRelevanceEntity.setLocalAction(bussinessTypeEntity.getAction()); systemPDFTemplateRelevanceEntity.setLocalAction(bussinessTypeEntity.getAction());

@ -1,6 +1,6 @@
package com.glxp.udi.admin.controller.param; package com.glxp.udi.admin.controller.param;
import com.github.pagehelper.PageInfo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity;
@ -42,16 +42,15 @@ public class SystemPDFTemplateController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest); Page<SystemPDFTemplateEntity> page = systemPDFTemplateService.queryPage(systemPDFTemplateRequest);
List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = page.getRecords().stream().map(item -> {
SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse();
BeanUtils.copyProperties(item, systemPDFTemplateResponse); BeanUtils.copyProperties(item, systemPDFTemplateResponse);
return systemPDFTemplateResponse; return systemPDFTemplateResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
PageInfo<SystemPDFTemplateEntity> pageInfo = new PageInfo<>(systemPDFTemplateEntityList);
PageSimpleResponse<SystemPDFTemplateResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<SystemPDFTemplateResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(systemPDFTemplateResponseList); pageSimpleResponse.setList(systemPDFTemplateResponseList);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@ -61,11 +60,10 @@ public class SystemPDFTemplateController {
public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page, public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "100") Integer limit) { @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.listPDFTemplates(page, limit); Page<SystemPDFTemplateEntity> pageResult = systemPDFTemplateService.listPDFTemplates(page, limit);
PageInfo<SystemPDFTemplateEntity> pageInfo = new PageInfo<>(systemPDFTemplateEntityList);
PageSimpleResponse<SystemPDFTemplateSelectResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<SystemPDFTemplateSelectResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageResult.getTotal());
List<SystemPDFTemplateSelectResponse> systemPDFTemplateSelectResponses = systemPDFTemplateEntityList.stream().map(e -> { List<SystemPDFTemplateSelectResponse> systemPDFTemplateSelectResponses = pageResult.getRecords().stream().map(e -> {
SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse(); SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse();
BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse); BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse);
systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId())); systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId()));

@ -1,8 +1,7 @@
package com.glxp.udi.admin.controller.param; package com.glxp.udi.admin.controller.param;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.constant.SystemParamConstant;
@ -52,13 +51,12 @@ public class SystemParamConfigController {
} }
systemParamConfigRequest.setParamStatus(1); systemParamConfigRequest.setParamStatus(1);
//查询用户是否自定义了此参数 //查询用户是否自定义了此参数
List<SystemParamConfigCustomerEntity> list = customerParamConfigService.getSystemParams(systemParamConfigRequest); Page<SystemParamConfigCustomerEntity> page = customerParamConfigService.getSystemParams(systemParamConfigRequest);
PageInfo<SystemParamConfigCustomerEntity> pageInfo = new PageInfo<>(list);
PageSimpleResponse<SystemParamConfigResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<SystemParamConfigResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
if (CollUtil.isNotEmpty(list)) { if (page.getTotal() > 0) {
List<SystemParamConfigResponse> systemParamConfigResponseList = list.stream().map(item -> { List<SystemParamConfigResponse> systemParamConfigResponseList = page.getRecords().stream().map(item -> {
SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse();
BeanUtil.copyProperties(item, systemParamConfigResponse); BeanUtil.copyProperties(item, systemParamConfigResponse);
return systemParamConfigResponse; return systemParamConfigResponse;

@ -1,22 +1,16 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.auth.AuthAdmin; import com.glxp.udi.admin.entity.auth.AuthAdmin;
import com.glxp.udi.admin.req.auth.AuthAdminQueryRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface AuthAdminDao { public interface AuthAdminDao extends BaseMapper<AuthAdmin> {
/**
*
*
* @return
*/
Page<AuthAdmin> listAdminPage(Page<AuthAdmin> page, AuthAdminQueryRequest authAdminQueryRequest);
/** /**
* id * id

@ -1,11 +1,12 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.auth.AuthLicense; import com.glxp.udi.admin.entity.auth.AuthLicense;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface AuthLicenseDao { public interface AuthLicenseDao extends BaseMapper<AuthLicense> {
AuthLicense get(String id); AuthLicense get(String id);

@ -1,12 +1,13 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.auth.AuthPermission; import com.glxp.udi.admin.entity.auth.AuthPermission;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface AuthPermissionDao { public interface AuthPermissionDao extends BaseMapper<AuthPermission> {
/** /**
* roleIds * roleIds

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.auth.AuthPermissionRule; import com.glxp.udi.admin.entity.auth.AuthPermissionRule;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -8,7 +9,7 @@ import java.util.List;
@Mapper @Mapper
public interface AuthPermissionRuleDao { public interface AuthPermissionRuleDao extends BaseMapper<AuthPermissionRule> {
/** /**
* ids * ids

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.auth.AuthRole; import com.glxp.udi.admin.entity.auth.AuthRole;
import com.glxp.udi.admin.entity.auth.AuthRoleAdmin; import com.glxp.udi.admin.entity.auth.AuthRoleAdmin;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -9,7 +10,7 @@ import java.util.List;
@Mapper @Mapper
public interface AuthRoleAdminDao { public interface AuthRoleAdminDao extends BaseMapper<AuthRoleAdmin> {
/** /**
* adminId * adminId

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.auth.AuthRole; import com.glxp.udi.admin.entity.auth.AuthRole;
import com.glxp.udi.admin.req.auth.AuthRoleQueryRequest; import com.glxp.udi.admin.req.auth.AuthRoleQueryRequest;
@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface AuthRoleDao { public interface AuthRoleDao extends BaseMapper<AuthRole> {
/** /**
* *

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.auth.CustomerContactEntity; import com.glxp.udi.admin.entity.auth.CustomerContactEntity;
import com.glxp.udi.admin.req.auth.CustomerContactFilterRequest; import com.glxp.udi.admin.req.auth.CustomerContactFilterRequest;
@ -7,7 +8,7 @@ import com.glxp.udi.admin.req.info.DeleteRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface CustomerContacDao { public interface CustomerContacDao extends BaseMapper<CustomerContactEntity> {
Page<CustomerContactEntity> filterCustomerContact(Page<CustomerContactEntity> page, CustomerContactFilterRequest userResisterFilterRequest); Page<CustomerContactEntity> filterCustomerContact(Page<CustomerContactEntity> page, CustomerContactFilterRequest userResisterFilterRequest);

@ -1,22 +1,16 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.entity.auth.CustomerDetailEntity; import com.glxp.udi.admin.entity.auth.CustomerDetailEntity;
import com.glxp.udi.admin.entity.auth.CustomerInfoEntity; import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
import com.glxp.udi.admin.req.auth.CustomerInfoFilterRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface CustomerInfoDao { public interface CustomerInfoDao extends BaseMapper<CustomerInfoEntity> {
List<CustomerInfoEntity> filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest);
Page<CustomerDetailEntity> filterDetailCustomerInfo(Page<CustomerDetailEntity> page, CustomerInfoFilterRequest customerInfoFilterRequest);
boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity); boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity);
@ -35,4 +29,6 @@ public interface CustomerInfoDao {
* @return * @return
*/ */
List<String> selectCustomerIdByCustomerName(@Param("customerName") String customerName); List<String> selectCustomerIdByCustomerName(@Param("customerName") String customerName);
IPage<CustomerDetailEntity> filterDetailCustomerInfo(IPage<CustomerDetailEntity> page, String key, String customerName, String companyName, Integer userFlag, Integer bussinessStatus);
} }

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.info.DeviceKeyEntity; import com.glxp.udi.admin.entity.info.DeviceKeyEntity;
import com.glxp.udi.admin.req.info.FilterDeviceKeyRequest; import com.glxp.udi.admin.req.info.FilterDeviceKeyRequest;
@ -11,7 +12,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface DeviceKeyDao { public interface DeviceKeyDao extends BaseMapper<DeviceKeyEntity> {
DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest); DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest);
List<DeviceKeyEntity> findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest); List<DeviceKeyEntity> findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest);

@ -1,14 +1,11 @@
package com.glxp.udi.admin.dao.auth; package com.glxp.udi.admin.dao.auth;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.auth.UserRegisterEntity; import com.glxp.udi.admin.entity.auth.UserRegisterEntity;
import com.glxp.udi.admin.req.auth.UserResisterFilterRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface UserRegisterDao { public interface UserRegisterDao extends BaseMapper<UserRegisterEntity> {
Page<UserRegisterEntity> filterUserRegisters(Page<UserRegisterEntity> page, UserResisterFilterRequest userResisterFilterRequest);
boolean insertUserRegister(UserRegisterEntity userRegisterEntity); boolean insertUserRegister(UserRegisterEntity userRegisterEntity);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.basic; package com.glxp.udi.admin.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.udi.admin.entity.basic.BasicBussinessTypeRoleEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -7,9 +8,9 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface BasicBussinessTypeRoleDao { public interface BasicBussinessTypeRoleDao extends BaseMapper<BasicBussinessTypeRoleEntity> {
public List<BasicBussinessTypeRoleEntity> getListByRoleId(@Param("roleId") Long roleId); List<BasicBussinessTypeRoleEntity> getListByRoleId(@Param("roleId") Long roleId);
/** /**
* *

@ -1,5 +1,7 @@
package com.glxp.udi.admin.dao.basic; package com.glxp.udi.admin.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity;
import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest;
@ -10,14 +12,16 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface BussinessTypeDao { public interface BussinessTypeDao extends BaseMapper<BussinessTypeEntity> {
BussinessTypeEntity selectById(String id); BussinessTypeEntity selectById(String id);
Page<BussinessTypeEntity> filterList(Page<BussinessTypeEntity>page, BussinessTypeFilterRequest bussinessTypeFilterRequest); Page<BussinessTypeEntity> filterList(Page<BussinessTypeEntity>page, BussinessTypeFilterRequest bussinessTypeFilterRequest);
Page<BussinessTypResponse> filterJoinList(Page<BussinessTypResponse> page, BussinessTypeFilterRequest bussinessTypeFilterRequest); Page<BussinessTypResponse> filterJoinList(Page<BussinessTypResponse> page, BussinessTypeFilterRequest bussinessTypeFilterRequest);
Page<BussinessTypeEntity> filterAllByUser(Page<BussinessTypeEntity> page, BussinessTypeFilterRequest bussinessTypeFilterRequest); IPage<BussinessTypeEntity> filterAllByUser(IPage<BussinessTypeEntity> page, String name, String action, String mainAction, String locInvCode, String customerId, Boolean enabled);
List<BussinessTypeEntity> filterAllByUserList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
@ -80,4 +84,5 @@ public interface BussinessTypeDao {
* @return * @return
*/ */
String selectSupplementTypeByAction(@Param("action") String action); String selectSupplementTypeByAction(@Param("action") String action);
} }

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.info.AliKeyEntity; import com.glxp.udi.admin.entity.info.AliKeyEntity;
import com.glxp.udi.admin.entity.info.CompanyEntity; import com.glxp.udi.admin.entity.info.CompanyEntity;
@ -10,7 +11,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface CompanyDao {
public interface CompanyDao extends BaseMapper<CompanyEntity> {
CompanyEntity findCompany(Long CustomerId); CompanyEntity findCompany(Long CustomerId);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.info.CompanyUpdateLogEntity; import com.glxp.udi.admin.entity.info.CompanyUpdateLogEntity;
import com.glxp.udi.admin.req.info.FilterCompanyUpdateLogRequest; import com.glxp.udi.admin.req.info.FilterCompanyUpdateLogRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface CompanyUpdateLogDao { public interface CompanyUpdateLogDao extends BaseMapper<CompanyUpdateLogEntity> {
List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.info.PlatformEntity; import com.glxp.udi.admin.entity.info.PlatformEntity;
import com.glxp.udi.admin.req.info.PlatformLinkRequest; import com.glxp.udi.admin.req.info.PlatformLinkRequest;
@ -11,7 +12,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Mapper @Mapper
public interface PlatformDao { public interface PlatformDao extends BaseMapper<PlatformEntity> {
int save(PlatformEntity platformEntity); int save(PlatformEntity platformEntity);

@ -1,11 +1,12 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.info.ScheduledEntity; import com.glxp.udi.admin.entity.info.ScheduledEntity;
import com.glxp.udi.admin.req.udidl.ScheduledRequest; import com.glxp.udi.admin.req.udidl.ScheduledRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface ScheduledDao { public interface ScheduledDao extends BaseMapper<ScheduledEntity> {
ScheduledEntity findScheduled(ScheduledRequest scheduledRequest); ScheduledEntity findScheduled(ScheduledRequest scheduledRequest);

@ -1,10 +1,11 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.info.SetupEntity; import com.glxp.udi.admin.entity.info.SetupEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface SetupDao { public interface SetupDao extends BaseMapper<SetupEntity> {
boolean modifySetup(SetupEntity setupEntity); boolean modifySetup(SetupEntity setupEntity);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.inout.StockQRCodeTextEntity; import com.glxp.udi.admin.entity.inout.StockQRCodeTextEntity;
import com.glxp.udi.admin.req.inout.StockQRCodeTextFilterRequest; import com.glxp.udi.admin.req.inout.StockQRCodeTextFilterRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface StockQRCodeTextDao { public interface StockQRCodeTextDao extends BaseMapper<StockQRCodeTextEntity> {
List<StockQRCodeTextEntity> filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest); List<StockQRCodeTextEntity> filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest);
@ -16,8 +17,6 @@ public interface StockQRCodeTextDao {
boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List<StockQRCodeTextEntity> StockQRCodeTextEntitys); boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List<StockQRCodeTextEntity> StockQRCodeTextEntitys);
boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
boolean deleteByOrderId(@Param("id") String id); boolean deleteByOrderId(@Param("id") String id);

@ -1,19 +1,14 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.inout.UdiInfoEntity; import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface UdiInfoDao { public interface UdiInfoDao extends BaseMapper<UdiInfoEntity> {
Page<UdiInfoEntity> filterUdiInfo(Page<UdiInfoEntity> page, FilterUdiInfoRequest filterUdiInfoRequest);
Page<UdiInfoEntity> filterUdiInfoGp(Page<UdiInfoEntity> page, FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode, @Param("customerId") String customerId); UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode, @Param("customerId") String customerId);
@ -21,7 +16,6 @@ public interface UdiInfoDao {
List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid, @Param("customerId") String customerId); List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid, @Param("customerId") String customerId);
UdiInfoEntity selectById(@Param("id") String id); UdiInfoEntity selectById(@Param("id") String id);
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity; import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity;
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface UdiRelevanceDao { public interface UdiRelevanceDao extends BaseMapper<UdiRelevanceEntity> {
Page<UdiRelevanceResponse> filterUdiRelevance(Page<UdiRelevanceResponse> page, FilterUdiInfoRequest filterUdiInfoRequest); Page<UdiRelevanceResponse> filterUdiRelevance(Page<UdiRelevanceResponse> page, FilterUdiInfoRequest filterUdiInfoRequest);

@ -1,16 +1,16 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface UnitMaintainDao { public interface UnitMaintainDao extends BaseMapper<UnitMaintainEntity> {
Page<UnitMaintainEntity> filterList(Page<UnitMaintainEntity> page, UnitMaintainFilterRequest unitMaintainFilterRequest);
boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);
@ -35,7 +35,7 @@ public interface UnitMaintainDao {
* @param unitMaintainFilterRequest * @param unitMaintainFilterRequest
* @return * @return
*/ */
Page<UnitMaintainEntity> getUnbindUnitMaintain(Page<UnitMaintainEntity> page, UnitMaintainFilterRequest unitMaintainFilterRequest); Page<UnitMaintainEntity> getUnbindUnitMaintain(Page<UnitMaintainEntity> page, String customerId);
/** /**
* ID * ID
@ -77,4 +77,6 @@ public interface UnitMaintainDao {
* @return * @return
*/ */
int countByName(@Param("name") String name, @Param("customerId") String customerId); int countByName(@Param("name") String name, @Param("customerId") String customerId);
IPage<UnitMaintainEntity> filterList(IPage<UnitMaintainEntity> page, String key, String customerId, Integer corpType);
} }

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.udi.admin.entity.inout.WarehouseBussinessTypeEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface WarehouseBussinessTypeDao { public interface WarehouseBussinessTypeDao extends BaseMapper<WarehouseBussinessTypeEntity> {
int deleteByPrimaryKey(Integer id); int deleteByPrimaryKey(Integer id);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.inout; package com.glxp.udi.admin.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.inout.WarehouseUserEntity; import com.glxp.udi.admin.entity.inout.WarehouseUserEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface WarehouseUserDao { public interface WarehouseUserDao extends BaseMapper<WarehouseUserEntity> {
int deleteByPrimaryKey(Integer id); int deleteByPrimaryKey(Integer id);
int insert(WarehouseUserEntity record); int insert(WarehouseUserEntity record);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.inventory; package com.glxp.udi.admin.dao.inventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.basic.StockPrintEntity; import com.glxp.udi.admin.entity.basic.StockPrintEntity;
import com.glxp.udi.admin.req.basic.FilterStockprintRequest; import com.glxp.udi.admin.req.basic.FilterStockprintRequest;
@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface InvStockPrintDao { public interface InvStockPrintDao extends BaseMapper<StockPrintEntity> {
List<StockPrintEntity> filterStockPrint(FilterStockprintRequest filterStockprintRequest); List<StockPrintEntity> filterStockPrint(FilterStockprintRequest filterStockprintRequest);

@ -1,6 +1,7 @@
package com.glxp.udi.admin.dao.inventory; package com.glxp.udi.admin.dao.inventory;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity; import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -9,9 +10,9 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface InvWarehouseDao { public interface InvWarehouseDao extends BaseMapper<InvWarehouseEntity> {
Page<InvWarehouseEntity> filterInvWarehouse(Page<InvWarehouseEntity> page, FilterInvWarehouseRequest filterInvWarehouseRequest); IPage<InvWarehouseEntity> filterInvWarehouse(@Param("page") IPage<InvWarehouseEntity> page, @Param("request") FilterInvWarehouseRequest request);
List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest); List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);

@ -1,16 +1,16 @@
package com.glxp.udi.admin.dao.inventory; package com.glxp.udi.admin.dao.inventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity; import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity;
import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest; import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest;
import com.glxp.udi.admin.req.inventory.FilterStPrintTempRequest; import com.glxp.udi.admin.req.inventory.FilterStPrintTempRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper @Mapper
public interface StockPrintTempDao { public interface StockPrintTempDao extends BaseMapper<StockPrintTempEntity> {
List<StockPrintTempEntity> filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest); Page<StockPrintTempEntity> filterStockPrintTempEntity(Page<StockPrintTempEntity> page, FilterStPrintTempRequest filterStockprintRequest);
boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest); boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.param.SystemExcelTemplateEntity; import com.glxp.udi.admin.entity.param.SystemExcelTemplateEntity;
import com.glxp.udi.admin.req.param.SystemExcelTemplateRequest; import com.glxp.udi.admin.req.param.SystemExcelTemplateRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface SystemExcelTemplateDao { public interface SystemExcelTemplateDao extends BaseMapper<SystemExcelTemplateEntity> {
List<SystemExcelTemplateEntity> filterSystemExcelTemplate(SystemExcelTemplateRequest systemExcelTemplateRequest); List<SystemExcelTemplateEntity> filterSystemExcelTemplate(SystemExcelTemplateRequest systemExcelTemplateRequest);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.param.SystemPDFModuleEntity; import com.glxp.udi.admin.entity.param.SystemPDFModuleEntity;
import com.glxp.udi.admin.req.param.SystemPDFModuleRequest; import com.glxp.udi.admin.req.param.SystemPDFModuleRequest;
@ -7,7 +8,7 @@ import com.glxp.udi.admin.req.param.SystemPDFModuleSaveRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface SystemPDFModuleDao { public interface SystemPDFModuleDao extends BaseMapper<SystemPDFModuleEntity> {
Page<SystemPDFModuleEntity> queryPage(Page<SystemPDFModuleEntity> page, SystemPDFModuleRequest systemPDFModuleRequest); Page<SystemPDFModuleEntity> queryPage(Page<SystemPDFModuleEntity> page, SystemPDFModuleRequest systemPDFModuleRequest);
@ -19,7 +20,7 @@ public interface SystemPDFModuleDao {
boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest); boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest);
boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean insertData(SystemPDFModuleEntity systemPDFModuleEntity);
boolean deleteById(Integer id); boolean deleteById(Integer id);
} }

@ -1,27 +1,22 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest;
import com.glxp.udi.admin.req.param.SystemPDFTemplateSaveRequest; import com.glxp.udi.admin.req.param.SystemPDFTemplateSaveRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper @Mapper
public interface SystemPDFTemplateDao { public interface SystemPDFTemplateDao extends BaseMapper<SystemPDFTemplateEntity> {
List<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest);
List<SystemPDFTemplateEntity> listPDFTemplates();
SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest); Page<SystemPDFTemplateEntity> listPDFTemplates(Page<SystemPDFTemplateEntity> page);
SystemPDFTemplateEntity selectById(String id); SystemPDFTemplateEntity selectById(String id);
boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest); boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest);
boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean insertData(SystemPDFTemplateEntity systemPDFTemplateEntity);
boolean deleteById(Integer id); boolean deleteById(Integer id);

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity; import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.udi.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.udi.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
@ -10,7 +11,7 @@ import java.util.List;
@Mapper @Mapper
public interface SystemPDFTemplateRelevanceDao { public interface SystemPDFTemplateRelevanceDao extends BaseMapper<SystemPDFTemplateRelevanceEntity> {
Page<SystemPDFTemplateRelevanceResponse> filterList(Page<SystemPDFTemplateRelevanceResponse> page, SystemPDFTemplateRelevanceRequest systemPDFModuleRequest); Page<SystemPDFTemplateRelevanceResponse> filterList(Page<SystemPDFTemplateRelevanceResponse> page, SystemPDFTemplateRelevanceRequest systemPDFModuleRequest);
@ -47,7 +48,7 @@ public interface SystemPDFTemplateRelevanceDao {
*/ */
int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList); int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList);
boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); boolean insertData(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
/** /**

@ -1,14 +1,14 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.param.SystemParamConfigCustomerEntity; import com.glxp.udi.admin.entity.param.SystemParamConfigCustomerEntity;
import com.glxp.udi.admin.req.param.SystemParamConfigRequest; import com.glxp.udi.admin.req.param.SystemParamConfigRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper @Mapper
public interface SystemParamConfigCustomerDao { public interface SystemParamConfigCustomerDao extends BaseMapper<SystemParamConfigCustomerEntity> {
int deleteByPrimaryKey(Integer id); int deleteByPrimaryKey(Integer id);
int insert(SystemParamConfigCustomerEntity record); int insert(SystemParamConfigCustomerEntity record);
@ -28,7 +28,7 @@ public interface SystemParamConfigCustomerDao {
* @param systemParams * @param systemParams
* @return * @return
*/ */
List<SystemParamConfigCustomerEntity> selectCustomizeParam(@Param("systemParamConfigRequest") SystemParamConfigRequest systemParamConfigRequest, @Param("systemParams") String[] systemParams); Page<SystemParamConfigCustomerEntity> selectCustomizeParam(Page<SystemParamConfigCustomerEntity> page, @Param("systemParamConfigRequest") SystemParamConfigRequest systemParamConfigRequest, @Param("systemParams") String[] systemParams);
/** /**
* *

@ -1,5 +1,6 @@
package com.glxp.udi.admin.dao.param; package com.glxp.udi.admin.dao.param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.param.SystemParamConfigEntity; import com.glxp.udi.admin.entity.param.SystemParamConfigEntity;
import com.glxp.udi.admin.req.param.SystemParamConfigRequest; import com.glxp.udi.admin.req.param.SystemParamConfigRequest;
import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest; import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest;
@ -9,8 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface SystemParamConfigDao { public interface SystemParamConfigDao extends BaseMapper<SystemParamConfigEntity> {
List<SystemParamConfigEntity> queryPage(SystemParamConfigRequest systemParamConfigRequest);
SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest); SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest);
@ -24,7 +24,7 @@ public interface SystemParamConfigDao {
boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest);
boolean insert(SystemParamConfigEntity systemParamConfigEntity); boolean insertData(SystemParamConfigEntity systemParamConfigEntity);
/** /**
* *

@ -1,5 +1,6 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.glxp.udi.admin.util.serializer.LongJsonDeserializer; import com.glxp.udi.admin.util.serializer.LongJsonDeserializer;
@ -9,6 +10,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("auth_user")
public class AuthAdmin { public class AuthAdmin {
// 主键 // 主键

@ -1,10 +1,12 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("auth_license")
public class AuthLicense { public class AuthLicense {
private String id; private String id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* *
*/ */
@Data @Data
@TableName("auth_permission")
public class AuthPermission { public class AuthPermission {
private Long id; private Long id;

@ -1,5 +1,7 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -8,6 +10,7 @@ import java.util.Date;
* *
*/ */
@Data @Data
@TableName("auth_permission_rule")
public class AuthPermissionRule { public class AuthPermissionRule {
private Long id; private Long id;
@ -24,8 +27,10 @@ public class AuthPermissionRule {
private Integer listorder; private Integer listorder;
@TableField("create_time")
private Date createTime; private Date createTime;
@TableField("update_time")
private Date updateTime; private Date updateTime;
} }

@ -1,5 +1,7 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -8,6 +10,7 @@ import java.util.Date;
* *
*/ */
@Data @Data
@TableName("auth_role")
public class AuthRole { public class AuthRole {
private Long id; private Long id;
@ -22,8 +25,10 @@ public class AuthRole {
private Long listorder; private Long listorder;
@TableField("create_time")
private Date createTime; private Date createTime;
@TableField("update_time")
private Date updateTime; private Date updateTime;
private Integer isCustomer; private Integer isCustomer;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* *
*/ */
@Data @Data
@TableName("auth_role_admin")
public class AuthRoleAdmin { public class AuthRoleAdmin {
private Long id; private Long id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("customer_contact")
public class CustomerContactEntity { public class CustomerContactEntity {
private Long id; private Long id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("customer_info")
public class CustomerInfoEntity { public class CustomerInfoEntity {
private Long customerId; private Long customerId;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.auth; package com.glxp.udi.admin.entity.auth;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("user_register")
public class UserRegisterEntity { public class UserRegisterEntity {
private Integer id; private Integer id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.basic; package com.glxp.udi.admin.entity.basic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* *
*/ */
@Data @Data
@TableName("basic_bussiness_type_role")
public class BasicBussinessTypeRoleEntity { public class BasicBussinessTypeRoleEntity {
private Integer id; private Integer id;

@ -1,5 +1,7 @@
package com.glxp.udi.admin.entity.basic; package com.glxp.udi.admin.entity.basic;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -8,6 +10,7 @@ import javax.validation.constraints.NotBlank;
@ApiModel("单据类型数据") @ApiModel("单据类型数据")
@Data @Data
@TableName("basic_bussiness_type")
public class BussinessTypeEntity { public class BussinessTypeEntity {
@ApiModelProperty(value = "数据ID") @ApiModelProperty(value = "数据ID")
@ -36,12 +39,14 @@ public class BussinessTypeEntity {
private String localAction; private String localAction;
@ApiModelProperty(value = "本地单据类型名称") @ApiModelProperty(value = "本地单据类型名称")
@TableField(exist = false)
private String localName; private String localName;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
private boolean checkEnable; private boolean checkEnable;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
@TableField(exist = false)
private boolean advanceType; private boolean advanceType;
@ApiModelProperty(value = "是否自动生成往来单位1.是2.否") @ApiModelProperty(value = "是否自动生成往来单位1.是2.否")
@ -54,12 +59,14 @@ public class BussinessTypeEntity {
private boolean secCheckEnable; private boolean secCheckEnable;
@ApiModelProperty(value = "是否允许供应商使用") @ApiModelProperty(value = "是否允许供应商使用")
@TableField(exist = false)
private Boolean spUse; private Boolean spUse;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
private String defaultUnit; private String defaultUnit;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
@TableField("`index`")
private Integer index; private Integer index;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.basic; package com.glxp.udi.admin.entity.basic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("inv_stockprint")
public class StockPrintEntity implements Serializable { public class StockPrintEntity implements Serializable {
private Integer id; private Integer id;

@ -1,5 +1,6 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.glxp.udi.admin.util.serializer.LongJsonDeserializer; import com.glxp.udi.admin.util.serializer.LongJsonDeserializer;
@ -9,6 +10,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("company")
public class CompanyEntity { public class CompanyEntity {
private String companyName; //企业名称 private String companyName; //企业名称

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("company_update_log")
public class CompanyUpdateLogEntity { public class CompanyUpdateLogEntity {
private Integer id; private Integer id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("device_check")
public class DeviceKeyEntity { public class DeviceKeyEntity {
private String id; private String id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("auth_platform")
public class PlatformEntity { public class PlatformEntity {
private String id; private String id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("scheduled")
public class ScheduledEntity { public class ScheduledEntity {
private int id; private int id;

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.info; package com.glxp.udi.admin.entity.info;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("customer_set")
public class SetupEntity { public class SetupEntity {
private int id; private int id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("stock_qrcode_text")
public class StockQRCodeTextEntity { public class StockQRCodeTextEntity {
private String id; private String id;

@ -1,7 +1,13 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date; import java.util.Date;
@Data
@TableName("io_productinfo")
public class UdiInfoEntity { public class UdiInfoEntity {
private Integer id; private Integer id;
@ -56,10 +62,6 @@ public class UdiInfoEntity {
private Integer diType; private Integer diType;
private String thirdId;
private String thirdName;
private String customerId; private String customerId;
private String scbssfbhph; private String scbssfbhph;
@ -76,415 +78,35 @@ public class UdiInfoEntity {
private Date lastUpdateTime; //更新时间 private Date lastUpdateTime; //更新时间
private String ybbm; //医保编码
private String sptm; //商品条码
private Boolean isDisable;
//本地生成信息 //本地生成信息
@TableField(exist = false)
private String batchNo; private String batchNo;
@TableField(exist = false)
private String produceDate; private String produceDate;
@TableField(exist = false)
private String expireDate; private String expireDate;
@TableField(exist = false)
private String serialNo; private String serialNo;
@TableField(exist = false)
private String udi; private String udi;
@TableField(exist = false)
private String code; private String code;
@TableField(exist = false)
private Integer count; private Integer count;
private String ybbm; //医保编码 @TableField(exist = false)
private String sptm; //商品条码
private Boolean isCheck; private Boolean isCheck;
private Boolean isDisable;
public String getYbbm() {
return ybbm;
}
public void setYbbm(String ybbm) {
this.ybbm = ybbm;
}
public String getSptm() {
return sptm;
}
public void setSptm(String sptm) {
this.sptm = sptm;
}
public Boolean getDisable() {
return isDisable;
}
public void setDisable(Boolean disable) {
isDisable = disable;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getNameCode() {
return nameCode;
}
public void setNameCode(String nameCode) {
this.nameCode = nameCode;
}
public String getPackRatio() {
return packRatio;
}
public void setPackRatio(String packRatio) {
this.packRatio = packRatio;
}
public String getPackLevel() {
return packLevel;
}
public void setPackLevel(String packLevel) {
this.packLevel = packLevel;
}
public Integer getBhxjsl() {
if (bhxjsl == null || bhxjsl == 0) {
return 1;
}
return bhxjsl;
}
public void setBhxjsl(Integer bhxjsl) {
this.bhxjsl = bhxjsl;
}
public Integer getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;
}
return bhzxxsbzsl;
}
public void setBhzxxsbzsl(Integer bhzxxsbzsl) {
this.bhzxxsbzsl = bhzxxsbzsl;
}
public Integer getZxxsbzbhsydysl() {
if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) {
return 1;
}
return zxxsbzbhsydysl;
}
public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) {
this.zxxsbzbhsydysl = zxxsbzbhsydysl;
}
public String getBhxjcpbm() {
return bhxjcpbm;
}
public void setBhxjcpbm(String bhxjcpbm) {
this.bhxjcpbm = bhxjcpbm;
}
public String getSjcpbm() {
return sjcpbm;
}
public void setSjcpbm(String sjcpbm) {
this.sjcpbm = sjcpbm;
}
public String getBzcj() {
return bzcj;
}
public void setBzcj(String bzcj) {
this.bzcj = bzcj;
}
public String getAddType() {
return addType;
}
public void setAddType(String addType) {
this.addType = addType;
}
public String getDeviceRecordKey() {
return deviceRecordKey;
}
public void setDeviceRecordKey(String deviceRecordKey) {
this.deviceRecordKey = deviceRecordKey;
}
public int getIsUseDy() {
return isUseDy;
}
public void setIsUseDy(int isUseDy) {
this.isUseDy = isUseDy;
}
public String getCpmctymc() {
return cpmctymc;
}
public void setCpmctymc(String cpmctymc) {
this.cpmctymc = cpmctymc;
}
public String getCplb() {
return cplb;
}
public void setCplb(String cplb) {
this.cplb = cplb;
}
public String getFlbm() {
return flbm;
}
public void setFlbm(String flbm) {
this.flbm = flbm;
}
public String getGgxh() {
return ggxh;
}
public void setGgxh(String ggxh) {
this.ggxh = ggxh;
}
public String getQxlb() {
return qxlb;
}
public void setQxlb(String qxlb) {
this.qxlb = qxlb;
}
public String getTyshxydm() {
return tyshxydm;
}
public void setTyshxydm(String tyshxydm) {
this.tyshxydm = tyshxydm;
}
public String getYlqxzcrbarmc() {
return ylqxzcrbarmc;
}
public void setYlqxzcrbarmc(String ylqxzcrbarmc) {
this.ylqxzcrbarmc = ylqxzcrbarmc;
}
public String getZczbhhzbapzbh() {
return zczbhhzbapzbh;
}
public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
this.zczbhhzbapzbh = zczbhhzbapzbh;
}
public String getYlqxzcrbarywmc() {
return ylqxzcrbarywmc;
}
public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) {
this.ylqxzcrbarywmc = ylqxzcrbarywmc;
}
public String getSydycpbs() {
return sydycpbs;
}
public void setSydycpbs(String sydycpbs) {
this.sydycpbs = sydycpbs;
}
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public int getVersionNumber() {
return versionNumber;
}
public void setVersionNumber(int versionNumber) {
this.versionNumber = versionNumber;
}
public int getDiType() {
return diType;
}
public void setDiType(int diType) {
this.diType = diType;
}
public String getThirdId() {
return thirdId;
}
public void setThirdId(String thirdId) {
this.thirdId = thirdId;
}
public String getThirdName() {
return thirdName;
}
public void setThirdName(String thirdName) {
this.thirdName = thirdName;
}
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getProduceDate() {
return produceDate;
}
public void setProduceDate(String produceDate) {
this.produceDate = produceDate;
}
public String getExpireDate() {
return expireDate;
}
public void setExpireDate(String expireDate) {
this.expireDate = expireDate;
}
public String getSerialNo() {
return serialNo;
}
public void setSerialNo(String serialNo) {
this.serialNo = serialNo;
}
public String getUdi() {
return udi;
}
public void setUdi(String udi) {
this.udi = udi;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public Integer getCount() {
if (count == null) {
return 1;
}
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public String getCustomerId() {
return customerId;
}
public void setCustomerId(String customerId) {
this.customerId = customerId;
}
public Boolean getCheck() {
return isCheck;
}
public void setCheck(Boolean check) {
isCheck = check;
}
public String getScbssfbhph() {
return scbssfbhph;
}
public void setScbssfbhph(String scbssfbhph) {
this.scbssfbhph = scbssfbhph;
}
public String getScbssfbhxlh() {
return scbssfbhxlh;
}
public void setScbssfbhxlh(String scbssfbhxlh) {
this.scbssfbhxlh = scbssfbhxlh;
}
public String getScbssfbhscrq() {
return scbssfbhscrq;
}
public void setScbssfbhscrq(String scbssfbhscrq) {
this.scbssfbhscrq = scbssfbhscrq;
}
public String getScbssfbhsxrq() {
return scbssfbhsxrq;
}
public void setScbssfbhsxrq(String scbssfbhsxrq) {
this.scbssfbhsxrq = scbssfbhsxrq;
}
public String getCpms() {
return cpms;
}
public void setCpms(String cpms) {
this.cpms = cpms;
}
public String getManufactory() {
return manufactory;
}
public void setManufactory(String manufactory) {
this.manufactory = manufactory;
}
public Date getLastUpdateTime() {
return lastUpdateTime;
}
public void setLastUpdateTime(Date lastUpdateTime) {
this.lastUpdateTime = lastUpdateTime;
}
} }

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("udi_relevance")
public class UdiRelevanceEntity { public class UdiRelevanceEntity {
private String id; private String id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Data @Data
@TableName("io_unit_maintain")
public class UnitMaintainEntity { public class UnitMaintainEntity {
private Integer id; private Integer id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* - * -
*/ */
@Data @Data
@TableName("inv_warehouse_bussiness_type")
public class WarehouseBussinessTypeEntity { public class WarehouseBussinessTypeEntity {
/** /**

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.inout; package com.glxp.udi.admin.entity.inout;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* - * -
*/ */
@Data @Data
@TableName("inv_warehouse_user")
public class WarehouseUserEntity { public class WarehouseUserEntity {
/** /**

@ -1,10 +1,14 @@
package com.glxp.udi.admin.entity.inventory; package com.glxp.udi.admin.entity.inventory;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("inv_warehouse")
public class InvWarehouseEntity { public class InvWarehouseEntity {
private Integer id; private Integer id;
@ -29,6 +33,7 @@ public class InvWarehouseEntity {
private String pcode; private String pcode;
@TableField(exist = false)
private String pName; private String pName;
//关联公司ID //关联公司ID
@ -37,14 +42,19 @@ public class InvWarehouseEntity {
/** /**
* ID * ID
*/ */
@TableField(exist = false)
private String thirdId; private String thirdId;
@TableField(exist = false)
private String thirdId1; private String thirdId1;
@TableField(exist = false)
private String thirdId2; private String thirdId2;
@TableField(exist = false)
private String thirdId3; private String thirdId3;
@TableField(exist = false)
private String thirdId4; private String thirdId4;
} }

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.inventory; package com.glxp.udi.admin.entity.inventory;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("inv_stockprint_pdf_temp")
public class StockPrintTempEntity { public class StockPrintTempEntity {
private Integer id; private Integer id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("system_excel_template")
public class SystemExcelTemplateEntity { public class SystemExcelTemplateEntity {
private Integer id; private Integer id;

@ -1,10 +1,12 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("system_pdf_module")
public class SystemPDFModuleEntity { public class SystemPDFModuleEntity {
private int id; private int id;

@ -1,10 +1,12 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("system_pdf_template")
public class SystemPDFTemplateEntity { public class SystemPDFTemplateEntity {
private int id; private int id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* *
*/ */
@Data @Data
@TableName("system_pdf_template_relevance")
public class SystemPDFTemplateRelevanceEntity { public class SystemPDFTemplateRelevanceEntity {
private int id; private int id;

@ -1,11 +1,13 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
* *
*/ */
@Data @Data
@TableName("system_param_config_customer")
public class SystemParamConfigCustomerEntity { public class SystemParamConfigCustomerEntity {
/** /**

@ -1,8 +1,10 @@
package com.glxp.udi.admin.entity.param; package com.glxp.udi.admin.entity.param;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@Data @Data
@TableName("system_param_config")
public class SystemParamConfigEntity { public class SystemParamConfigEntity {
private int id; private int id;

@ -10,7 +10,7 @@ import java.util.Date;
@Data @Data
public class SystemPDFTemplateRequest extends ListPageRequest { public class SystemPDFTemplateRequest extends ListPageRequest {
private int id; private Integer id;
private String name; private String name;
private Integer type; private Integer type;
private Integer module; private Integer module;

@ -1,5 +1,9 @@
package com.glxp.udi.admin.service.auth; package com.glxp.udi.admin.service.auth;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.auth.AuthAdminDao; import com.glxp.udi.admin.dao.auth.AuthAdminDao;
import com.glxp.udi.admin.entity.auth.AuthAdmin; import com.glxp.udi.admin.entity.auth.AuthAdmin;
@ -15,6 +19,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.List;
@Slf4j @Slf4j
@Service @Service
@ -24,13 +29,19 @@ public class AuthAdminService{
@Resource @Resource
private AuthAdminDao authAdminDao; private AuthAdminDao authAdminDao;
public Page<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) { public IPage<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) {
if (authAdminQueryRequest == null) { if (authAdminQueryRequest == null) {
return new Page<AuthAdmin>(); return new Page<>();
} }
Page<AuthAdmin> page = new Page<>(authAdminQueryRequest.getPage(), authAdminQueryRequest.getLimit()); IPage<AuthAdmin> page = new Page<>(authAdminQueryRequest.getPage(), authAdminQueryRequest.getLimit());
return authAdminDao.listAdminPage(page, authAdminQueryRequest); QueryWrapper<AuthAdmin> wrapper = new QueryWrapper<>();
wrapper.in(CollUtil.isNotEmpty(authAdminQueryRequest.getIds()), "id", authAdminQueryRequest.getIds())
.eq(null != authAdminQueryRequest.getUserFlag(), "userFlag", authAdminQueryRequest.getUserFlag())
.like(StrUtil.isNotBlank(authAdminQueryRequest.getUserName()), "userName", authAdminQueryRequest.getUserName())
.eq(StrUtil.isNotBlank(authAdminQueryRequest.getCustomerId()), "CustomerId", authAdminQueryRequest.getCustomerId())
.orderByDesc("id");
return authAdminDao.selectPage(page, wrapper);
} }
public AuthAdmin findByUserName(String userName) { public AuthAdmin findByUserName(String userName) {
@ -104,12 +115,20 @@ public class AuthAdminService{
return authAdminDao.deleteByCustomerId(customerId); return authAdminDao.deleteByCustomerId(customerId);
} }
public Page<AuthAdmin> getUserList(QueryRequest queryRequest) { public IPage<AuthAdmin> getUserList(QueryRequest queryRequest) {
if (queryRequest == null) { if (queryRequest == null) {
return new Page<>(); return new Page<>();
} }
if (null != queryRequest.getPage()) {
Page<AuthAdmin> page = new Page<>(queryRequest.getPage(), queryRequest.getLimit()); Page<AuthAdmin> page = new Page<>(queryRequest.getPage(), queryRequest.getLimit());
return authAdminDao.getUserList(page, queryRequest.getCustomerId()); return authAdminDao.getUserList(page, queryRequest.getCustomerId());
} else {
List<AuthAdmin> list = authAdminDao.selectList(new QueryWrapper<AuthAdmin>().eq("CustomerId", queryRequest.getCustomerId()));
IPage<AuthAdmin> page = new Page<>();
page.setTotal(list.size());
page.setRecords(list);
return page;
}
} }
public AuthAdmin getCurrentUser() { public AuthAdmin getCurrentUser() {

@ -1,5 +1,8 @@
package com.glxp.udi.admin.service.auth; package com.glxp.udi.admin.service.auth;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.auth.AuthRoleDao; import com.glxp.udi.admin.dao.auth.AuthRoleDao;
import com.glxp.udi.admin.dao.basic.BasicBussinessTypeRoleDao; import com.glxp.udi.admin.dao.basic.BasicBussinessTypeRoleDao;
@ -30,9 +33,12 @@ public class AuthRoleService {
* *
* @return * @return
*/ */
public Page<AuthRole> listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { public IPage<AuthRole> listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) {
Page<AuthRole> authRolePage = new Page<>(authRoleQueryRequest.getPage(), authRoleQueryRequest.getLimit()); IPage<AuthRole> page = new Page<>(authRoleQueryRequest.getPage(), authRoleQueryRequest.getLimit());
return authRoleDao.listAdminPage(authRolePage, authRoleQueryRequest); QueryWrapper<AuthRole> wrapper = new QueryWrapper<>();
wrapper.eq(null != authRoleQueryRequest.getStatus(), "status", authRoleQueryRequest.getStatus())
.like(StrUtil.isNotBlank(authRoleQueryRequest.getName()), "name", authRoleQueryRequest.getName());
return authRoleDao.selectPage(page, wrapper);
} }
/** /**

@ -1,6 +1,7 @@
package com.glxp.udi.admin.service.auth; package com.glxp.udi.admin.service.auth;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.auth.AuthAdminDao; import com.glxp.udi.admin.dao.auth.AuthAdminDao;
import com.glxp.udi.admin.dao.auth.AuthRoleAdminDao; import com.glxp.udi.admin.dao.auth.AuthRoleAdminDao;
@ -27,12 +28,13 @@ public class CustomerInfoService {
@Resource @Resource
private AuthAdminDao authAdminDao; private AuthAdminDao authAdminDao;
public Page<CustomerDetailEntity> filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest) { public IPage<CustomerDetailEntity> filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest) {
if (customerInfoFilterRequest == null) { if (customerInfoFilterRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<CustomerDetailEntity> page = new Page<>(customerInfoFilterRequest.getPage(), customerInfoFilterRequest.getLimit()); Page<CustomerDetailEntity> page = new Page<>(customerInfoFilterRequest.getPage(), customerInfoFilterRequest.getLimit());
return customerInfoDao.filterDetailCustomerInfo(page, customerInfoFilterRequest); return customerInfoDao.filterDetailCustomerInfo(page, customerInfoFilterRequest.getKey(), customerInfoFilterRequest.getCustomerName(), customerInfoFilterRequest.getCompanyName(),
customerInfoFilterRequest.getUserFlag(), customerInfoFilterRequest.getBussinessStatus());
} }
public boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity) { public boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity) {

@ -1,5 +1,7 @@
package com.glxp.udi.admin.service.auth; package com.glxp.udi.admin.service.auth;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.auth.UserRegisterDao; import com.glxp.udi.admin.dao.auth.UserRegisterDao;
import com.glxp.udi.admin.entity.auth.UserRegisterEntity; import com.glxp.udi.admin.entity.auth.UserRegisterEntity;
@ -23,7 +25,10 @@ public class UserRegisterService {
return new Page<>(); return new Page<>();
} }
Page<UserRegisterEntity> page = new Page<>(userResisterFilterRequest.getPage(), userResisterFilterRequest.getLimit()); Page<UserRegisterEntity> page = new Page<>(userResisterFilterRequest.getPage(), userResisterFilterRequest.getLimit());
return userRegisterDao.filterUserRegisters(page, userResisterFilterRequest); QueryWrapper<UserRegisterEntity> wrapper = new QueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(userResisterFilterRequest.getCompanyName()), "companyName", userResisterFilterRequest.getCompanyName())
.eq(StrUtil.isNotBlank(userResisterFilterRequest.getCheckType()), "checkType", userResisterFilterRequest.getCheckType());
return userRegisterDao.selectPage(page, wrapper);
} }
public boolean insertUserRegister(UserRegisterEntity userRegisterEntity) { public boolean insertUserRegister(UserRegisterEntity userRegisterEntity) {

@ -1,6 +1,8 @@
package com.glxp.udi.admin.service.basic; package com.glxp.udi.admin.service.basic;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.TypeConstant; import com.glxp.udi.admin.constant.TypeConstant;
@ -28,12 +30,31 @@ public class BussinessTypeService {
@Resource @Resource
private BussinessTypeDao bussinessTypeDao; private BussinessTypeDao bussinessTypeDao;
public Page<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { public IPage<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) { if (bussinessTypeFilterRequest == null) {
return new Page<>(); return new Page<>();
} }
if (null == bussinessTypeFilterRequest.getPage()) {
IPage<BussinessTypeEntity> page = new Page<>();
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeDao.selectList(buildQueryWrapper(bussinessTypeFilterRequest));
page.setRecords(bussinessTypeEntities);
page.setTotal(bussinessTypeEntities.size());
return page;
} else {
Page<BussinessTypeEntity> page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); Page<BussinessTypeEntity> page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit());
return bussinessTypeDao.filterList(page, bussinessTypeFilterRequest); return bussinessTypeDao.selectPage(page, buildQueryWrapper(bussinessTypeFilterRequest));
}
}
private QueryWrapper<BussinessTypeEntity> buildQueryWrapper(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
QueryWrapper<BussinessTypeEntity> wrapper = new QueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getName()), "name", bussinessTypeFilterRequest.getName())
.like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getAction()), "action", bussinessTypeFilterRequest.getAction())
.like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getMainAction()), "mainAction", bussinessTypeFilterRequest.getMainAction())
.eq(null != bussinessTypeFilterRequest.getEnabled(), "enable", bussinessTypeFilterRequest.getEnabled())
.eq(StrUtil.isNotBlank(bussinessTypeFilterRequest.getCustomerId()), "customerId", bussinessTypeFilterRequest.getCustomerId());
return wrapper;
} }
public Page<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { public Page<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
@ -44,12 +65,21 @@ public class BussinessTypeService {
return bussinessTypeDao.filterJoinList(page, bussinessTypeFilterRequest); return bussinessTypeDao.filterJoinList(page, bussinessTypeFilterRequest);
} }
public Page<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { public IPage<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) { if (bussinessTypeFilterRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<BussinessTypeEntity> page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); if (null != bussinessTypeFilterRequest.getPage()) {
return bussinessTypeDao.filterAllByUser(page, bussinessTypeFilterRequest); IPage<BussinessTypeEntity> page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit());
return bussinessTypeDao.filterAllByUser(page, bussinessTypeFilterRequest.getName(), bussinessTypeFilterRequest.getAction(), bussinessTypeFilterRequest.getMainAction(),
bussinessTypeFilterRequest.getLocInvCode(), bussinessTypeFilterRequest.getCustomerId(), bussinessTypeFilterRequest.getEnabled());
} else {
IPage<BussinessTypeEntity> page = new Page<>();
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeDao.filterAllByUserList(bussinessTypeFilterRequest);
page.setRecords(bussinessTypeEntities);
page.setTotal(bussinessTypeEntities.size());
return page;
}
} }
public BussinessTypeEntity selectById(String id) { public BussinessTypeEntity selectById(String id) {

@ -17,7 +17,7 @@ public class StockQRCodeTextService {
private StockQRCodeTextDao stockQRCodeTextDao; private StockQRCodeTextDao stockQRCodeTextDao;
public boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity) { public boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity) {
return stockQRCodeTextDao.updateById(stockQRCodeTextEntity); return stockQRCodeTextDao.update(stockQRCodeTextEntity, null) > 0;
} }
public boolean deleteById(String id) { public boolean deleteById(String id) {

@ -1,6 +1,9 @@
package com.glxp.udi.admin.service.inout; package com.glxp.udi.admin.service.inout;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.inout.UdiInfoDao; import com.glxp.udi.admin.dao.inout.UdiInfoDao;
import com.glxp.udi.admin.entity.inout.UdiInfoEntity; import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
@ -25,12 +28,20 @@ public class UdiInfoService {
@Resource @Resource
private UdiInfoDao udiInfoDao; private UdiInfoDao udiInfoDao;
public Page<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { public IPage<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<UdiInfoEntity> page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); if (null == filterUdiInfoRequest.getPage()) {
return udiInfoDao.filterUdiInfo(page, filterUdiInfoRequest); List<UdiInfoEntity> udiInfoEntities = udiInfoDao.selectList(builderQueryWrapper(filterUdiInfoRequest));
IPage<UdiInfoEntity> page = new Page<>();
page.setTotal(udiInfoEntities.size());
page.setRecords(udiInfoEntities);
return page;
} else {
IPage<UdiInfoEntity> page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit());
return udiInfoDao.selectPage(page, builderQueryWrapper(filterUdiInfoRequest));
}
} }
public boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities) { public boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities) {
@ -38,30 +49,45 @@ public class UdiInfoService {
Date date = new Date(); Date date = new Date();
udiInfoEntities.forEach(el -> { udiInfoEntities.forEach(el -> {
el.setLastUpdateTime(date); el.setLastUpdateTime(date);
el.setDisable(false); el.setIsDisable(false);
}); });
} }
return udiInfoDao.insertUdiInfos(udiInfoEntities); return udiInfoDao.insertUdiInfos(udiInfoEntities);
} }
public Page<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) { public IPage<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<UdiInfoEntity> page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); IPage<UdiInfoEntity> page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit());
return udiInfoDao.filterUdiInfoGp(page, filterUdiInfoRequest); QueryWrapper<UdiInfoEntity> wrapper = builderQueryWrapper(filterUdiInfoRequest);
return udiInfoDao.selectPage(page, wrapper);
} }
public List<UdiInfoEntity> findByUuids(String uuid, String customerId) { /**
return udiInfoDao.findByUuids(uuid, customerId); *
*
* @param filterUdiInfoRequest
* @return
*/
private static QueryWrapper<UdiInfoEntity> builderQueryWrapper(FilterUdiInfoRequest filterUdiInfoRequest) {
QueryWrapper<UdiInfoEntity> wrapper = new QueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(filterUdiInfoRequest.getYlqxzcrbarmc()), "ylqxzcrbarmc", filterUdiInfoRequest.getYlqxzcrbarmc())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getCpmctymc()), "cpmctymc", filterUdiInfoRequest.getCpmctymc())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getNameCode()), "nameCode", filterUdiInfoRequest.getNameCode())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getGgxh()), "ggxh", filterUdiInfoRequest.getGgxh())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getCpms()), "cpms", filterUdiInfoRequest.getCpms())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getZczbhhzbapzbh()), "zczbhhzbapzbh", filterUdiInfoRequest.getZczbhhzbapzbh())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getManufactory()), "ylqxzcrbarmc", filterUdiInfoRequest.getManufactory())
.like(StrUtil.isNotBlank(filterUdiInfoRequest.getUuid()), "uuid", filterUdiInfoRequest.getUuid())
.eq(StrUtil.isNotBlank(filterUdiInfoRequest.getCustomerId()), "customerId", filterUdiInfoRequest.getCustomerId())
.eq(null != filterUdiInfoRequest.getDiType(), "diType", filterUdiInfoRequest.getDiType())
.groupBy("uuid").orderByDesc("lastUpdateTime");
return wrapper;
} }
public Page<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { public List<UdiInfoEntity> findByUuids(String uuid, String customerId) {
if (filterUdiInfoRequest == null) { return udiInfoDao.findByUuids(uuid, customerId);
return new Page<>();
}
Page<UdiInfoEntity> page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit());
return udiInfoDao.filterUdiInfo(page, filterUdiInfoRequest);
} }
public boolean deleteByUuid(String uuid, String customerId) { public boolean deleteByUuid(String uuid, String customerId) {

@ -1,5 +1,6 @@
package com.glxp.udi.admin.service.inout; package com.glxp.udi.admin.service.inout;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.inout.UnitMaintainDao; import com.glxp.udi.admin.dao.inout.UnitMaintainDao;
import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
@ -24,12 +25,13 @@ public class UnitMaintainService {
@Resource @Resource
private UnitMaintainDao unitMaintainDao; private UnitMaintainDao unitMaintainDao;
public Page<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { public IPage<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) {
if (unitMaintainFilterRequest == null) { if (unitMaintainFilterRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<UnitMaintainEntity> page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit()); IPage<UnitMaintainEntity> page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit());
return unitMaintainDao.filterList(page, unitMaintainFilterRequest);
return unitMaintainDao.filterList(page, unitMaintainFilterRequest.getKey(), unitMaintainFilterRequest.getCustomerId(), unitMaintainFilterRequest.getCorpType());
} }
public boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity) { public boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity) {
@ -61,7 +63,7 @@ public class UnitMaintainService {
return new Page<>(); return new Page<>();
} }
Page<UnitMaintainEntity> page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit()); Page<UnitMaintainEntity> page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit());
return unitMaintainDao.getUnbindUnitMaintain(page,unitMaintainFilterRequest); return unitMaintainDao.getUnbindUnitMaintain(page, unitMaintainFilterRequest.getCustomerId());
} }
/** /**

@ -24,7 +24,10 @@ public class InvStockPrintService {
if (filterStockprintRequest == null) { if (filterStockprintRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<StockPrintEntity> page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit()); Page<StockPrintEntity> page = new Page<>(-1, -1);
if (null != filterStockprintRequest.getPage() && null != filterStockprintRequest.getLimit()) {
page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit());
}
return stockPrintDao.filterJoinStockPrint(page, filterStockprintRequest); return stockPrintDao.filterJoinStockPrint(page, filterStockprintRequest);
} }

@ -1,16 +1,15 @@
package com.glxp.udi.admin.service.inventory; package com.glxp.udi.admin.service.inventory;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.glxp.udi.admin.dao.inout.WarehouseUserDao; import com.glxp.udi.admin.dao.inout.WarehouseUserDao;
import com.glxp.udi.admin.dao.inventory.InvWarehouseDao; import com.glxp.udi.admin.dao.inventory.InvWarehouseDao;
import com.glxp.udi.admin.entity.inout.WarehouseUserEntity; import com.glxp.udi.admin.entity.inout.WarehouseUserEntity;
import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity; import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.udi.admin.service.inout.WarehouseUserService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -24,9 +23,6 @@ import java.util.List;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class InvWarehouseService { public class InvWarehouseService {
@Lazy
@Resource
private WarehouseUserService warehouseUserService;
@Resource @Resource
private InvWarehouseDao invWarehouseDao; private InvWarehouseDao invWarehouseDao;
@Resource @Resource
@ -36,22 +32,48 @@ public class InvWarehouseService {
return invWarehouseDao.selectMaxCode(filterInvWarehouseRequest); return invWarehouseDao.selectMaxCode(filterInvWarehouseRequest);
} }
public Page<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public IPage<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) { if (filterInvWarehouseRequest == null) {
return new Page<>(); return new Page<>();
} }
Page<InvWarehouseEntity> page = new Page<>(filterInvWarehouseRequest.getPage(), filterInvWarehouseRequest.getLimit()); if (null != filterInvWarehouseRequest.getPage()) {
return invWarehouseDao.filterInvWarehouse(page, filterInvWarehouseRequest); IPage<InvWarehouseEntity> page = new Page<>(filterInvWarehouseRequest.getPage(), filterInvWarehouseRequest.getLimit());
return invWarehouseDao.selectPage(page, buildQueryWrapper(filterInvWarehouseRequest));
} else {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseDao.selectList(buildQueryWrapper(filterInvWarehouseRequest));
IPage<InvWarehouseEntity> page = new Page<>();
page.setTotal(invWarehouseEntities.size());
page.setRecords(invWarehouseEntities);
return page;
}
}
/**
*
*
* @param filterInvWarehouseRequest
* @return
*/
private QueryWrapper<InvWarehouseEntity> buildQueryWrapper(FilterInvWarehouseRequest filterInvWarehouseRequest) {
QueryWrapper<InvWarehouseEntity> wrapper = new QueryWrapper<>();
wrapper.select("id, pId, code, name, advanceType, isDefault, status, updateTime, remark, level, pcode, customerId,(select name from inv_warehouse WHERE inv_warehouse.pcode = code) pName ")
.eq(null != filterInvWarehouseRequest.getId(), "id", filterInvWarehouseRequest.getId())
.eq(null != filterInvWarehouseRequest.getPid(), "pid", filterInvWarehouseRequest.getPid())
.eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getCode()), "code", filterInvWarehouseRequest.getCode())
.eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getName()), "name", filterInvWarehouseRequest.getName())
.eq(null != filterInvWarehouseRequest.getAdvanceType(), "advanceType", filterInvWarehouseRequest.getAdvanceType())
.eq(null != filterInvWarehouseRequest.getStatus(), "status", filterInvWarehouseRequest.getStatus())
.eq(null != filterInvWarehouseRequest.getIsDefault(), "isDefault", filterInvWarehouseRequest.getIsDefault())
.eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getPcode()), "pcode", filterInvWarehouseRequest.getPcode())
.eq(null != filterInvWarehouseRequest.getLevel(), "level", filterInvWarehouseRequest.getLevel())
.eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getCustomerId()), "customerId", filterInvWarehouseRequest.getCustomerId());
return wrapper;
} }
public List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) { if (filterInvWarehouseRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if (filterInvWarehouseRequest.getPage() != null) {
int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invWarehouseDao.filterAllByUser(filterInvWarehouseRequest); List<InvWarehouseEntity> data = invWarehouseDao.filterAllByUser(filterInvWarehouseRequest);
return data; return data;
} }
@ -83,14 +105,7 @@ public class InvWarehouseService {
} }
public InvWarehouseEntity selectByCode(String code) { public InvWarehouseEntity selectByCode(String code) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); return invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", code));
filterInvWarehouseRequest.setCode(code);
Page<InvWarehouseEntity> page = new Page<>(0, 1);
Page<InvWarehouseEntity> pageResult = invWarehouseDao.filterInvWarehouse(page, filterInvWarehouseRequest);
if (pageResult.getTotal() > 0) {
return pageResult.getRecords().get(0);
}
return null;
} }
public boolean deleteById(String id) { public boolean deleteById(String id) {

@ -1,6 +1,6 @@
package com.glxp.udi.admin.service.inventory; package com.glxp.udi.admin.service.inventory;
import com.github.pagehelper.PageHelper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.inventory.StockPrintTempDao; import com.glxp.udi.admin.dao.inventory.StockPrintTempDao;
import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity; import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity;
import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest; import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest;
@ -10,8 +10,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Slf4j @Slf4j
@Service @Service
@ -21,16 +19,16 @@ public class StockPrintTempService {
@Resource @Resource
private StockPrintTempDao stockPrintTempDao; private StockPrintTempDao stockPrintTempDao;
public List<StockPrintTempEntity> filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest) { public Page<StockPrintTempEntity> filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest) {
if (filterStockprintRequest == null) { if (filterStockprintRequest == null) {
return Collections.emptyList(); return new Page<>();
}
if (filterStockprintRequest.getPage() != null) {
int offset = (filterStockprintRequest.getPage() - 1) * filterStockprintRequest.getLimit();
PageHelper.offsetPage(offset, filterStockprintRequest.getLimit());
} }
return stockPrintTempDao.filterStockPrintTempEntity(filterStockprintRequest); Page<StockPrintTempEntity> page = new Page<>(-1, -1);
if (filterStockprintRequest.getPage() != null && null != filterStockprintRequest.getLimit()) {
page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit());
}
return stockPrintTempDao.filterStockPrintTempEntity(page, filterStockprintRequest);
} }
public boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest) { public boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest) {

@ -42,7 +42,7 @@ public class SystemPDFModuleService {
} }
public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) { public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) {
return systemPDFModuleDao.insert(systemPDFModuleEntity); return systemPDFModuleDao.insertData(systemPDFModuleEntity);
} }
public boolean deleteById(Integer id) { public boolean deleteById(Integer id) {

@ -25,7 +25,10 @@ public class SystemPDFTemplateRelevanceService {
if (null == systemPDFModuleRequest) { if (null == systemPDFModuleRequest) {
return new Page<>(); return new Page<>();
} }
Page<SystemPDFTemplateRelevanceResponse> page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); Page<SystemPDFTemplateRelevanceResponse> page = new Page<>(-1, -1);
if (null != systemPDFModuleRequest.getPage() && null != systemPDFModuleRequest.getLimit()) {
page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit());
}
return systemPDFTemplateRelevanceDao.filterList(page, systemPDFModuleRequest); return systemPDFTemplateRelevanceDao.filterList(page, systemPDFModuleRequest);
} }
@ -43,7 +46,7 @@ public class SystemPDFTemplateRelevanceService {
} }
public boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) { public boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity); return systemPDFTemplateRelevanceDao.insertData(systemPDFTemplateRelevanceEntity);
} }
/** /**

@ -1,6 +1,8 @@
package com.glxp.udi.admin.service.param; package com.glxp.udi.admin.service.param;
import com.github.pagehelper.PageHelper; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.param.SystemPDFTemplateDao; import com.glxp.udi.admin.dao.param.SystemPDFTemplateDao;
import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest; import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest;
@ -10,7 +12,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@Slf4j @Slf4j
@Service @Service
@ -20,19 +21,26 @@ public class SystemPDFTemplateService {
@Resource @Resource
private SystemPDFTemplateDao systemPDFTemplateDao; private SystemPDFTemplateDao systemPDFTemplateDao;
public List<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest SystemPDFTemplateRequest) { public Page<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest) {
int offset = (SystemPDFTemplateRequest.getPage() - 1) * SystemPDFTemplateRequest.getLimit(); Page<SystemPDFTemplateEntity> page = new Page<>(systemPDFTemplateRequest.getPage(), systemPDFTemplateRequest.getLimit());
PageHelper.offsetPage(offset, SystemPDFTemplateRequest.getLimit()); return systemPDFTemplateDao.selectPage(page, buildQueryWrapper(systemPDFTemplateRequest));
return systemPDFTemplateDao.queryPage(SystemPDFTemplateRequest);
} }
public List<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit) { private QueryWrapper<SystemPDFTemplateEntity> buildQueryWrapper(SystemPDFTemplateRequest systemPDFTemplateRequest) {
page = page != null && page > 0 ? page : 1; QueryWrapper<SystemPDFTemplateEntity> wrapper = new QueryWrapper<>();
limit = limit != null && limit > 0 && limit < 100 ? limit : 100; wrapper.like(StrUtil.isNotBlank(systemPDFTemplateRequest.getName()), "name", systemPDFTemplateRequest.getName())
int offset = (page - 1) * limit; .eq(null != systemPDFTemplateRequest.getModule(), "module", systemPDFTemplateRequest.getModule())
PageHelper.offsetPage(offset, limit); .eq(null != systemPDFTemplateRequest.getId(), "id", systemPDFTemplateRequest.getId())
List<SystemPDFTemplateEntity> list = systemPDFTemplateDao.listPDFTemplates(); .orderByDesc("update_time");
return list; return wrapper;
}
public Page<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit) {
Page<SystemPDFTemplateEntity> pageParam = new Page<>(page, limit);
if (null == page || null == limit) {
pageParam = new Page<>(0, 100);
}
return systemPDFTemplateDao.listPDFTemplates(pageParam);
} }
public SystemPDFTemplateEntity selectById(String id) { public SystemPDFTemplateEntity selectById(String id) {
@ -44,7 +52,7 @@ public class SystemPDFTemplateService {
} }
public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) { public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) {
return systemPDFTemplateDao.insert(systemPDFTemplateEntity); return systemPDFTemplateDao.insertData(systemPDFTemplateEntity);
} }
public boolean deleteById(Integer id) { public boolean deleteById(Integer id) {

@ -1,10 +1,8 @@
package com.glxp.udi.admin.service.param; package com.glxp.udi.admin.service.param;
import com.github.pagehelper.PageHelper;
import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao; import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao;
import com.glxp.udi.admin.dao.param.SystemParamConfigDao; import com.glxp.udi.admin.dao.param.SystemParamConfigDao;
import com.glxp.udi.admin.entity.param.SystemParamConfigEntity; import com.glxp.udi.admin.entity.param.SystemParamConfigEntity;
import com.glxp.udi.admin.req.param.SystemParamConfigRequest;
import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest; import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -24,13 +22,6 @@ public class SystemParamConfigService {
@Resource @Resource
private SystemParamConfigCustomerDao systemParamConfigCustomerDao; private SystemParamConfigCustomerDao systemParamConfigCustomerDao;
public List<SystemParamConfigEntity> queryPage(SystemParamConfigRequest SystemParamConfigRequest) {
int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit();
PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit());
List<SystemParamConfigEntity> list = systemParamConfigDao.queryPage(SystemParamConfigRequest);
return list;
}
public SystemParamConfigEntity selectByParamKey(String key) { public SystemParamConfigEntity selectByParamKey(String key) {
return systemParamConfigDao.selectByParamKey(key); return systemParamConfigDao.selectByParamKey(key);
} }
@ -40,7 +31,7 @@ public class SystemParamConfigService {
} }
public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { public boolean insert(SystemParamConfigEntity systemParamConfigEntity) {
return systemParamConfigDao.insert(systemParamConfigEntity); return systemParamConfigDao.insertData(systemParamConfigEntity);
} }
/** /**

@ -1,7 +1,7 @@
package com.glxp.udi.admin.service.param; package com.glxp.udi.admin.service.param;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.constant.SystemParamConstant;
import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao; import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao;
@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* *
@ -37,10 +36,9 @@ public class SystemParamCustomerConfigService {
* @param systemParamConfigRequest * @param systemParamConfigRequest
* @return * @return
*/ */
public List<SystemParamConfigCustomerEntity> getSystemParams(SystemParamConfigRequest systemParamConfigRequest) { public Page<SystemParamConfigCustomerEntity> getSystemParams(SystemParamConfigRequest systemParamConfigRequest) {
int offset = (systemParamConfigRequest.getPage() - 1) * systemParamConfigRequest.getLimit(); Page<SystemParamConfigCustomerEntity> page = new Page<>(systemParamConfigRequest.getPage(), systemParamConfigRequest.getLimit());
PageHelper.offsetPage(offset, systemParamConfigRequest.getLimit()); return systemParamConfigCustomerDao.selectCustomizeParam(page, systemParamConfigRequest, SystemParamConstant.SYSTEM_PARAMS);
return systemParamConfigCustomerDao.selectCustomizeParam(systemParamConfigRequest, SystemParamConstant.SYSTEM_PARAMS);
} }
/** /**

@ -3,12 +3,12 @@ spring:
pathmatch: pathmatch:
matching-strategy: ant_path_matcher matching-strategy: ant_path_matcher
datasource: datasource:
url: jdbc:mysql://192.168.235.137:33306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.235.137:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: root password: root
data: data:
mongodb: mongodb:
uri: mongodb://udims:123456@192.168.235.137:27017/udiwms uri: mongodb://192.168.0.66:27017/udiwms
redis: redis:
database: 4 database: 4

@ -3,7 +3,7 @@ server:
spring: spring:
profiles: profiles:
active: dev active: test
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver

@ -2,31 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.udi.admin.dao.auth.AuthAdminDao"> <mapper namespace="com.glxp.udi.admin.dao.auth.AuthAdminDao">
<select id="listAdminPage" parameterType="com.glxp.udi.admin.req.auth.AuthAdminQueryRequest"
resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT *
FROM auth_user
<where>
<if test="ids != null and ids.size > 0">
AND id IN
<foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
<if test="userFlag != null">
AND userFlag = #{userFlag}
</if>
<if test="userName != null and '' != userName">
AND userName LIKE CONCAT(#{userName},'%')
</if>
<if test="CustomerId != null">
AND CustomerId = #{CustomerId}
</if>
</where>
ORDER BY id
DESC
</select>
<select id="findByUserName" parameterType="hashmap" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin"> <select id="findByUserName" parameterType="hashmap" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT * SELECT *

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save