Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

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

@@ -78,9 +78,6 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("入库人联系方式")
     private String inUserPhone;
 
-    @ApiModelProperty("气瓶id")
-    private Long airBottleId;
-
     @ApiModelProperty("气体名称")
     private String airName;
 

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

@@ -30,6 +30,7 @@ public class BottleStorageOut extends BaseBean{
     @ApiModelProperty("操作人")
     private String applyUserName;
 
+    @ApiModelProperty("操作人Id")
     private Long applyUserid;
 
     @ApiModelProperty("联系方式")
@@ -38,40 +39,8 @@ public class BottleStorageOut extends BaseBean{
     @ApiModelProperty("入库表id")
     private Long storageId;
 
-    @ApiModelProperty("运输车辆id")
-    private Long carId;
-
-    @ApiModelProperty("车辆号码")
-    private String carNumber;
-
-    @ApiModelProperty("运输人员id")
-    private Long transportId;
-
-    @ApiModelProperty("运输人员姓名")
-    private String transportName;
-
-    @ApiModelProperty("处理人id")
-    private Long disposeUserid;
-
-    @ApiModelProperty("处理人姓名")
-    private String disposeUsername;
-
-    @ApiModelProperty("处理时间")
-    private Date disposeTime;
-
-    @ApiModelProperty("实际出库时间")
-    private Date completeTime;
-
-    @ApiModelProperty("实际出库确认用户id")
-    private Long completeUserid;
-
-    @ApiModelProperty("实际出库确认用户")
-    private String completeUsername;
-
     @ApiModelProperty("出库气压")
     private BigDecimal pressure;
 
-    @ApiModelProperty("出库状态 0待回收  1已确认 2已出库")
-    private Long outStatus;
 
 }

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

@@ -69,7 +69,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             Long storageId = u.getStorageId();
             if (storageMap.containsKey(storageId)) {
                 BottleStorage bottleStorage = storageMap.get(storageId);
-                u.setAirName(bottleStorage.getAirBottleName()).setStorage(bottleStorage);
+                //u.setAirName(bottleStorage.getAirBottleName()).setStorage(bottleStorage);
             }
         });
         return recordVos;

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

@@ -23,41 +23,41 @@
         <result column="in_user_id" property="inUserId"/>
         <result column="in_user_name" property="inUserName"/>
         <result column="in_user_phone" property="inUserPhone"/>
-        <result column="air_bottle_id" property="airBottleId"/>
         <result column="air_component" property="airComponent"/>
         <result column="config_name" property="configName"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id,
-            create_time,
-            is_handwheel,
-            is_fixed,
-            is_electronic_tag,
-            is_status_sign,
-            is_photo,
-            gas_pressure,
-            validate_start_time,
-            validate_end_time,
-            electronic_tag,
-            is_surplus,
-            current_pressure,
-            air_number,
-            validate_remark,
-            rejection_apply_img,
-            rejection_apply_remark,
-            rejection_apply_userid,
-            rejection_apply_time,
-            rejection_userid,
-            rejection_time,
-            storage_status,
-            storage_userid,
-            air_bottle_id,
-            air_bottle_name,
-            air_component,
-            specification_name,
-            config_name
+        id,
+        is_handwheel,
+        is_fixed,
+        is_electronic_tag,
+        is_status_sign,
+        is_photo,
+        gas_pressure,
+        validate_start_time,
+        validate_end_time,
+        electronic_tag,
+        is_surplus,
+        current_pressure,
+        air_number,
+        validate_remark,
+        storage_status,
+        in_user_id,
+        in_user_name,
+        in_user_phone,
+        air_name,
+        air_component,
+        config_name,
+        create_by,
+        create_time,
+        update_by,
+        update_time
     </sql>
 
 </mapper>

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

@@ -10,25 +10,18 @@
         <result column="apply_userid" property="applyUserid" />
         <result column="phone" property="phone" />
         <result column="storage_id" property="storageId" />
-        <result column="car_id" property="carId" />
-        <result column="car_number" property="carNumber" />
-        <result column="transport_id" property="transportId" />
-        <result column="transport_name" property="transportName" />
-        <result column="dispose_userid" property="disposeUserid" />
-        <result column="dispose_username" property="disposeUsername" />
-        <result column="dispose_time" property="disposeTime" />
-        <result column="complete_time" property="completeTime" />
-        <result column="complete_userid" property="completeUserid" />
-        <result column="complete_username" property="completeUsername" />
         <result column="pressure" property="pressure" />
-        <result column="out_status" property="outStatus" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
-        create_time,
-        apply_user_name, apply_userid, phone, storage_id, car_id, car_number, transport_id, transport_name, dispose_userid, dispose_username, dispose_time, complete_time, complete_userid, complete_username, pressure, out_status
+        apply_user_name,
+        apply_userid,
+        phone,
+        storage_id,
+        pressure,
+        create_time
     </sql>
 
 </mapper>