From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialDetailInfoServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialDetailInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialDetailInfoServiceImpl.java
index 6a8537b..8ba141c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialDetailInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialDetailInfoServiceImpl.java
@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
-import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.enums.IssueReceiptEnum;
import com.gkhy.safePlatform.equipment.enums.ValidStatusEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
-import com.gkhy.safePlatform.equipment.model.dto.req.SafeMatetrialDetailQuery;
+import com.gkhy.safePlatform.equipment.model.dto.req.db.SafeMaterialDetailDBQuery;
import com.gkhy.safePlatform.equipment.repository.SafeMaterialDetailInfoRepository;
import com.gkhy.safePlatform.equipment.service.baseService.SafeMaterialDetailInfoService;
import jodd.util.StringUtil;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -85,23 +83,13 @@
}
@Override
- public void updateDeliveryStatusByIds(SafeMaterialDetailBO detailBO) {
- if(CollectionUtils.isEmpty(detailBO.getIds()) || null == detailBO.getClaimantId() || StringUtil.isBlank(detailBO.getClaimantName())){
+ public void updateDeliveryStatusByIds(SafeMaterialBatchDeliveryBO detailBO) {
+ if(CollectionUtils.isEmpty(detailBO.getIds()) || null == detailBO.getReceiveUid() || StringUtil.isBlank(detailBO.getReceiveUname())){
throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
}
detailBO.setIrStatus(IssueReceiptEnum.OUT_OF_LIBRARY.getCode());
detailBO.setDeliveryTime(LocalDateTime.now());
repository.updateDeliveryStatusByIds(detailBO);
- }
-
- @Override
- public void deliveryBatchRandom(SafeMaterialDetailBO detailBO) {
- if(null == detailBO.getCount() || null == detailBO.getClaimantId() || StringUtil.isBlank(detailBO.getClaimantName())){
- throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
- }
- detailBO.setIrStatus(IssueReceiptEnum.OUT_OF_LIBRARY.getCode());
- detailBO.setDeliveryTime(LocalDateTime.now());
- repository.deliveryBatchRandom(detailBO);
}
@Override
@@ -114,7 +102,7 @@
}
@Override
- public List<SafeMaterialDetailInfoDO> listByPage(Page<SafeMaterialDetailInfo> page, SafeMatetrialDetailQuery query) {
+ public List<SafeMaterialDetailInfoDO> listByPage(Page<SafeMaterialDetailInfo> page, SafeMaterialDetailDBQuery query) {
return repository.listByCondition(page,query);
}
@@ -188,5 +176,38 @@
return repository.getListByRfids(rfids);
}
+ @Override
+ public List<SafeMaterialDetailInfo> getUnValidList() {
+ return repository.getUnValidList(ValidStatusEnum.YES.getCode());
+ }
+
+ @Override
+ public void updateValidStatusByIds(List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ repository.updateValidStatusByIds(ids,ValidStatusEnum.NO.getCode());
+ }
+
+ @Override
+ public List<SafeMaterialDetailInfo> getListBySmIdAndRfid(SafeMaterialDetailDBQuery query) {
+ List<SafeMaterialDetailInfo> list = repository.getListBySmIdAndRfid(query);
+ return list;
+ }
+
+ @Override
+ public List<SafeMaterialDetailInfo> getListBySmId(SafeMaterialDetailDBQuery query) {
+ List<SafeMaterialDetailInfo> list = repository.getListBySmId(query);
+ return list;
+ }
+
+ @Override
+ public void updateBatch(List<SafeMaterialDetailInfo> list) {
+ if(CollectionUtils.isEmpty(list)){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ repository.updateBatch(list);
+ }
+
}
--
Gitblit v1.9.2