功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java

@@ -37,7 +37,7 @@ public class WorkOrderDto {
     private String makeQty;
 
     private String workCenterName;
-    private String workCenterId;
+    private Long workCenterId;
     private Integer totalCount;
     private Integer schedulingCount;
     private Integer unschedulingCount;
@@ -54,4 +54,7 @@ public class WorkOrderDto {
 
     private List<WorkOrderDto> workOrderList;
 
+    private List<Long> workCenterList;
+
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java

@@ -91,4 +91,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
 	List<WorkPlanVO> selectProcessExecuteDetailPage(IPage page, WorkPlanVO workPlan);
 
 
+	List<Long> selectUserCenter(@Param("userId") Long userId);
+
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -108,7 +108,8 @@
         b.equip_code AS "equipCode",
         a.status AS "orderStatus",
         b.status AS "planStatus",
-        b.team_members as "teamMembers"
+        b.team_members as "teamMembers",
+        b.work_center_id as "workCenterId"
         FROM
         MES_WORK_ORDER a
         LEFT JOIN MES_WORK_PLAN b ON a.ID = b.WO_ID
@@ -262,6 +263,12 @@
                     #{planStatus}
                 </foreach>
             </if>
+            <if test="workCenterList !=null">
+                and b.work_center_id IN
+                <foreach collection="workCenterList" item="workCenterId" index="index" open="(" close=")" separator=",">
+                    #{workCenterId}
+                </foreach>
+            </if>
         </where>
         GROUP BY
         a.WO_CODE,
@@ -624,5 +631,15 @@
         </where>
     </select>
 
+    <select id="selectUserCenter" resultType="java.lang.Long">
+        SELECT DISTINCT
+            a.WC_ID
+        FROM
+            BS_CENTER_TEAM a
+                INNER JOIN BS_REL_TEAM_SET_USER b ON a.TS_ID = b.TEAM_SET_ID
+        WHERE
+            b.user_id = #{userId}
+    </select>
+
 
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -41,6 +41,8 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
@@ -243,6 +245,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     @Override
     public List<WorkOrderDto> schedulingBoard(WorkOrderDto workOrder) {
+
+
         List<WorkOrderDto> list = baseMapper.selectWorkOrderList(workOrder);
         String yesterday = DateFormatUtils.format(DateUtils.addDays(new Date(), -1), "yyyy-MM-dd");
         String twodaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(), -2), "yyyy-MM-dd");
@@ -298,6 +302,23 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             LinkedHashMap::new
                     ));
         }
+        //非超级管理员，登陆人员只能看自己中心的数据
+        BladeUser user = AuthUtil.getUser();
+        if(!user.getRoleName().equals("administrator")){
+            Long userId = AuthUtil.getUserId();
+            List<Long> workCenterList = baseMapper.selectUserCenter(userId);
+            woCodeGroup = woCodeGroup.entrySet().stream()
+                    .filter(entry -> {
+                        return entry.getValue().stream()
+                                .anyMatch(dto -> workCenterList.contains(dto.getWorkCenterId()));
+                    })
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            Map.Entry::getValue,
+                            (oldValue, newValue) -> oldValue,
+                            LinkedHashMap::new
+                    ));
+        }
         List<WorkOrderDto> resultList = new ArrayList<>();
         for (Map.Entry<String, List<WorkOrderDto>> entry : woCodeGroup.entrySet()) {
             //根据工序名称过滤订单
@@ -376,6 +397,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     @Override
     public List<SchedulingBoardExcel> exportSchedulingBoard(WorkOrderDto workOrder) {
+        BladeUser user = AuthUtil.getUser();
+        if(!user.getRoleName().equals("administrator")){
+            Long userId = AuthUtil.getUserId();
+            List<Long> workCenterList = baseMapper.selectUserCenter(userId);
+            workOrder.setWorkCenterList(workCenterList);
+        }
         return baseMapper.exportSchedulingBoard(workOrder);
     }