气瓶修改

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

@@ -73,13 +73,13 @@ public class BottleStorage extends BaseBean {
     private Integer storageStatus;
 
     @ApiModelProperty("入库人id")
-    private Long inUserId;
+    private Long userId;
 
     @ApiModelProperty("入库人姓名")
-    private String inUserName;
+    private String userName;
 
     @ApiModelProperty("入库人联系方式")
-    private String inUserPhone;
+    private String userPhone;
 
     @ApiModelProperty("部门id")
     private Long deptId;

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.bottle.vo.BottleStorageVo;
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,7 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
      * @return
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.BOTTLE_BOTTLESTORAGE)
     public List<BottleStorageVo> getListVo(BottleStorageVo vo) {
         return bottleStorageMapper.getListVo(vo);
     }

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

@@ -20,9 +20,9 @@
         <result column="air_number" property="airNumber"/>
         <result column="validate_remark" property="validateRemark"/>
         <result column="storage_status" property="storageStatus"/>
-        <result column="in_user_id" property="inUserId"/>
-        <result column="in_user_name" property="inUserName"/>
-        <result column="in_user_phone" property="inUserPhone"/>
+        <result column="user_id" property="userId"/>
+        <result column="user_name" property="userName"/>
+        <result column="user_phone" property="userPhone"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
         <result column="subject_id" property="subjectId"/>
@@ -52,9 +52,9 @@
         air_number,
         validate_remark,
         storage_status,
-        in_user_id,
-        in_user_name,
-        in_user_phone,
+        user_id,
+        user_name,
+        user_phone,
         dept_id,
         dept_name,
         subject_id,
@@ -74,7 +74,6 @@
                (select count(1) from ab_use_record ur where ur.storage_id=bs.id) numberPersons,
                ( select 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
-                 LEFT JOIN ab_use_record ur on bs.id=ur.storage_id
                  where 1=1
         <if test="searchValue != null">
             and (bs.electronic_tag like concat('%', #{searchValue}, '%')
@@ -83,6 +82,8 @@
         <if test="storageStatus != null ">and storage_status = #{storageStatus}</if>
         <if test="startTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
         <if test="endTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
     <select id="returnGas" parameterType="com.zd.bottle.vo.BottleStorageUseVo" resultType="com.zd.bottle.vo.BottleStorageUseVo">