权限功能修改

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -587,6 +587,11 @@ public class PerPrefix {
     public static final String AIRBOTTLE_TASK= "airbottle:taskManage:";
 
     /**
+     * 信息记录
+     */
+    public static final String AIRBOTTLE_INFORMATIONRECORD= "airbottle:informationRecord:";
+
+    /**
      * 用气申请
      */
     public static final String AIRBOTTLE_USEAGSAPPLY= "airbottle:useAgsApplyManage:";

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpBottleStorageOutService.java

@@ -6,15 +6,15 @@ import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
 
 /**
  * 气瓶出库Service接口
- * 
+ *
  * @author zd
  * @date 2022-05-23
  */
-public interface IQpBottleStorageOutService 
+public interface IQpBottleStorageOutService
 {
     /**
      * 查询气瓶出库
-     * 
+     *
      * @param id 气瓶出库主键
      * @return 气瓶出库
      */
@@ -22,15 +22,23 @@ public interface IQpBottleStorageOutService
 
     /**
      * 查询气瓶出库列表
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 气瓶出库集合
      */
     List<QpBottleStorageOutVO> selectQpBottleStorageOutList(QpBottleStorageOutVO qpBottleStorageOut);
 
     /**
+     * 信息记录-出库记录
+     *
+     * @param qpBottleStorageOut 出库记录
+     * @return 气瓶出库集合
+     */
+    List<QpBottleStorageOutVO> selectQpBottleStorageOutRecordList(QpBottleStorageOutVO qpBottleStorageOut);
+
+    /**
      * 新增气瓶出库
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 结果
      */
@@ -38,7 +46,7 @@ public interface IQpBottleStorageOutService
 
     /**
      * 修改气瓶出库
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 结果
      */
@@ -46,7 +54,7 @@ public interface IQpBottleStorageOutService
 
     /**
      * 批量删除气瓶出库
-     * 
+     *
      * @param ids 需要删除的气瓶出库主键集合
      * @return 结果
      */
@@ -54,7 +62,7 @@ public interface IQpBottleStorageOutService
 
     /**
      * 删除气瓶出库信息
-     * 
+     *
      * @param id 气瓶出库主键
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpBottleStorageService.java

@@ -33,6 +33,14 @@ public interface IQpBottleStorageService {
     List<QpBottleStorageVO> selectQpBottleStorageList(QpBottleStorageVO bottleStorageVO);
 
     /**
+     * 信息记录-入库记录
+     *
+     * @param bottleStorageVO 信息记录-入库记录
+     * @return 信息记录-入库记录集合
+     */
+    List<QpBottleStorageVO> selectQpBottleStorageRecordList(QpBottleStorageVO bottleStorageVO);
+
+    /**
      * 新增气瓶入库
      *
      * @param qpBottleStorage 气瓶入库

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpTaskService.java

@@ -33,6 +33,14 @@ public interface IQpTaskService
     List<QpTaskVO> selectQpTaskList(QpTaskVO qpTask);
 
     /**
+     * 查询申领记录列表
+     *
+     * @param qpTask 申领记录
+     * @return 申领记录集合
+     */
+    List<QpTaskVO> selectQpTaskRecordList(QpTaskVO qpTask);
+
+    /**
      * 新增待办清单
      *
      * @param qpTaskVO 待办清单
@@ -126,4 +134,4 @@ public interface IQpTaskService
      * @return 结果集
      */
     List<QpTask> getByIds(List<Long> ids);
-}
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpBottleStorageOutServiceImpl.java

@@ -8,8 +8,10 @@ import com.zd.airbottle.domain.*;
 import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
 import com.zd.airbottle.domain.vo.QpBottleStorageVO;
 import com.zd.airbottle.mapper.*;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
 import com.zd.common.security.utils.SaveUtil;
 
@@ -23,12 +25,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 气瓶出库Service业务层处理
- * 
+ *
  * @author zd
  * @date 2022-05-23
  */
 @Service
-public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService 
+public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
 {
     @Autowired
     private QpBottleStorageOutMapper qpBottleStorageOutMapper;
@@ -55,7 +57,7 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
     private QpRfidTagMapper rfidTagMapper;
     /**
      * 查询气瓶出库
-     * 
+     *
      * @param id 气瓶出库主键
      * @return 气瓶出库
      */
@@ -67,7 +69,7 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
 
     /**
      * 查询气瓶出库列表
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 气瓶出库
      */
@@ -78,8 +80,20 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
     }
 
     /**
+     * 信息记录-出库记录
+     *
+     * @param qpBottleStorageOut 出库记录
+     * @return 气瓶出库集合
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.AIRBOTTLE_INFORMATIONRECORD)
+    public List<QpBottleStorageOutVO> selectQpBottleStorageOutRecordList(QpBottleStorageOutVO qpBottleStorageOut) {
+        return qpBottleStorageOutMapper.selectQpBottleStorageOutList(qpBottleStorageOut);
+    }
+
+    /**
      * 新增气瓶出库
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 结果
      */
@@ -145,7 +159,7 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
 
     /**
      * 修改气瓶出库
-     * 
+     *
      * @param qpBottleStorageOut 气瓶出库
      * @return 结果
      */
@@ -170,7 +184,7 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
 
     /**
      * 批量删除气瓶出库
-     * 
+     *
      * @param ids 需要删除的气瓶出库主键
      * @return 结果
      */
@@ -182,7 +196,7 @@ public class QpBottleStorageOutServiceImpl implements IQpBottleStorageOutService
 
     /**
      * 删除气瓶出库信息
-     * 
+     *
      * @param id 气瓶出库主键
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpBottleStorageServiceImpl.java

@@ -6,9 +6,11 @@ import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.domain.vo.report.AirAmount;
 import com.zd.airbottle.mapper.QpBottleStorageMapper;
 import com.zd.airbottle.service.*;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.bean.TransferUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
@@ -71,11 +73,24 @@ public class QpBottleStorageServiceImpl implements IQpBottleStorageService {
      * @return 气瓶入库
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.AIRBOTTLE_STORAGE)
     public List<QpBottleStorageVO> selectQpBottleStorageList(QpBottleStorageVO bottleStorage) {
         return qpBottleStorageMapper.selectQpBottleStorageList(bottleStorage);
     }
 
     /**
+     * 信息记录-入库记录
+     *
+     * @param bottleStorage 信息记录-入库记录
+     * @return 信息记录-入库记录集合
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.AIRBOTTLE_INFORMATIONRECORD)
+    public List<QpBottleStorageVO> selectQpBottleStorageRecordList(QpBottleStorageVO bottleStorage) {
+        return qpBottleStorageMapper.selectQpBottleStorageList(bottleStorage);
+    }
+
+    /**
      * 新增气瓶入库
      *
      * @param qpBottleStorage 气瓶入库

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpTaskServiceImpl.java

@@ -81,6 +81,18 @@ public class QpTaskServiceImpl implements IQpTaskService {
     }
 
     /**
+     * 查询申领记录列表
+     *
+     * @param qpTask 申领记录
+     * @return 申领记录集合
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.AIRBOTTLE_INFORMATIONRECORD)
+    public List<QpTaskVO> selectQpTaskRecordList(QpTaskVO qpTask) {
+        return qpTaskMapper.selectQpTaskList(qpTask);
+    }
+
+    /**
      * 新增待办清单表
      *
      * @param qpTaskVO 待办清单表

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageMapper.xml

@@ -215,7 +215,9 @@
             resultMap="QpBottleStorageResult">
         select * from (
         <include refid="selectQpBottleStorageListVo"/>
-        ) t2
+        ) t2 LEFT JOIN qp_task ta on t2.task_id=ta.id
+        LEFT JOIN   sys_dept d on   ta.dept_id=d.dept_id
+        LEFT JOIN sys_user u on  ta.user_id=u.user_id
         <where>
             <if test="searchValue != null  and searchValue != ''">
                 and ( t2.storageUser like concat('%', #{searchValue}, '%')
@@ -239,6 +241,8 @@
                 #{id}
             </foreach>
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by t2.create_time desc
     </select>
@@ -641,4 +645,4 @@
         select admin_id adminId from lab_subject where id= #{subjectId};
     </select>
 
-</mapper>
+</mapper>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageOutMapper.xml

@@ -36,8 +36,11 @@
                (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and s.id=
                ( select location_id from qp_bottle_storage bs , qp_task ta where bs.id=t.storage_id
                                                                             and bs.task_id = ta.id) ) room
-        from qp_bottle_storage_out as t,qp_bottle_storage bs,qp_task ta
-        WHERE t.storage_id=bs.id and bs.task_id=ta.id
+        from  qp_bottle_storage_out  t
+            LEFT JOIN qp_bottle_storage bs on t.storage_id=bs.id
+            LEFT JOIN qp_task ta on bs.task_id=ta.id
+            LEFT JOIN   sys_dept d on   ta.dept_id=d.dept_id
+            LEFT JOIN sys_user u on  ta.user_id=u.user_id
     </sql>
     <select id="selectQpBottleStorageOutList" parameterType="com.zd.airbottle.domain.vo.QpBottleStorageOutVO" resultMap="QpBottleStorageOutResult">
         <include refid="selectQpBottleStorageOutListVo"/>
@@ -71,6 +74,8 @@
                 #{id}
             </foreach>
          </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by t.create_time desc
     </select>
 
@@ -194,4 +199,4 @@
     </select>
 
 
-</mapper>
+</mapper>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabCheckConfigServiceImpl.java

@@ -97,7 +97,7 @@ public class LabCheckConfigServiceImpl implements ILabCheckConfigService {
     }
 
     @Override
-    @DataScope(deptAlias = "d" , userAlias = "t" , permi = PerPrefix.LABORATORY_CHECKRECORD)
+    //@DataScope(deptAlias = "d" , userAlias = "t" , permi = PerPrefix.LABORATORY_CHECKRECORD)
     public LabCheckConfig getCheckConfigInfo() {
         LabCheckConfig labCheckConfig = new LabCheckConfig();
         List<LabCheckConfig> list = labCheckConfigMapper.selectLabCheckConfigList(labCheckConfig);