From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 14 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractServiceImpl.java
index 1a03df0..4f4e358 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractServiceImpl.java
@@ -1,11 +1,12 @@
package com.by4cloud.platformx.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.by4cloud.platformx.device.entity.Contract;
-import com.by4cloud.platformx.device.entity.ContractItem;
-import com.by4cloud.platformx.device.mapper.ContractItemMapper;
-import com.by4cloud.platformx.device.mapper.ContractMapper;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.constant.CommonStatusContant;
+import com.by4cloud.platformx.device.entity.*;
+import com.by4cloud.platformx.device.mapper.*;
import com.by4cloud.platformx.device.service.ContractService;
import org.springframework.stereotype.Service;
import cn.hutool.core.collection.CollUtil;
@@ -14,6 +15,7 @@
import lombok.RequiredArgsConstructor;
import java.io.Serializable;
+import java.util.List;
import java.util.Objects;
/**
* 鍚堝悓琛�
@@ -25,10 +27,16 @@
@RequiredArgsConstructor
public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements ContractService {
private final ContractItemMapper contractItemMapper;
+ private final DeviceLeasingLedgerMapper leasingLedgerMapper;
+ private final DeviceLeasingLedgerItemMapper ledgerItemMapper;
+ private final DeviceInventoryMapper inventoryMapper;
+ private final InventoryFlowWaterMapper flowWaterMapper;
+ private final DeviceMapper deviceMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveDeep(Contract contract) {
+ contract.setStatus(CommonStatusContant.CONTRACT_STATUS_PENDING_APPROVAL);
baseMapper.insert(contract);
for (ContractItem contractItem : contract.getContractItemList()) {
contractItem.setContractId(contract.getId());
@@ -42,14 +50,17 @@
@Transactional(rollbackFor = Exception.class)
public Boolean updateDeep(Contract contract) {
baseMapper.updateById(contract);
- for (ContractItem contractItem : contract.getContractItemList()) {
- if (Objects.isNull(contractItem.getId())) {
- contractItem.setContractId(contract.getId());
- contractItemMapper.insert(contractItem);
- } else {
- contractItemMapper.updateById(contractItem);
- }
- }
+ if (contract.getContractItemList() != null&&contract.getContractItemList().size()>0) {
+ QueryWrapper<ContractItem> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("contract_id",contract.getId());
+ contractItemMapper.delete(queryWrapper);
+ for (ContractItem contractItem : contract.getContractItemList()) {
+ contractItem.setId(null);
+ contractItem.setContractId(contract.getId());
+ contractItemMapper.insert( contractItem);
+ }
+ }
+
return Boolean.TRUE;
}
@@ -69,7 +80,80 @@
}
@Override
- public Contract getByIdDeep(Serializable id) {
- return ContractService.super.getByIdDeep(id);
+ public Contract getDetailById(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ QueryWrapper<ContractItem> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("contract_id",id);
+ List<ContractItem> itemList = contractItemMapper.selectList(queryWrapper);
+ contract.setContractItemList(itemList);
+ return contract;
+ }
+
+ @Override
+ public Boolean approved(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ contract.setStatus(CommonStatusContant.CONTRACT_STATUS_APPROVED);
+ baseMapper.updateById(contract);
+ return Boolean.TRUE;
+ }
+
+ @Override
+ public List<Contract> getApprovedContractList() {
+ QueryWrapper<Contract> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("status",CommonStatusContant.CONTRACT_STATUS_APPROVED);
+ List<Contract> list = baseMapper.selectList(queryWrapper);
+ return list;
+ }
+
+ @Override
+ public R approvelInvalid(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ contract.setStatus(CommonStatusContant.CONTRACT_STATUS_INVALID_PENDING_APPROVAL);
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+
+ @Override
+ public R invalidById(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ contract.setStatus(CommonStatusContant.CONTRACT_STATUS_INVALID);
+ baseMapper.updateById(contract);
+ //鏍规嵁鍚堝悓鏌ユ壘鐩稿叧绉熻祦鍙拌处
+ QueryWrapper<DeviceLeasingLedger> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("contract_id",id);
+ DeviceLeasingLedger ledger = leasingLedgerMapper.selectOne(queryWrapper);
+ if (ledger!=null){
+ //鏌ユ壘鐩稿叧鍙拌处鏄庣粏
+ QueryWrapper<DeviceLeasingLedgerItem> ledgerItemQueryWrapper = new QueryWrapper<>();
+ ledgerItemQueryWrapper.eq("ledger_id",ledger.getId());
+ List<DeviceLeasingLedgerItem> ledgerItemList = ledgerItemMapper.selectList(ledgerItemQueryWrapper);
+ if(ledgerItemList.size()>0){
+ //鏍规嵁鍙拌处鏄庣粏鏌ヨ璁惧搴撳瓨
+ ledgerItemList.stream().forEach(deviceLeasingLedgerItem -> {
+ QueryWrapper<DeviceInventory> inventoryQueryWrapper = new QueryWrapper<>();
+ inventoryQueryWrapper.eq("ledger_item_id",deviceLeasingLedgerItem.getId());
+ List<DeviceInventory> inventoryList = inventoryMapper.selectList(inventoryQueryWrapper);
+ //灏嗚澶囧簱瀛樼姸鎬佹洿涓哄彲鐢�
+ if (inventoryList.size()>0){
+ inventoryList.stream().forEach(deviceInventory -> {
+ deviceInventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_USABLE);
+ inventoryMapper.updateById(deviceInventory);
+ //搴撳瓨娴佹按
+ InventoryFlowWater flowWater = new InventoryFlowWater();
+ flowWater.setDeviceId(deviceInventory.getDeviceId());
+ Device device = deviceMapper.selectById(deviceInventory.getDeviceId());
+ if (device!=null){
+ flowWater.setClassId(device.getClassId());
+ }
+ flowWater.setInventoryId(deviceInventory.getId());
+ flowWater.setSerialNo(deviceInventory.getSerialNo());
+ flowWater.setOperateType(CommonStatusContant.DEVICE_INVENTORY_FLOW_WATER_IN);
+ flowWaterMapper.insert(flowWater);
+ });
+ }
+ });
+ }
+ }
+ return R.ok();
}
}
--
Gitblit v1.9.1