From 94af58bf6c82d6702bfbffaf9bf701debd853e91 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 8 Sep 2023 19:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B7=E9=87=8D=E6=9C=BA=E6=A2=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntLiftingDeviceController.java | 6 ++++- .../GovLiftingDeviceController.java | 17 ++++++++++---- .../project/LiftingDeviceController.java | 2 +- .../modules/safety/entity/LiftingDevice.java | 12 +++++----- .../safety/service/ILiftingDeviceService.java | 4 ++++ .../impl/LiftingDeviceExamineServiceImpl.java | 2 +- .../impl/LiftingDeviceServiceImpl.java | 23 +++++++++++++++---- 7 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java index 1020853..ff4453f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java @@ -63,7 +63,7 @@ public class EntLiftingDeviceController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(LiftingDevice.class, map); Page page = PageUtil.getPage(map); - IPage pageList = liftingDeviceService.page(page, queryWrapper); + IPage pageList = liftingDeviceService.pageList(page, queryWrapper); return Result.success(pageList); } @@ -116,6 +116,10 @@ public class EntLiftingDeviceController { result.error500("有未通过的申请,请通过后再提交申请"); return result; } + if (liftingDevice.getEquipmentType() == 6 && (liftingDeviceExamineVo.getType() == 5 || liftingDeviceExamineVo.getType() == 4)) { + result.error500("设备已安装,请先拆卸再申请!"); + return result; + } boolean apply = liftingDeviceService.apply(liftingDeviceExamineVo); if (apply) { result.success("修改成功!"); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java index c4143f2..89d25ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -63,13 +65,20 @@ public class GovLiftingDeviceController { }) @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(LiftingDevice.class, map); - Page page = PageUtil.getPage(map); Integer identification = MapUtils.getInteger(map, "identification"); + Integer equipmentType = MapUtils.getInteger(map, "equipmentType"); + QueryWrapper queryWrapper = Wrappers.query(); + Page page = PageUtil.getPage(map); if (identification != null && identification == 6) { - queryWrapper.in("identification", "6,7"); + map.put("identification" , null); + queryWrapper.lambda().in(LiftingDevice::getIdentification, Arrays.asList(6,7)); } - IPage pageList = liftingDeviceService.page(page, queryWrapper); + if (equipmentType != null && equipmentType == 6) { + map.put("equipmentType" , null); + queryWrapper.lambda().in(LiftingDevice::getEquipmentType, Arrays.asList(6,7)); + } + queryWrapper = QueryGenerator.initPageQueryWrapper(LiftingDevice.class, map); + IPage pageList = liftingDeviceService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceController.java index 4d532d2..842aef9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceController.java @@ -67,7 +67,7 @@ public class LiftingDeviceController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LiftingDevice::getEngineeringSn, StrUtil.EMPTY); } - IPage pageList = liftingDeviceService.page(page, queryWrapper); + IPage pageList = liftingDeviceService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java index 4235c09..e6e4f82 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java @@ -112,10 +112,10 @@ public class LiftingDevice implements Serializable { @ApiModelProperty(value = "是否原购产品（1：是，0不是）") private Integer theShipper; /** - * 设备状态（0：提交未审核1：正常，2：临期，3：延期，4：注销禁用，5：报废） + * 设备状态（0：提交未审核 1：产权备案，2：临期，3：延期，4：报废，5：注销禁用;6:安装;7:拆卸） */ - @Excel(name = "设备状态（0：提交未审核 ;1：正常，2：临期，3：延期，4：注销禁用，5：报废）", width = 15) - @ApiModelProperty(value = "设备状态（0：提交未审核 1：正常，2：临期，3：延期，4：注销禁用，5：报废）") + @Excel(name = "设备状态（0：提交未审核 1：产权备案，2：临期，3：延期，4：报废，5：注销禁用;6:安装;7:拆卸）", width = 15) + @ApiModelProperty(value = "设备状态（0：提交未审核 1：产权备案，2：临期，3：延期，4：报废，5：注销禁用;6:安装;7:拆卸）") private Integer equipmentType; /** * 设备使用状态（0：闲置，1：在用） @@ -184,7 +184,7 @@ public class LiftingDevice implements Serializable { */ @Excel(name = "设备用途（1：自用，2：租赁）", width = 15) @ApiModelProperty(value = "设备用途（1：自用，2：租赁）") - private String equipmentUseType; + private Integer equipmentUseType; /** * 产权申请表 */ @@ -300,9 +300,9 @@ public class LiftingDevice implements Serializable { @ApiModelProperty(value = "制造许可证编号") private String manufacturingLicense; /** - * 申请标识，0正常，1产权备案，2安装，3:拆卸; 4延期，5:遗失补证 6:报废 7注销 + * 申请标识，申请标识 0:正常;1:产权备案;2:延期;3:遗失补证;4:报废;5:注销;6:安装;7:拆卸 */ - @Excel(name = "申请标识 0正常，1产权备案，2安装，3:拆卸; 4延期，5:遗失补证 6:报废 7注销", width = 15) + @Excel(name = "申请标识 申请标识 0:正常;1:产权备案;2:延期;3:遗失补证;4:报废;5:注销;6:安装;7:拆卸", width = 15) @ApiModelProperty(value = "申请标识 0:正常;1:产权备案;2:延期;3:遗失补证;4:报废;5:注销;6:安装;7:拆卸") private Integer identification; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java index 3ee9a25..32c0619 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.safety.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.safety.dto.LiftingDeviceExamineDto; import com.zhgd.xmgl.modules.safety.entity.LiftingDevice; @@ -15,6 +17,8 @@ import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceVo; */ public interface ILiftingDeviceService extends IService { + Page pageList(Page page, QueryWrapper wrapper); + boolean saveInfo(LiftingDeviceVo liftingDeviceVo); boolean examine(LiftingDeviceExamineVo liftingDeviceExamineVo); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java index fa841f9..f94f1ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java @@ -29,6 +29,6 @@ public class LiftingDeviceExamineServiceImpl extends ServiceImpl queryAnnexFile(Long id) { return annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, id) - .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_EXAMINE)); + .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_EXAMINE.getValue())); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java index efe2a5e..f8f2773 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.safety.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.Engineering; @@ -57,6 +59,12 @@ public class LiftingDeviceServiceImpl extends ServiceImpl pageList(Page page, QueryWrapper wrapper) { + wrapper.lambda().orderByDesc(LiftingDevice::getCreateTime); + return baseMapper.selectPage(page, wrapper); + } + @Override public boolean saveInfo(LiftingDeviceVo liftingDeviceVo) { SecurityUser user = SecurityUtil.getUser(); @@ -93,7 +101,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); wrapper.set(LiftingDeviceExamine::getState, liftingDeviceExamineVo.getState()); wrapper.set(LiftingDeviceExamine::getExamineResult, liftingDeviceExamineVo.getExamineResult()); @@ -114,8 +122,11 @@ public class LiftingDeviceServiceImpl extends ServiceImpl