From 91e3b362ad9e7fbfcdea717d660eae70d976a03a Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 1 Sep 2023 08:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B7=E9=87=8D=E6=9C=BA=E6=A2=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntLiftingDeviceController.java | 4 ++-- .../EntLiftingDeviceExamineController.java | 21 +++++++++++++++++++ .../service/ILiftingDeviceExamineService.java | 4 ++++ .../impl/LiftingDeviceExamineServiceImpl.java | 13 ++++++++++++ 4 files changed, 40 insertions(+), 2 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 3f88ec9..0d60cd1 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 @@ -112,10 +112,10 @@ public class EntLiftingDeviceController { result.error500("未找到对应实体"); return result; } - if (liftingDevice.getIdentification() != 0) { + /* if (liftingDevice.getIdentification() != 0) { 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/enterprise/EntLiftingDeviceExamineController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceExamineController.java index a8b6bcc..d26a80f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceExamineController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceExamineController.java @@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService; import io.swagger.annotations.Api; @@ -79,4 +80,24 @@ public class EntLiftingDeviceExamineController { List list = liftingDeviceExamineService.list(queryWrapper); return Result.success(list); } + + /** + * 通过id查询附件信息 + * @return + */ + @OperLog(operModul = "起重机械设备管理", operType = "查询", operDesc = "通过id查询附件信息") + @ApiOperation(value = "通过id查询附件信息", notes = "通过id查询附件信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "审批ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryAnnexFile") + public Result> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceExamine liftingDeviceExamine) { + Result> result = new Result>(); + LiftingDeviceExamine liftingDeviceExamineEntity = liftingDeviceExamineService.getById(liftingDeviceExamine.getId()); + if (liftingDeviceExamineEntity == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(liftingDeviceExamineService.queryAnnexFile(liftingDeviceExamine.getId())); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceExamineService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceExamineService.java index 77ec375..5a85159 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceExamineService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceExamineService.java @@ -1,8 +1,11 @@ package com.zhgd.xmgl.modules.safety.service; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 起重机械审批 * @author： pengj @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ILiftingDeviceExamineService extends IService { + List queryAnnexFile(Long id); } 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 6e178db..04a3a1b 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 @@ -1,12 +1,18 @@ package com.zhgd.xmgl.modules.safety.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine; import com.zhgd.xmgl.modules.safety.mapper.LiftingDeviceExamineMapper; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; + /** * @Description: 起重机械审批 * @author： pengj @@ -16,4 +22,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class LiftingDeviceExamineServiceImpl extends ServiceImpl implements ILiftingDeviceExamineService { + @Autowired + private IAnnexFileService annexFileService; + + @Override + public List queryAnnexFile(Long id) { + return annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, id)); + } }