气瓶修改

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +25,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "AlarmRecord对象", description = "报警记录表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AlarmRecord extends BaseBean{
 
     @ApiModelProperty("数据主键，关联其他业务表中的数据id")

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,6 +26,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "BottleStorageError对象", description = "气瓶异常记录表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BottleStorageError extends BaseBean {
 
     @ApiModelProperty("气瓶入库ID")

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +24,7 @@ import org.hibernate.validator.constraints.Length;
 @Accessors(chain = true)
 @ApiModel(value = "RfidTag对象", description = "RFID标签管理")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class RfidTag extends BaseBean {
 
     @Excel(name = "授权码")

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,6 +26,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "UseRecord对象", description = "使用记录表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UseRecord extends BaseBean {
 
     @ApiModelProperty("联系人")

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

@@ -1,6 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +27,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "UsegasApply对象", description = "用气申请表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UsegasApply extends BaseBean {
 
     @ApiModelProperty("实验地点")

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +25,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "UsegasAuditRecord对象", description = "用气审核表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UsegasAuditRecord extends BaseBean {
 
     @ApiModelProperty("审核人id")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author: liujh
@@ -44,6 +45,12 @@ public class BottleStorageOutVo extends BottleStorageOut {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 批量操作的id集合
+     */
+    @ApiModelProperty("批量操作的id集合")
+    private List<Long> ids;
+    
     @Override
     public Date getCreateTime() {
         return createTime;

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

@@ -9,15 +9,20 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Administrator
  */
 @Data
-@Getter
-@Setter
 public class BottleStorageVo extends BottleStorage {
 
+    /**
+     * 批量操作的id集合
+     */
+    @ApiModelProperty("批量操作的id集合")
+    private List<Long> ids;
+
     /** 使用人数 */
     @ApiModelProperty(value = "使用人数")
     private Integer numberPersons;

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

@@ -58,6 +58,7 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
         bottleStorage.setDeptName(sysUser.getDept().getDeptName());
         bottleStorage.setCreateBy(sysUser.getNickName());
         bottleStorage.setCreateTime(new Date());
+        bottleStorage.setCurrentPressure(bottleStorage.getGasPressure());
         bottleStorage.setAirNumber(String.valueOf(System.currentTimeMillis() ) );
 
         return save(bottleStorage);

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

@@ -73,18 +73,28 @@
 
     <select id="getListVo" resultType="com.zd.bottle.vo.BottleStorageVo"
             parameterType="com.zd.bottle.vo.BottleStorageVo">
+        select * from (
         select bs.*,
-               (select count(1) from ab_use_record ur where ur.storage_id=bs.id) numberPersons,
-               ( select max(ur.use_time) from ab_use_record ur where ur.storage_id=bs.id ORDER BY use_time desc ) lastTime
+        (select count(1) from ab_use_record ur where ur.storage_id=bs.id) numberPersons,
+        ( select max(ur.use_time) from ab_use_record ur where ur.storage_id=bs.id ORDER BY use_time desc ) lastTime
         from ab_bottle_storage bs
-                 where 1=1
-        <if test="searchValue != null">
+        where 1=1
+        <if test="searchValue != null and searchValue != ''">
             and (bs.electronic_tag like concat('%', #{searchValue}, '%')
             or bs.air_number like concat('%', #{searchValue}, '%') )
         </if>
         <if test="storageStatus != null ">and storage_status = #{storageStatus}</if>
-        <if test="startTime != null "> and date_format(bs.create_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
-        <if test="endTime != null "> and date_format(bs.create_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+        <if test="ids != null ">
+            and bs.id in
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ) t  where 1=1
+        <if test="startTime != null ">
+               and date_format(t.lastTime,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
+        <if test="endTime != null ">
+               and date_format(t.lastTime,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
     </select>
 
     <select id="returnGas" parameterType="com.zd.bottle.vo.BottleStorageUseVo" resultType="com.zd.bottle.vo.BottleStorageUseVo">

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

@@ -54,6 +54,13 @@
         ab_bottle_storage_out bso
         LEFT JOIN ab_bottle_storage bs ON bso.storage_id = bs.id
         <where>
+        <if test="ids != null ">
+            and bso.id in
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
         <if test="searchValue != null">
             and (
             bso.user_name like concat('%', #{searchValue}, '%')