From e0b7b9effa5b69fbcc71362abd9cf500b2b99f45 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 一月 2025 18:39:38 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java | 192 +++++++++++++++++++++++++++++++++++------------
1 files changed, 141 insertions(+), 51 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
index 1fdf92c..35a70ea 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
@@ -1,20 +1,34 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.YwStockMapper;
import com.doumee.dao.business.YwWarehouseMapper;
-import com.doumee.dao.business.model.YwWarehouse;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwWarehouseService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 杩愮淮浠撳簱淇℃伅琛⊿ervice瀹炵幇
@@ -27,15 +41,47 @@
@Autowired
private YwWarehouseMapper ywWarehouseMapper;
+ @Autowired
+ private YwStockMapper ywStockMapper;
+
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(YwWarehouse ywWarehouse) {
+ if(Objects.isNull(ywWarehouse)
+ || StringUtils.isBlank(ywWarehouse.getName())
+ || Objects.isNull(ywWarehouse.getUserId())
+ || Objects.isNull(ywWarehouse.getStatus())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ywWarehouseMapper.selectCount(new QueryWrapper<YwWarehouse>().lambda().eq(YwWarehouse::getIsdeleted,Constants.ZERO).eq(YwWarehouse::getName,ywWarehouse.getName())) > Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠撳簱鍚嶇О宸插瓨鍦紒");
+ }
+ LoginUserInfo loginUserInfo = ywWarehouse.getLoginUserInfo();
+ ywWarehouse.setCreator(loginUserInfo.getId());
+ ywWarehouse.setCreateDate(new Date());
+ ywWarehouse.setIsdeleted(Constants.ZERO);
ywWarehouseMapper.insert(ywWarehouse);
return ywWarehouse.getId();
}
@Override
- public void deleteById(Integer id) {
- ywWarehouseMapper.deleteById(id);
+ public void deleteById(Integer id, LoginUserInfo loginUserInfo) {
+ YwWarehouse ywWarehouse = ywWarehouseMapper.selectById(id);
+ if(Objects.isNull(ywWarehouse)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //鍒ゆ柇鏁版嵁涓嬫槸鍚﹀瓨鍦ㄨ祫浜ф暟鎹�
+ if(ywStockMapper.selectCount(new QueryWrapper<YwStock>().lambda().eq(YwStock::getIsdeleted,Constants.ZERO)
+ .gt(YwStock::getStock,Constants.ZERO)
+ .eq(YwStock::getWarehouseId,ywWarehouse.getId()))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠浠撳簱鍐呮湁搴撳瓨鐨勮祫浜э紝涓嶅彲鍒犻櫎");
+ };
+ ywWarehouseMapper.update(new UpdateWrapper<YwWarehouse>().lambda()
+ .set(YwWarehouse::getEditDate, DateUtil.getCurrDateTime())
+ .set(YwWarehouse::getEditor, loginUserInfo.getId())
+ .set(YwWarehouse::getIsdeleted,Constants.ONE)
+ .eq(YwWarehouse::getId,ywWarehouse.getId()));
}
@Override
@@ -53,7 +99,23 @@
}
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateById(YwWarehouse ywWarehouse) {
+ if(Objects.isNull(ywWarehouse)
+ || StringUtils.isBlank(ywWarehouse.getName())
+ || Objects.isNull(ywWarehouse.getUserId())
+ || Objects.isNull(ywWarehouse.getStatus())
+ || Objects.isNull(ywWarehouse.getId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ywWarehouseMapper.selectCount(new QueryWrapper<YwWarehouse>().lambda().ne(YwWarehouse::getId,ywWarehouse.getId()).eq(YwWarehouse::getIsdeleted,Constants.ZERO).eq(YwWarehouse::getName,ywWarehouse.getName())) > Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠撳簱鍚嶇О宸插瓨鍦紒");
+ }
+ LoginUserInfo loginUserInfo = ywWarehouse.getLoginUserInfo();
+ ywWarehouse.setEditor(loginUserInfo.getId());
+ ywWarehouse.setEditDate(new Date());
+ ywWarehouse.setIsdeleted(Constants.ZERO);
ywWarehouseMapper.updateById(ywWarehouse);
}
@@ -79,58 +141,30 @@
}
@Override
- public List<YwWarehouse> findList(YwWarehouse ywWarehouse) {
- QueryWrapper<YwWarehouse> wrapper = new QueryWrapper<>(ywWarehouse);
- return ywWarehouseMapper.selectList(wrapper);
+ public List<YwWarehouse> findList(YwWarehouse model) {
+ MPJLambdaWrapper<YwWarehouse> queryWrapper = new MPJLambdaWrapper<YwWarehouse>();
+ queryWrapper.selectAll(YwWarehouse.class)
+ .eq(Objects.nonNull(model.getStatus()),YwWarehouse::getStatus,model.getStatus())
+ .eq(YwWarehouse::getIsdeleted,Constants.ZERO)
+ .eq(YwWarehouse::getStatus,Constants.ZERO)
+ .orderByAsc(YwWarehouse::getSortnum)
+ ;
+ return ywWarehouseMapper.selectList(queryWrapper);
}
-
+
@Override
public PageData<YwWarehouse> findPage(PageWrap<YwWarehouse> pageWrap) {
IPage<YwWarehouse> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwWarehouse> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwWarehouse> queryWrapper = new MPJLambdaWrapper<YwWarehouse>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwWarehouse::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwWarehouse::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwWarehouse::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwWarehouse::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().ge(YwWarehouse::getName, Utils.Date.getStart(pageWrap.getModel().getName()));
- queryWrapper.lambda().le(YwWarehouse::getName, Utils.Date.getEnd(pageWrap.getModel().getName()));
- }
- if (pageWrap.getModel().getPosition() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getPosition, pageWrap.getModel().getPosition());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getUserId() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getUserId, pageWrap.getModel().getUserId());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(YwWarehouse::getSortnum, pageWrap.getModel().getSortnum());
- }
+ YwWarehouse model = pageWrap.getModel();
+ queryWrapper.selectAll(YwWarehouse.class)
+ .selectAs(SystemUser::getRealname, YwWarehouse::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWarehouse::getUserId)
+ .eq(Objects.nonNull(model.getStatus()),YwWarehouse::getStatus,model.getStatus())
+ .like(StringUtils.isNotBlank(model.getName()),YwWarehouse::getName,model.getName())
+ .eq(YwWarehouse::getIsdeleted,Constants.ZERO)
+ ;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -138,9 +172,65 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(ywWarehouseMapper.selectPage(page, queryWrapper));
+ IPage iPage = ywWarehouseMapper.selectJoinPage(page,YwWarehouse.class,queryWrapper);
+ return PageData.from(iPage);
}
+
+// @Override
+// public PageData<YwWarehouse> findPage(PageWrap<YwWarehouse> pageWrap) {
+// IPage<YwWarehouse> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+// QueryWrapper<YwWarehouse> queryWrapper = new QueryWrapper<>();
+// Utils.MP.blankToNull(pageWrap.getModel());
+//
+// if (pageWrap.getModel().getId() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getId, pageWrap.getModel().getId());
+// }
+// if (pageWrap.getModel().getCreator() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getCreator, pageWrap.getModel().getCreator());
+// }
+// if (pageWrap.getModel().getCreateDate() != null) {
+// queryWrapper.lambda().ge(YwWarehouse::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+// queryWrapper.lambda().le(YwWarehouse::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+// }
+// if (pageWrap.getModel().getEditor() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getEditor, pageWrap.getModel().getEditor());
+// }
+// if (pageWrap.getModel().getEditDate() != null) {
+// queryWrapper.lambda().ge(YwWarehouse::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+// queryWrapper.lambda().le(YwWarehouse::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+// }
+// if (pageWrap.getModel().getRemark() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getRemark, pageWrap.getModel().getRemark());
+// }
+// if (pageWrap.getModel().getStatus() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getStatus, pageWrap.getModel().getStatus());
+// }
+// if (pageWrap.getModel().getName() != null) {
+// queryWrapper.lambda().like(YwWarehouse::getName, pageWrap.getModel().getName());
+// }
+// if (pageWrap.getModel().getPosition() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getPosition, pageWrap.getModel().getPosition());
+// }
+// if (pageWrap.getModel().getCode() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getCode, pageWrap.getModel().getCode());
+// }
+// if (pageWrap.getModel().getUserId() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getUserId, pageWrap.getModel().getUserId());
+// }
+// if (pageWrap.getModel().getSortnum() != null) {
+// queryWrapper.lambda().eq(YwWarehouse::getSortnum, pageWrap.getModel().getSortnum());
+// }
+// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+// queryWrapper.orderByDesc(sortData.getProperty());
+// } else {
+// queryWrapper.orderByAsc(sortData.getProperty());
+// }
+// }
+// return PageData.from(ywWarehouseMapper.selectPage(page, queryWrapper));
+// }
+
@Override
public long count(YwWarehouse ywWarehouse) {
QueryWrapper<YwWarehouse> wrapper = new QueryWrapper<>(ywWarehouse);
--
Gitblit v1.9.3