班次选择组件

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1207,6 +1207,24 @@ public class ScheduleController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * TODO 特殊权限之班次选择数据查询
+     * @author LR
+     * @date 2022/3/18 11:17
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "getScheduleShiftWithSelect")
+    public R getScheduleShiftWithSelect(@RequestBody SearchScheduleData inData) {
+       List< Map<String, Object>> resultList = scheduleService.getScheduleShiftWithSelect(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!")
+                .put("rows", resultList)
+                .put("total", resultList.size());
+    }
+
+
 /*---------------------------------------------------------- sxm其它报工 --------------------------------------------------------*/
 
     /**

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -406,6 +406,17 @@ public interface ScheduleMapper {
      **/
     Map<String, Object> getCalendarId(SearchScheduleData inData);
 
+    /**
+     * TODO 添加注释
+     * @author LR
+     * @date 2022/3/18 11:23
+     * @Param [inData]
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData);
+
+    /*---------------------------------------------------------- sxm其它报工 --------------------------------------------------------*/
+
     /**
      * @Author sxm
      * @Description 保存不良

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -709,6 +709,17 @@ public interface ScheduleService {
      **/
     Map<String, Object> otherCheckCreateSplitSfdcRoll(SearchScheduleData inData);
 
+    /**
+     * TODO  特殊权限之班次选择数据查询
+     * @author LR
+     * @date 2022/3/18 11:20
+     * @Param [inData]
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData);
+
+    /*---------------------------------------------------------- sxm其它报工 --------------------------------------------------------*/
+
     /**
      * @Author sxm
      * @Description 执行创建分卷的业务逻辑

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -436,6 +436,12 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public Map<String, Object> getScheduleShiftData(SearchScheduleData inData) throws ParseException {
+        String site = inData.getSite();
+        String username = inData.getUsername();
+        //调用存储过程判断是否存在权限
+        Map<String, Object> shiftMap = this.getUserSpecialAuth(site, username, 249);
+        //获取结果
+        String specialAuth = String.valueOf(shiftMap.get("specialAuth"));
         //设置查询的条件
         inData.setCurrentDate(DateUtil.getStringDate(new Date(), "yyyy-MM-dd"));
         inData.setCurrentTime(DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
@@ -470,9 +476,29 @@ public class ScheduleServiceImpl implements ScheduleService {
             result.put("code", "500");
             result.put("shiftDesc", "无班次");
         }
+        //设置结果的参数
+        result.put("specialAuth", specialAuth);
         return result;
     }
 
+    /**
+     * TODO 获取用户的特殊权限
+     * @author LR
+     * @date 2022/3/18 10:35
+     * @Param [site, username, i]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> getUserSpecialAuth(String site, String username, int authItemNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(username);
+        params.add(authItemNo);
+        //存储过程 调用存储过程  创建分卷
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("getUserSpecialAuth", params);
+        //返回结果
+       return resultList.get(0);
+    }
+
     @Override
     public Map<String, Object> getSfdcTimeData(SearchScheduleData inData) {
         //返回数据
@@ -3602,6 +3628,13 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData) {
+        return scheduleMapper.getScheduleShiftWithSelect(inData);
+    }
+
+    /*---------------------------------------------------------- sxm其它报工 --------------------------------------------------------*/
+
     @Override
     public Map<String, Object> otherCheckCreateSplitSfdcRoll(SearchScheduleData inData) {
         //公共参数
@@ -3651,7 +3684,6 @@ public class ScheduleServiceImpl implements ScheduleService {
         return resultMap;
     }
 
-
     public Map<String, Object> otherCheckSplitRollWithSfdcRollAndSecurity(String site, String orderNo, String rollNo,
                                                                           Float rollQty, String flag) {
         List<Object> params = new ArrayList<>();

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -1016,6 +1016,24 @@
         FROM WorkCenterResource wcr
         WHERE wcr.Site = #{site} AND wcr.WorkCenterNo = #{workCenterNo} AND wcr.ResourceID = #{resourceId}
     </select>
+
+    <!--获取班次选择的数据-->
+    <select id="getScheduleShiftWithSelect" parameterType="SearchScheduleData" resultType="java.util.HashMap">
+        SELECT WR.ResourceID resourceId, CE.ScheduleDate scheduleDate, CES.ShiftNo shiftNo, CES.ShiftDesc shiftDesc,
+        CONVERT(VARCHAR(5), CES.StartExactTime, 108) starttime, CONVERT(VARCHAR(5), CES.EndExactTime, 108) endTime,
+        (CASE WHEN CES.EndTime <![CDATA[<]]> CES.StartTime THEN 'Y' ELSE 'N' END) nextDayFlag
+        FROM WorkCenterResource WR, Calendar_Exception CE, Calendar_Exception_Shift CES
+        WHERE WR.Site=CE.Site and WR.CalendarID=CE.CalendarID
+        AND CE.Site=CES.Site and CE.CalendarID=CES.CalendarID and CE.ScheduleDate=CES.ScheduleDate
+        AND WR.Site = #{site}
+        AND WR.ResourceID = #{resourceId}
+        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[>=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime, #{reportedTime})) - 1
+        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[<=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime,  #{reportedTime})) + 1
+        AND (CONVERT(DECIMAL(20,6),CE.ScheduleDate) + CONVERT(DECIMAL(20,6), CES.StartTime / 24.0)) <![CDATA[<=]]>(CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})) +
+        (CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})) - floor(CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})))))
+        ORDER BY CE.ScheduleDate,CES.Starttime
+    </select>
+
     <select id="searchFqcSfdcRolls" resultType="com.gaotao.modules.schedule.data.SfdcRollData">
         SELECT sfr.Site site, sfr.OrderNo orderNo, sfr.RollNo rollNo, sfr.CreatedDate createdDate, sfr.Createdby createdby, sfr.CurrentOpsItemNo currentOpsItemNo,
         sfr.LastFinishedOpsItemNo lastFinishedOpsItemNo, sfr.FinishedDate finishedDate,	sfr.FinishedFlag finishedFlag, sfr.OnLineFlag onLineFlag,