起重机械设备

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("修改成功!");

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<LiftingDeviceExamine> 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<List<AnnexFile>> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceExamine liftingDeviceExamine) {
+        Result<List<AnnexFile>> result = new Result<List<AnnexFile>>();
+        LiftingDeviceExamine liftingDeviceExamineEntity = liftingDeviceExamineService.getById(liftingDeviceExamine.getId());
+        if (liftingDeviceExamineEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(liftingDeviceExamineService.queryAnnexFile(liftingDeviceExamine.getId()));
+            result.setSuccess(true);
+        }
+        return result;
+    }
 }

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<LiftingDeviceExamine> {
 
+    List<AnnexFile> queryAnnexFile(Long id);
 }

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<LiftingDeviceExamineMapper, LiftingDeviceExamine> implements ILiftingDeviceExamineService {
 
+    @Autowired
+    private IAnnexFileService annexFileService;
+
+    @Override
+    public List<AnnexFile> queryAnnexFile(Long id) {
+        return annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, id));
+    }
 }