2022-09-13 审核对接接口调整。

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UseRecord.java

@@ -37,7 +37,7 @@ public class UseRecord extends BaseBean {
     private String phone;
 
     @ApiModelProperty("实验地点")
-    private String location;
+    private String subjectName;
 
     @ApiModelProperty("实验室id")
     private Long subjectId;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/dto/UseRecordDto.java

@@ -29,7 +29,7 @@ public class UseRecordDto {
     private String phone;
     /** 实验地点 */
     @ApiModelProperty(value = "实验地点")
-    private String location;
+    private String subjectName;
     /** 气瓶ID */
     @ApiModelProperty(value = "气瓶ID")
     private Long storageId;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageUseVo.java

@@ -0,0 +1,28 @@
+package com.zd.bottle.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.bottle.domain.BottleStorage;
+import com.zd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class BottleStorageUseVo extends BottleStorage {
+
+    /**
+     * 领用时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "领用时间")
+    private Date receivingTime;
+
+    /** 使用人id */
+    @ApiModelProperty(value = "使用人id")
+    private Long useUserId;
+
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UsegasApplyTabVo.java

@@ -24,9 +24,9 @@ public class UsegasApplyTabVo {
     private Long waitApplyCount;
 
     @ApiModelProperty(value = "已通过统计")
-    private String passApplyCount;
+    private Long passApplyCount;
 
     @ApiModelProperty(value = "未通过统计")
-    private String refuseApplyCount;
+    private Long refuseApplyCount;
 
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -6,12 +6,16 @@ import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.service.BottleStorageService;
+import com.zd.bottle.vo.BottleStorageUseVo;
+import com.zd.bottle.vo.BottleStorageVo;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.ApiOperation;
+import org.apache.hadoop.security.SecurityUtil;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
@@ -58,4 +62,53 @@ public class BottleStorageController extends BaseController<BottleStorage> {
 
         return ResultData.result(bottleStorageService.add(bottleStorage));
     }
+
+
+
+    /**
+     * 查询领用气瓶列表(管理端)
+     */
+    @GetMapping("/receivingGasList")
+    @ApiOperation(value = "查询领用气瓶列表")
+    public TableDataInfo<BottleStorage> receivingGasList(BottleStorage bottleStorage) {
+        startPage();
+        List<BottleStorage> list = bottleStorageService.receivingGasList(bottleStorage);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 归还气瓶列表(管理端)
+     */
+    @GetMapping("/returnGas")
+    @ApiOperation(value = "归还气瓶列表")
+    public TableDataInfo<BottleStorage> returnGas(BottleStorageUseVo bottleStorageUseVo) {
+        startPage();
+        bottleStorageUseVo.setUseUserId(SecurityUtils.getUserId());
+        List<BottleStorageUseVo> list = bottleStorageService.returnGas(bottleStorageUseVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询领用气瓶列表(学生端)
+     */
+    @GetMapping("/receivingGasListByStu")
+    @ApiOperation(value = "查询领用气瓶列表")
+    public TableDataInfo<BottleStorage> receivingGasListByStu(BottleStorage bottleStorage) {
+        startPage();
+        List<BottleStorage> list = bottleStorageService.receivingGasList(bottleStorage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 归还气瓶列表(学生端)
+     */
+    @GetMapping("/returnGasByStu")
+    @ApiOperation(value = "归还气瓶列表")
+    public TableDataInfo<BottleStorage> returnGasByStu(BottleStorageUseVo bottleStorageUseVo) {
+        startPage();
+        bottleStorageUseVo.setUseUserId(SecurityUtils.getUserId());
+        List<BottleStorageUseVo> list = bottleStorageService.returnGas(bottleStorageUseVo);
+        return getDataTable(list);
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasAuditRecordController.java

@@ -35,7 +35,6 @@ public class UsegasAuditRecordController extends BaseController<UsegasAuditRecor
     @ApiModelProperty(value = "审核记录列表")
     @GetMapping("/auditRecordList")
     public TableDataInfo <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord){
-        startPage();
         List <UsegasAuditRecord> list = usegasAuditRecordService.auditRecordList(usegasAuditRecord);
         return getDataTable(list);
     }
@@ -43,14 +42,6 @@ public class UsegasAuditRecordController extends BaseController<UsegasAuditRecor
     @ApiModelProperty(value = "审核通过")
     @PostMapping("/auditPass")
     public ResultData auditPass(@RequestBody UsegasAuditRecord usegasAuditRecord){
-        usegasAuditRecord.setAuditStatus(1L);
-        return ResultData.result(usegasAuditRecordService.auditPass(usegasAuditRecord));
-    }
-
-    @ApiModelProperty(value = "审核驳回")
-    @PostMapping("/auditRefuse")
-    public ResultData auditRefuse(@RequestBody UsegasAuditRecord usegasAuditRecord){
-        usegasAuditRecord.setAuditStatus(2L);
         return ResultData.result(usegasAuditRecordService.auditPass(usegasAuditRecord));
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageMapper.java

@@ -2,6 +2,9 @@ package com.zd.bottle.mapper;
 
 import com.zd.bottle.domain.BottleStorage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zd.bottle.vo.BottleStorageUseVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BottleStorageMapper extends BaseMapper<BottleStorage> {
 
+    /**
+     * 查询归还气瓶列表
+     * @param bottleStorageUseVo 实体
+     * @return boolean
+     */
+    List <BottleStorageUseVo> returnGas(BottleStorageUseVo bottleStorageUseVo);
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageService.java

@@ -3,6 +3,9 @@ package com.zd.bottle.service;
 import com.zd.bottle.domain.BottleStorage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.vo.BottleStorageUseVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -21,4 +24,20 @@ public interface BottleStorageService extends IService<BottleStorage> {
      */
     boolean add(BottleStorage bottleStorage);
 
+
+    /**
+     * 查询领用气瓶列表
+     * @param bottleStorage 实体
+     * @return boolean
+     */
+    List <BottleStorage> receivingGasList(BottleStorage bottleStorage);
+
+
+    /**
+     * 查询领用气瓶列表
+     * @param bottleStorageUseVo 实体
+     * @return boolean
+     */
+    List <BottleStorageUseVo> returnGas(BottleStorageUseVo bottleStorageUseVo);
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java

@@ -1,14 +1,19 @@
 package com.zd.bottle.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.BottleStorage;
+import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.mapper.BottleStorageMapper;
 import com.zd.bottle.service.BottleStorageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +29,8 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
     @Resource
     private TokenService tokenService;
 
+    @Resource
+    private BottleStorageMapper bottleStorageMapper;
 
     /**
      * 新增入库信息
@@ -39,4 +46,19 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
         bottleStorage.setInUserPhone(sysUser.getPhonenumber());
         return save(bottleStorage);
     }
+
+    @Override
+    public List <BottleStorage> receivingGasList(BottleStorage bottleStorage) {
+        LambdaQueryWrapper <BottleStorage> wrapper = Wrappers.lambdaQuery();
+        wrapper.ge(BottleStorage::getStorageStatus,1);
+        wrapper.orderByDesc(BottleStorage::getCreateTime);
+        wrapper.setEntity(bottleStorage);
+        List <BottleStorage> list = list(wrapper);
+        return list;
+    }
+
+    @Override
+    public List <BottleStorageUseVo> returnGas(BottleStorageUseVo bottleStorageUseVo) {
+        return bottleStorageMapper.returnGas(bottleStorageUseVo);
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageMapper.xml

@@ -60,4 +60,16 @@
         update_time
     </sql>
 
+    <select id="returnGas" parameterType="com.zd.bottle.vo.BottleStorageUseVo" resultType="com.zd.bottle.vo.BottleStorageUseVo">
+        SELECT bs.*,ur.create_time receivingTime,ur.`user_id` useUserId
+        FROM ab_bottle_storage bs
+        INNER JOIN ab_use_record ur ON bs.`id` = ur.storage_id
+        <where>
+            bs.storage_status = 2 and ur.back_time is null
+            <if test="useUserId != null and useUserId!=''">
+                and ur.`user_id` = #{useUserId}
+            </if>
+        </where>
+        order by ur.create_time desc
+    </select>
 </mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UseRecordMapper.xml

@@ -12,7 +12,7 @@
         <result column="contacts" property="contacts" />
         <result column="user_id" property="userId" />
         <result column="phone" property="phone" />
-        <result column="location" property="location" />
+        <result column="subject_name" property="subjectName" />
         <result column="subject_id" property="subjectId" />
         <result column="storage_id" property="storageId" />
         <result column="before_use_pic" property="beforeUsePic" />
@@ -31,7 +31,7 @@
         create_by,
         update_by,
         update_time,
-        contacts, user_id, phone, location, subject_id, storage_id, before_use_pic, before_use, after_use_pic, after_use, amount, use_time, back_time
+        contacts, user_id, phone, subject_name, subject_id, storage_id, before_use_pic, before_use, after_use_pic, after_use, amount, use_time, back_time
     </sql>
     <select id="getBottleInfoByStorageId" resultType="com.zd.bottle.vo.UseRecordVo"
             parameterType="java.lang.Long">