bug修复

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

@@ -8,12 +8,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-
 import java.util.Date;
 
 /**
@@ -56,7 +53,6 @@ public class BottleStorage extends BaseBean {
     private String configName;
 
     @Excel(name = "入库时间" ,type = Excel.Type.ALL,dateFormat = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -81,11 +77,11 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("最低气压值")
     private BigDecimal minPressure;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
     @ApiModelProperty("检验有效期(开始时间)")
     private Date validateStartTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
     @ApiModelProperty("检验有效期(结束时间)")
     private Date validateEndTime;
 

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

@@ -99,7 +99,7 @@ public class BottleStorageErrorVo {
 
     /** 气体组成（冗余字段） */
     @ApiModelProperty(value = "气体组成")
-    private String airConstituents;
+    private String airComponent;
 
     private List<UseRecordVo> recordVos;
 

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

@@ -1,10 +1,9 @@
 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 lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -12,12 +11,12 @@ import java.util.Date;
  * @author Administrator
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class BottleStorageUseVo extends BottleStorage {
 
     /**
      * 领用时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "领用时间")
     private Date receivingTime;
 

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

@@ -1,6 +1,5 @@
 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.ApiModel;
@@ -105,14 +104,12 @@ public class UseRecordVo {
     /**
      * 使用时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "使用时间")
     private Date useTime;
     /**
      * 归还时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "归还时间")
     private Date backTime;

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

@@ -86,7 +86,7 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         BottleStorage bottleStorage = storageService.getById(storageError.getStorageId());
         storageErrorVo.setAirName(bottleStorage.getAirName())
                 .setConfigName(bottleStorage.getConfigName())
-                .setAirConstituents(bottleStorage.getAirComponent())
+                .setAirComponent(bottleStorage.getAirComponent())
                 .setAirNumber(bottleStorage.getAirNumber())
                 .setElectronicTag(bottleStorage.getElectronicTag());
         List<UseRecord> useRecords = useRecordService.getByStorageId(storageError.getStorageId());

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

@@ -2,7 +2,6 @@ package com.zd.bottle.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.BottleStorage;
@@ -83,13 +82,10 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
     public List<UseRecord> getList(UseRecord useRecord) {
         LambdaQueryWrapper<UseRecord> queryWrapper = Wrappers.lambdaQuery(UseRecord.class);
         String startTime = useRecord.getStartTime();
-        if (StringUtils.hasLength(startTime)) {
-            queryWrapper.apply("DATE_FORMAT(use_time,'%Y-%m-%d') >=" + startTime);
-        }
         String endTime = useRecord.getEndTime();
-        if (StringUtils.hasLength(endTime)) {
-            queryWrapper.apply("DATE_FORMAT(use_time,'%Y-%m-%d') <=" + endTime);
-        }
+
+        queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(use_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
+                .apply(StringUtils.hasLength(endTime), "DATE_FORMAT(use_time,'%Y-%m-%d') >=date_format('" + endTime + "','%Y-%m-%d')");
         String searchValue = useRecord.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
             queryWrapper.like(UseRecord::getContacts, searchValue)
@@ -98,8 +94,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         }
 
         List<Long> ids = useRecord.getIds();
-        if (ids!=null && !ids.isEmpty()){
-            queryWrapper.in(UseRecord::getId,ids);
+        if (ids != null && !ids.isEmpty()) {
+            queryWrapper.in(UseRecord::getId, ids);
         }
         queryWrapper.setEntity(useRecord);
         return list(queryWrapper);
@@ -204,8 +200,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             throw new ServiceException("气瓶不存在");
         }
 
-        LambdaUpdateWrapper<BottleStorage> updateWrapper = Wrappers.lambdaUpdate(BottleStorage.class);
-        updateWrapper.eq(BottleStorage::getId, useRecord.getStorageId()).set(BottleStorage::getStorageStatus, 2);
+        storage.setStorageStatus(2);
         Integer isSurplus = recordDto.getIsSurplus();
         if (isSurplus == 1) {
             // 修改库存中气瓶余量标记
@@ -213,15 +208,18 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             BottleStorageError bottleStorageError = new BottleStorageError();
             bottleStorageError.setStorageId(useRecord.getStorageId())
                     .setBeforeEdit(storage.getCurrentPressure())
-                    .setAfterEdit(useRecord.getBeforeUse());
+                    .setAfterEdit(useRecord.getBeforeUse())
+                    .setOpTime(Calendar.getInstance().getTime())
+                    .setPhone(sysUser.getPhonenumber());
+            bottleStorageError.setCommonValue(sysUser.getUserName(),sysUser.getUserId(),sysUser.getDeptId());
             errorService.save(bottleStorageError);
         }
-        if (!storageService.update(updateWrapper)) {
+        if (!storageService.updateById(storage)) {
             throw new ServiceException("入库数据异常");
         }
         //设置其他公共字段
         useRecord.setUserId(sysUser.getUserId());
-        useRecord.setCommonValue(sysUser.getUserName(),sysUser.getUserId(),sysUser.getDeptId());
+        useRecord.setCommonValue(sysUser.getUserName(), sysUser.getUserId(), sysUser.getDeptId());
         if (save(useRecord)) {
             return result;
         }
@@ -231,7 +229,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
     @Override
     public Integer updateUseRecord(UseRecord useRecord) {
         R<LoginUser> userInfo = userService.getUserInfo(SecurityUtils.getUsername(), SecurityConstants.INNER);
-        if (userInfo.getCode()!=HttpStatus.SUCCESS || userInfo.getData()==null){
+        if (userInfo.getCode() != HttpStatus.SUCCESS || userInfo.getData() == null) {
             throw new ServiceException("未登录或登录失效");
         }
         Long storageId = useRecord.getStorageId();
@@ -259,7 +257,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
 
         useRecord.setId(temp.getId());
         SysUser sysUser = userInfo.getData().getSysUser();
-        useRecord.setCommonValue(sysUser.getUserName(),sysUser.getUserId(),sysUser.getDeptId());
+        useRecord.setCommonValue(sysUser.getUserName(), sysUser.getUserId(), sysUser.getDeptId());
         return baseMapper.updateById(useRecord);
     }
 

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

@@ -104,7 +104,7 @@
     </select>
 
     <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
+        SELECT bs.*,ur.use_time receivingTime,ur.`user_id` useUserId
         FROM ab_bottle_storage bs
         INNER JOIN ab_use_record ur ON bs.`id` = ur.storage_id
         <where>

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

@@ -102,7 +102,7 @@
         WHERE
         DATE_FORMAT( r.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ), '%Y-%m' )
         <if test="airName != null and airName!=''">
-            and s.config_name LIKE concat( '%', #{airName}, '%' ) )
+            and s.config_name LIKE concat( '%', #{airName}, '%' )
         </if>
         GROUP BY
         MONTH (r.create_time

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

@@ -73,7 +73,7 @@
         DATE_FORMAT( r.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ), '%Y-%m' )
         and r.lead_audit_staus=1
         <if test="airName != null and airName!=''">
-            and r.use_gas_name LIKE concat( '%', #{airName}, '%' ) )
+            and r.use_gas_name LIKE concat( '%', #{airName}, '%' )
         </if>
         GROUP BY
         MONTH (r.create_time

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabHardwareMapper.xml

@@ -107,7 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLabHardwareList" parameterType="com.zd.laboratory.domain.LabHardware" resultMap="LabHardwareVOResult">
         <include refid="selectLabHardwareVo"/>
         <where>
-            <if test="deviceStatus != null "> and xx.deviceStatus = #{deviceStatus}</if>
+            <if test="ipAddress != null "> and xx.ip_address = #{ipAddress}</if>
+            <if test="deviceStatus != null "> and xx.device_status = #{deviceStatus}</if>
             <if test="subjectId != null "> and xx.subject_id = #{subjectId}</if>
             <if test="deptId != null ">
                 AND (xx.dept_id = #{deptId} OR xx.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},