Merge remote-tracking branch 'origin/master'

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

@@ -673,4 +673,6 @@ public class PerPrefix {
 
     public static final String HPX_LOCKLOG2 = "chemical:locklog2:";
 
+    public static final String HPX_HOMEPAGE = "chemical:hxpHomePage:";
+
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpHomePageStatisticsController.java

@@ -39,6 +39,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 化学品数量统计查询
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/chemicalUsageCount")
     @ApiOperation(value = "查询化学品信息列表")
     public ResultData chemicalUsageCount(HxpChemical hxpChemical) {
@@ -50,6 +51,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 化学品特别提示
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/chemicalUnusualCount")
     @ApiOperation(value = "查询化学品信息列表")
     public ResultData chemicalUnusualCount(HxpChemical hxpChemical) {
@@ -61,6 +63,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 化学品使用量top6
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/chemicalUsagesCount")
     @ApiOperation(value = "查询化学品信息列表")
     public ResultData chemicalUsagesCount(HxpChemical hxpChemical) {
@@ -72,6 +75,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 化学品分类占比
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/chemicalClassifyMix")
     @ApiOperation(value = "化学品分类占比列表")
     public ResultData chemicalClassifyMix(HxpChemical hxpChemical) {
@@ -82,6 +86,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 库存总量
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/stockTotal")
     @ApiOperation(value = "化学品分类占比列表")
     public ResultData stockTotal(HxpChemical hxpChemical) {
@@ -92,6 +97,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 出入库统计
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/joinOutCount")
     @ApiOperation(value = "化学品分类占比列表")
     public ResultData joinOutCount(HxpStock hxpStock) {
@@ -102,6 +108,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     /**
      * 查询化学品报警记录列表
      */
+    @PreAuthorize(hasPermi = PerPrefix.HPX_HOMEPAGE+ PerFun.LIST)
     @GetMapping("/alarmRecordList")
     @ApiOperation(value = "查询化学品报警记录列表")
     public TableDataInfo <HxpAlarmRecordVo> alarmRecordList(HxpAlarmRecordSearch hxpAlarmRecordSearch) {

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -402,6 +402,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public HxpHomeChemicalVo chemicalUsageCount(HxpChemical hxpChemical) {
         return hxpChemicalMapper.chemicalUsageCount(hxpChemical);
     }
@@ -413,6 +414,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public HxpHomeChemicalUnusualVo chemicalUnusualCount(HxpChemical hxpChemical) {
         return hxpChemicalMapper.chemicalUnusualCount(hxpChemical);
     }
@@ -424,6 +426,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public List<HxpHomeChemicalUsagesVo> chemicalUsagesCount(HxpChemical hxpChemical) {
         return hxpChemicalMapper.chemicalUsagesCount(hxpChemical);
     }
@@ -435,6 +438,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public List<LinkedHashMap <String,String>> chemicalClassifyMix(HxpChemical hxpChemical) {
         List<LinkedHashMap <String,String>> chemicalList = hxpChemicalMapper.chemicalClassifyMix(hxpChemical);
         DoubleAdder doubleAdder = new DoubleAdder();
@@ -463,6 +467,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
 
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public Long stockTotal(HxpChemical hxpChemical){
         return hxpChemicalMapper.stockTotal(hxpChemical);
     }
@@ -475,6 +480,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
     public List<LinkedHashMap <String,String>> joinOutCount(HxpStock hxpStock) {
         List<LinkedHashMap <String,String>> stockCountList = hxpChemicalMapper.joinOutCount(hxpStock);
         return stockCountList;

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalMapper.xml

@@ -220,24 +220,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="chemicalUsageCount" parameterType="com.zd.chemical.domain.HxpChemical" resultType="com.zd.chemical.domain.vo.HxpHomeChemicalVo">
         SELECT
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=1) chemicalUsableNum,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_cabinet ct WHERE ct.cabinet_status=1) cabinetNum,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=2) chemicalOutNum,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=3) chemicalCancelNum,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk INNER JOIN hxp_chemical_join_cabinet cjc ON sk.join_id = cjc.id WHERE  DATE_SUB(cjc.expire_time, INTERVAL 3 DAY)&lt;=NOW()
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE sk.status=1
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) chemicalUsableNum,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_cabinet ct
+        LEFT JOIN sys_user ur ON ct.user_id = ur.user_id WHERE ct.cabinet_status=1
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) cabinetNum,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE sk.status=2
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) chemicalOutNum,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE sk.status=3
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) chemicalCancelNum,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk INNER JOIN hxp_chemical_join_cabinet cjc ON sk.join_id = cjc.id
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE  DATE_SUB(cjc.expire_time, INTERVAL 3 DAY)&lt;=NOW()
         AND cjc.expire_time>NOW()
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         ) overdueTime
         FROM DUAL
     </select>
 
     <select id="chemicalUnusualCount" parameterType="com.zd.chemical.domain.HxpChemical" resultType="com.zd.chemical.domain.vo.HxpHomeChemicalUnusualVo">
         SELECT
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd WHERE rd.use_status = 1) toBeReturned,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd WHERE rd.use_status = 2) overtimeReturn,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd WHERE DATE_FORMAT(rd.collect_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')) todayCollect,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd WHERE rd.use_status = 0 AND DATE_FORMAT(rd.collect_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')) todayReturn,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=2 AND DATE_FORMAT(sk.out_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')) todayOutNum,
-        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=3 AND DATE_FORMAT(sk.out_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')) todayCancelNum
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd
+        LEFT JOIN sys_user ur ON rd.user_id = ur.user_id WHERE rd.use_status = 1
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) toBeReturned,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd
+        LEFT JOIN sys_user ur ON rd.user_id = ur.user_id WHERE rd.use_status = 2
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) overtimeReturn,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd
+        LEFT JOIN sys_user ur ON rd.user_id = ur.user_id WHERE DATE_FORMAT(rd.collect_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) todayCollect,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_userecord rd
+        LEFT JOIN sys_user ur ON rd.user_id = ur.user_id WHERE rd.use_status = 0 AND DATE_FORMAT(rd.collect_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) todayReturn,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE sk.status=2 AND DATE_FORMAT(sk.out_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) todayOutNum,
+        (SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id WHERE sk.status=3 AND DATE_FORMAT(sk.out_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ) todayCancelNum
         FROM DUAL
     </select>
 
@@ -249,6 +292,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM hxp_stock sk
         INNER JOIN hxp_chemical_join_cabinet cjc ON sk.`join_id` = cjc.`id`
         INNER JOIN hxp_chemical cl ON cjc.`chemical_id` = cl.`id`
+        left join sys_user ur on sk.`user_id` = ur.`user_id`
+        <where>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
         GROUP BY cl.`id` ORDER BY usages DESC LIMIT 6
     </select>
 
@@ -269,6 +317,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM hxp_stock sk
         INNER JOIN hxp_chemical_join_cabinet cjc ON sk.join_id= cjc.id
         INNER JOIN hxp_chemical cl ON cjc.`chemical_id` = cl.`id`
+        LEFT JOIN sys_user ur on cl.user_id = ur.user_id
+        <where>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
         GROUP BY cl.chemical_num
         )xx
         )x2 ON FIND_IN_SET( x1.dict_value, x2.classify_attribute )
@@ -276,7 +329,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="stockTotal" parameterType="com.zd.chemical.domain.HxpChemical" resultType="java.lang.Long">
-        SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk WHERE sk.status=1 OR sk.status=4
+        SELECT IFNULL(COUNT(1),0) FROM hxp_stock sk
+        LEFT JOIN sys_user ur on sk.user_id = ur.user_id
+        <where>
+            (sk.status=1 OR sk.status=4)
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
     </select>
 
     <select id="joinOutCount" parameterType="com.zd.chemical.domain.HxpStock" resultType="java.util.LinkedHashMap">
@@ -301,6 +360,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="status == 2">
             ON DATE_FORMAT(x1.nowData,'%Y-%m-%d') = DATE_FORMAT(sk.out_time,'%Y-%m-%d') AND (sk.status=#{status}  or sk.status=3)
         </if>
+        LEFT JOIN sys_user ur ON sk.user_id = ur.user_id
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         GROUP BY x1.nowData
     </select>
 </mapper>