Merge remote-tracking branch 'origin/master'

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

@@ -28,10 +28,10 @@ import java.util.Date;
 public class BottleStorageOut extends BaseBean{
 
     @ApiModelProperty("操作人")
-    private String applyUserName;
+    private String userName;
 
     @ApiModelProperty("操作人Id")
-    private Long applyUserid;
+    private Long userId;
 
     @ApiModelProperty("部门id")
     private Long deptId;

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

@@ -37,7 +37,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "【入库】")
 @RequestMapping("/bottleStorage")
-public class BottleStorageController extends BaseController {
+public class BottleStorageController extends BaseController<BottleStorage> {
 
     @Resource
     private BottleStorageService bottleStorageService;
@@ -48,12 +48,11 @@ public class BottleStorageController extends BaseController {
     /**
      * 查询入库记录列表
      */
-    //@PreAuthorize(hasPermi = "bottle:bottleStorage:list")
     @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
-    public TableDataInfo<BottleStorageVo> list(BottleStorageVo vo) {
-        // List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+    public TableDataInfo<BottleStorage> list(BottleStorageVo vo) {
+        startPage("create_time","descending");
         List<BottleStorageVo> list = bottleStorageService.getListVo(vo);
         return getDataTable(list);
     }
@@ -65,7 +64,6 @@ public class BottleStorageController extends BaseController {
      * @return Boolean
      */
     @ApiOperation(value = "新增入库信息")
-    //@PreAuthorize(hasPermi = "bottle:bottleStorage:add")
     @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.ADD)
     @Log(title = "新增入库信息", businessType = BusinessType.INSERT)
     @PostMapping
@@ -80,7 +78,6 @@ public class BottleStorageController extends BaseController {
      * @return
      */
     @ApiOperation(value = "入库详情")
-    //@PreAuthorize(hasPermi = "bottle:bottleStorage:query")
     @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {

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

@@ -51,8 +51,8 @@ public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMap
 
         bottleStorageOut.setDeptId(sysUser.getDept().getDeptId());
         bottleStorageOut.setDeptName(sysUser.getDept().getDeptName());
-        bottleStorageOut.setApplyUserid(sysUser.getUserId());
-        bottleStorageOut.setApplyUserName(sysUser.getUserName());
+        bottleStorageOut.setUserId(sysUser.getUserId());
+        bottleStorageOut.setUserName(sysUser.getUserName());
         bottleStorageOut.setPhone(sysUser.getPhonenumber());
         bottleStorageOut.setCreateTime(new Date());
         return save(bottleStorageOut);

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

@@ -69,7 +69,7 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
      * @return
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.BOTTLE_BOTTLESTORAGE)
+    // @DataScope(deptAlias = "bs", userAlias = "bs", 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

@@ -72,7 +72,7 @@
             parameterType="com.zd.bottle.vo.BottleStorageVo">
         select bs.*,
                (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
+               ( 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">
@@ -82,8 +82,6 @@
         <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">

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

@@ -6,10 +6,10 @@
     <resultMap id="BaseResultMap" type="com.zd.bottle.domain.BottleStorageOut">
         <result column="id" property="id" />
         <result column="create_time" property="createTime" />
-        <result column="apply_user_name" property="applyUserName" />
-        <result column="apply_userid" property="applyUserid" />
+        <result column="user_name" property="userName" />
+        <result column="user_id" property="userId" />
         <result column="dept_id" property="deptId" />
-        <result column="apply_userid" property="applyUserid" />
+        <result column="dept_name" property="deptName" />
         <result column="phone" property="phone" />
         <result column="storage_id" property="storageId" />
         <result column="pressure" property="pressure" />
@@ -18,8 +18,10 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
-        apply_user_name,
-        apply_userid,
+        user_name,
+        user_id,
+        dept_id,
+        dept_name,
         phone,
         storage_id,
         pressure,