dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
齐天大圣 2024-03-27 15:39:26 +08:00
parent b9eadb12e6
commit 2846701514
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
View File

@ -4,6 +4,7 @@ package com.fuint.business.tag.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.tag.entity.OilTag; import com.fuint.business.tag.entity.OilTag;
@ -11,14 +12,18 @@ import com.fuint.business.tag.entity.TagCodeRecord;
import com.fuint.business.tag.service.OilTagService; import com.fuint.business.tag.service.OilTagService;
import com.fuint.business.tag.service.TagCodeRecordService; import com.fuint.business.tag.service.TagCodeRecordService;
import com.fuint.business.tag.util.TagUtils; import com.fuint.business.tag.util.TagUtils;
import com.fuint.business.tag.vo.OilTagVO;
import com.fuint.framework.web.BaseController; import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject; import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
/** /**
* 码牌配置表(OilTag)表控制层 * 码牌配置表(OilTag)表控制层
@ -57,7 +62,24 @@ public class OilTagController extends BaseController {
queryWrapper.eq(OilTag::getSnCode,oilTag.getSnCode()); queryWrapper.eq(OilTag::getSnCode,oilTag.getSnCode());
} }
queryWrapper.orderByDesc(OilTag::getCreateTime); queryWrapper.orderByDesc(OilTag::getCreateTime);
return getSuccessResult(this.oilTagService.page(page, queryWrapper)); ArrayList<OilTagVO> oilTagVOArrayList = new ArrayList<>();
IPage page1 = this.oilTagService.page(page, queryWrapper);
List<OilTag> records = page1.getRecords();
for (OilTag record : records) {
Integer oilTagId = record.getId();
LambdaQueryWrapper<TagCodeRecord> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId);
TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1);
OilTagVO oilTagVO = new OilTagVO();
BeanUtils.copyProperties(record,oilTagVO);
if (ObjectUtils.isNotEmpty(one)){
oilTagVO.setStoreName(one.getStoreName());
}
oilTagVOArrayList.add(oilTagVO);
}
page1.setRecords(oilTagVOArrayList);
return getSuccessResult(page1);
} }
/** /**
@ -103,7 +125,20 @@ public class OilTagController extends BaseController {
*/ */
@DeleteMapping("{id}") @DeleteMapping("{id}")
public ResponseObject delete(@PathVariable("id") Long id) { public ResponseObject delete(@PathVariable("id") Long id) {
return getSuccessResult(this.oilTagService.removeById(id)); OilTag oilTag = this.oilTagService.getById(id);
LambdaQueryWrapper<TagCodeRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TagCodeRecord::getOilTagId,oilTag.getId());
TagCodeRecord tagCodeRecord = this.tagCodeRecordService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(tagCodeRecord.getStaffId())){
return getSuccessResult("该码牌已绑定员工，请先解绑员工！");
}else {
this.tagCodeRecordService.removeById(tagCodeRecord.getId());
oilTag.setStatus("0");
this.oilTagService.updateById(oilTag);
return getSuccessResult("解绑成功！");
}
/* TagCodeRecord tagCodeRecord = this.tagCodeRecordService.getById(id);
return getSuccessResult(this.oilTagService.removeById(id));*/
} }