设备子系统———润滑导出根据用户自身工厂过滤数据

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquLubricationPlanDetailMapperDao.java

@@ -18,7 +18,8 @@ public interface EquLubricationPlanDetailMapperDao extends BaseMapper<EquLubrica
 
     /**
      * 查询所有润滑明细
+     * @param tenantId
      * @return
      */
-    List<EquLubricationPlanDetailVo> queryAllDetailList();
+    List<EquLubricationPlanDetailVo> queryAllDetailList(String tenantId);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquLubricationTaskDetailMapperDao.java

@@ -18,7 +18,8 @@ public interface EquLubricationTaskDetailMapperDao extends BaseMapper<EquLubrica
 
     /**
      * 查询所有任务明细数据
+     * @param tenantId
      * @return
      */
-    List<EquLubricationTaskDetailVo> queryAllTaskDetailList();
+    List<EquLubricationTaskDetailVo> queryAllTaskDetailList(String tenantId);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquLubricationPlanDetailService.java

@@ -21,5 +21,5 @@ public interface EquLubricationPlanDetailService extends IService<EquLubrication
      * 查询所有润滑计划标准明细
      * @return
      */
-    List<EquLubricationPlanDetailVo> queryAllDetailList();
+    List<EquLubricationPlanDetailVo> queryAllDetailList(String tenantId);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquLubricationTaskDetailService.java

@@ -20,5 +20,5 @@ public interface EquLubricationTaskDetailService extends IService<EquLubrication
      * 查询所有任务明细数据
      * @return
      */
-    List<EquLubricationTaskDetailVo> queryAllTaskDetailList();
+    List<EquLubricationTaskDetailVo> queryAllTaskDetailList(String tenantId);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationPlanDetailServiceImpl.java

@@ -25,7 +25,7 @@ public class EquLubricationPlanDetailServiceImpl extends ServiceImpl<EquLubricat
     private EquLubricationPlanDetailMapperDao equLubricationPlanDetailMapperDao;
 
     @Override
-    public List<EquLubricationPlanDetailVo> queryAllDetailList() {
-        return equLubricationPlanDetailMapperDao.queryAllDetailList();
+    public List<EquLubricationPlanDetailVo> queryAllDetailList(String tenantId) {
+        return equLubricationPlanDetailMapperDao.queryAllDetailList(tenantId);
     }
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationPlanServiceImpl.java

@@ -9,10 +9,12 @@ import com.rongwei.bscommon.sys.dao.CommonDao;
 import com.rongwei.bscommon.sys.dao.EquLubricationPlanMapperDao;
 import com.rongwei.bscommon.sys.service.EquLubricationPlanDetailService;
 import com.rongwei.bscommon.sys.service.EquLubricationPlanService;
+import com.rongwei.bscommon.sys.utils.CommonUtils;
 import com.rongwei.bscommon.sys.utils.ExceptionUtils;
 import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
 import com.rongwei.bsentity.domain.EquLubricationPlanDo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +55,13 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
     @Override
     public void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response) {
         log.info("开始导出润滑明细");
-        List<EquLubricationPlanDetailVo> planDetailList = equLubricationPlanDetailService.queryAllDetailList();
+        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        String tenantId = "";
+        //判断当前是否存在集团领导角色
+        if (currentUser.getSysuserroleids().contains("d7797802376e42b2af37781f258b99fb")){
+            tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
+        }
+        List<EquLubricationPlanDetailVo> planDetailList = equLubricationPlanDetailService.queryAllDetailList(tenantId);
         try {
             response.setContentType("application/octet-stream");
             // 读取模板文件

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationTaskDetailServiceImpl.java

@@ -25,7 +25,7 @@ public class EquLubricationTaskDetailServiceImpl extends ServiceImpl<EquLubricat
     private EquLubricationTaskDetailMapperDao equLubricationTaskDetailMapperDao;
 
     @Override
-    public List<EquLubricationTaskDetailVo> queryAllTaskDetailList() {
-        return equLubricationTaskDetailMapperDao.queryAllTaskDetailList();
+    public List<EquLubricationTaskDetailVo> queryAllTaskDetailList(String tenantId) {
+        return equLubricationTaskDetailMapperDao.queryAllTaskDetailList(tenantId);
     }
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationTaskManagementServiceImpl.java

@@ -8,11 +8,13 @@ import com.rongwei.bscommon.sys.dao.CommonDao;
 import com.rongwei.bscommon.sys.dao.EquLubricationTaskManagementMapperDao;
 import com.rongwei.bscommon.sys.service.EquLubricationTaskDetailService;
 import com.rongwei.bscommon.sys.service.EquLubricationTaskManagementService;
+import com.rongwei.bscommon.sys.utils.CommonUtils;
 import com.rongwei.bscommon.sys.utils.ExceptionUtils;
 import com.rongwei.bscommon.sys.utils.TimeUtils;
 import com.rongwei.bsentity.domain.EquLubricationTaskDetailVo;
 import com.rongwei.bsentity.domain.EquLubricationTaskManagementDo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +48,13 @@ public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubr
     @Override
     public void wordExportLubricationTask(Map<String, Object> parameter, HttpServletResponse response) {
         log.info("开始导出润滑任务明细");
-        List<EquLubricationTaskDetailVo> taskDetailVoList = equLubricationTaskDetailService.queryAllTaskDetailList();
+        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        String tenantId = "";
+        //判断当前是否存在集团领导角色
+        if (currentUser.getSysuserroleids().contains("d7797802376e42b2af37781f258b99fb")){
+            tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
+        }
+        List<EquLubricationTaskDetailVo> taskDetailVoList = equLubricationTaskDetailService.queryAllTaskDetailList(tenantId);
         try {
             response.setContentType("application/octet-stream");
             // 读取模板文件

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquLubricationPlanDetailDao.xml

@@ -11,6 +11,8 @@
         FROM equ_lubrication_plan_detail a
         LEFT JOIN equ_lubrication_plan b ON a.MASTERID = b.id and b.DELETED = 0
         where a.DELETED = 0
+        <if test="tenantId != null and tenantId != ''"> and b.TENANTID = #{tenantId}</if>
+        ORDER BY b.MODIFYDATE DESC,a.MODIFYDATE DESC
     </select>
 
 </mapper>

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquLubricationTaskDetailDao.xml

@@ -13,6 +13,8 @@
         FROM equ_lubrication_task_detail a
         LEFT JOIN equ_lubrication_task_management b ON a.MASTERID = b.id and b.DELETED = 0
         where a.DELETED = 0
+        <if test="tenantId != null and tenantId != ''"> and b.TENANTID = #{tenantId}</if>
+        ORDER BY b.MODIFYDATE DESC,a.MODIFYDATE DESC
     </select>
 
 </mapper>