开班上班班次

smart-steward-api/src/main/java/com/smartSteward/web/controller/schedule/ScheduleClassOpeningController.java

@@ -89,6 +89,15 @@ public class ScheduleClassOpeningController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ScheduleClassOpening scheduleClassOpening)
     {
+        if (scheduleClassOpening.getId() == null)
+        {
+            return AjaxResult.error("请选择开班记录");
+        }
+        ScheduleClassOpening opening = scheduleClassOpeningService.selectScheduleClassOpeningById(scheduleClassOpening.getId());
+        if (opening == null)
+        {
+            return AjaxResult.error("开班记录不存在");
+        }
         // 校验参数
         scheduleClassOpeningService.validateScheduleClassOpening(scheduleClassOpening);
         return toAjax(scheduleClassOpeningService.updateScheduleClassOpening(scheduleClassOpening));

smart-steward-entity/src/main/java/com/smartSteward/entity/database/flow/FlowCategory.java

@@ -8,6 +8,7 @@ import com.smartSteward.common.annotation.Excel;
 import com.smartSteward.common.core.BaseEntity;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -58,6 +59,6 @@ public class FlowCategory extends BaseEntity
 
     /** 子分类 */
     @ApiModelProperty("子分类")
-    private List<FlowCategory> children;
+    private List<FlowCategory> children = new ArrayList<>();
 
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/database/schedule/ScheduleWorkRecord.java

@@ -1,5 +1,6 @@
 package com.smartSteward.entity.database.schedule;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -80,10 +81,10 @@ public class ScheduleWorkRecord extends BaseEntity
    @ApiModelProperty("下班时间")
    private Date endTime;
 
-   /** 上班时长(分钟) */
-   @Excel(name = "上班时长(分钟)")
-   @ApiModelProperty("上班时长(分钟)")
-   private Long duration;
+   /** 上班时长(小时) */
+   @Excel(name = "上班时长(小时)")
+   @ApiModelProperty("上班时长(小时)")
+   private BigDecimal duration;
 
    /** 上班内容 */
    @Excel(name = "上班内容")
@@ -104,7 +105,7 @@ public class ScheduleWorkRecord extends BaseEntity
    /** 状态: 0-未确认, 1-已确认 */
    @Excel(name = "状态: 0-未确认, 1-已确认")
    @ApiModelProperty("状态: 0-未确认, 1-已确认")
-   private String status;
+   private Long status;
 
 
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/view/TreeSelect.java

@@ -1,6 +1,7 @@
 package com.smartSteward.entity.view;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -42,14 +43,14 @@ public class TreeSelect implements Serializable
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
         this.disabled = StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus());
-        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.children = dept.getChildren() != null ? dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()) : Collections.emptyList();
     }
 
     public TreeSelect(SysMenu menu)
     {
         this.id = menu.getMenuId();
         this.label = menu.getMenuName();
-        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.children = menu.getChildren() != null ? menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()) : Collections.emptyList();
     }
 
 
@@ -57,7 +58,7 @@ public class TreeSelect implements Serializable
     {
         this.id = category.getCategoryId();
         this.label = category.getCategoryName();
-        this.children = category.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.children = category.getChildren() != null ? category.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()) : Collections.emptyList();
     }
 
 

smart-steward-entity/src/main/java/com/smartSteward/entity/view/system/SysUserStationResult.java

@@ -21,6 +21,11 @@ public class SysUserStationResult {
      */
     @ApiModelProperty(value = "站点ID")
     private Long stationId;
+    /**
+     * 站点名称
+     */
+    @ApiModelProperty(value = "站点名称")
+    private String stationName;
 
     /**
      * 用户ID

smart-steward-mapper/src/main/java/com/smartSteward/mapper/schedule/ScheduleClassOpeningMapper.java

@@ -58,4 +58,11 @@ public interface ScheduleClassOpeningMapper
      * @return 结果
      */
     public int deleteScheduleClassOpeningByIds(Long[] ids);
+     /**
+     * 删除班级的上班记录
+     *
+     * @param classId 班级id
+     * @return 结果
+     */
+    public int deleteScheduleWorkRecordByClassId(Long classId);
 }

smart-steward-mapper/src/main/java/com/smartSteward/mapper/schedule/ScheduleWorkRecordMapper.java

@@ -58,11 +58,6 @@ public interface ScheduleWorkRecordMapper
      */
     public int deleteScheduleWorkRecordById(Long id);
 
-    /**
-     * 批量删除上班记录
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteScheduleWorkRecordByIds(Long[] ids);
+
+    public int deleteScheduleWorkRecordByClassId(Long id);
 }

smart-steward-mapper/src/main/resources/mapper/schedule/ScheduleWorkRecordMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workContent != null  and workContent != ''"> and work_content = #{workContent}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status != null "> and status = #{status}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <!-- 如果有station_id字段，则增加站点集合查询条件 -->
@@ -184,4 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+        <delete id="deleteScheduleWorkRecordByClassId" parameterType="Long">
+            delete from schedule_work_record where class_id = #{classId}
+        </delete>
 </mapper>

smart-steward-mapper/src/main/resources/mapper/system/SysUserMapper.xml

@@ -330,7 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUserStation" resultType="com.smartSteward.entity.view.system.SysUserStationResult">
 		select s.area_id as areaId,su.station_id as stationId,
 		u.user_id as userId,u.post_id as postId,u.nick_name as nickName
-		,u.user_name as userName from sys_user u
+		,u.user_name as userName,s.station_name as stationName from sys_user u
 		inner join sys_user_station su on u.user_id=su.user_id
 		left join sys_station s on s.id=su.station_id
 		where u.del_flag='0'

smart-steward-service/src/main/java/com/smartSteward/service/schedule/impl/ScheduleClassOpeningServiceImpl.java

@@ -1,12 +1,15 @@
 package com.smartSteward.service.schedule.impl;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.smartSteward.common.core.SecurityUtils;
 import com.smartSteward.common.exception.ParameterException;
 import com.smartSteward.common.utils.CollUtil;
 import com.smartSteward.common.utils.DateUtils;
+import com.smartSteward.common.utils.bean.BeanUtils;
 import com.smartSteward.entity.database.schedule.ScheduleClassUser;
 import com.smartSteward.entity.database.schedule.ScheduleShiftManagement;
 import com.smartSteward.entity.database.schedule.ScheduleWorkRecord;
@@ -118,6 +121,9 @@ public class ScheduleClassOpeningServiceImpl implements IScheduleClassOpeningSer
             //新增班级用户关联
            List<ScheduleClassUser> scheduleClassUsers = getScheduleClassUsers(scheduleClassOpening);
            scheduleClassUserMapper.insertBatchScheduleClassUser(scheduleClassUsers);
+           //新增上班记录
+            List<ScheduleWorkRecord> scheduleWorkRecords = getScheduleWorkRecords(scheduleClassOpening);
+            scheduleWorkRecordMapper.insertBatchScheduleWorkRecord(scheduleWorkRecords);
         }
         return result;
     }
@@ -141,6 +147,11 @@ public class ScheduleClassOpeningServiceImpl implements IScheduleClassOpeningSer
         scheduleClassUserMapper.insertBatchScheduleClassUser(scheduleClassUsers);
         scheduleClassOpening.setUpdateBy(SecurityUtils.getUsername());
         scheduleClassOpening.setUpdateTime(DateUtils.getNowDate());
+        //删除原上班记录
+        scheduleWorkRecordMapper.deleteScheduleWorkRecordByClassId(scheduleClassOpening.getId());
+        //新增上班记录
+        List<ScheduleWorkRecord> scheduleWorkRecords = getScheduleWorkRecords(scheduleClassOpening);
+        scheduleWorkRecordMapper.insertBatchScheduleWorkRecord(scheduleWorkRecords);
         return scheduleClassOpeningMapper.updateScheduleClassOpening(scheduleClassOpening);
     }
 
@@ -163,28 +174,51 @@ public class ScheduleClassOpeningServiceImpl implements IScheduleClassOpeningSer
         //从用户表获取用户信息
         List<SysUserStationResult> sysUserStationResults =
                 sysUserMapper.selectUserStation(null,
-                        null, scheduleClassOpening.getUserIds().toArray(new Long[0]));
+                        scheduleClassOpening.getStationId(), scheduleClassOpening.getUserIds().toArray(new Long[0]));
         ScheduleShiftManagement scheduleShiftManagement =
                 scheduleShiftManagementMapper.selectScheduleShiftManagementById(scheduleClassOpening.getShiftId());
         if (scheduleShiftManagement == null) {
             throw new ParameterException("班次不存在");
         }
-        return sysUserStationResults.stream().map(userId -> {
-
+        //根据用户id去重
+        sysUserStationResults= new ArrayList<>(sysUserStationResults.stream().
+                collect(Collectors.toMap(SysUserStationResult::getUserId, Function.identity(), (oldValue, newValue) -> oldValue))
+                .values());
+        List<ScheduleWorkRecord> scheduleWorkRecords = new ArrayList<>();
+        for(SysUserStationResult sysUserStationResult : sysUserStationResults) {
             ScheduleWorkRecord scheduleWorkRecord = new ScheduleWorkRecord();
-            scheduleWorkRecord.setEmployeeId(userId.getUserId());
-            scheduleWorkRecord.setEmployeeName(userId.getNickName());
-            scheduleWorkRecord.setEmployeeNo(userId.getUserName());
+            scheduleWorkRecord.setEmployeeId(sysUserStationResult.getUserId());
+            scheduleWorkRecord.setEmployeeName(sysUserStationResult.getNickName());
+            scheduleWorkRecord.setEmployeeNo(sysUserStationResult.getUserName());
             scheduleWorkRecord.setShiftId(scheduleShiftManagement.getId());
             scheduleWorkRecord.setShiftName(scheduleShiftManagement.getShiftName());
-            scheduleWorkRecord.setPosition(userId.getPostId());
-
+            scheduleWorkRecord.setPosition(sysUserStationResult.getPostId());
             scheduleWorkRecord.setWorkDate(scheduleClassOpening.getWorkDate());
-//            scheduleWorkRecord.setStartTime(scheduleShiftManagement.getStartTime());
-//            scheduleWorkRecord.setEndTime(scheduleShiftManagement.getEndTime());
-//            scheduleWorkRecord.setDuration(scheduleShiftManagement.getDuration());
-            return scheduleWorkRecord;
-        }).collect(Collectors.toList());
+            scheduleWorkRecord.setStationId(sysUserStationResult.getStationId());
+            scheduleWorkRecord.setStationName(sysUserStationResult.getStationName());
+            if (scheduleShiftManagement.getFirstStartTime()!=null&&scheduleShiftManagement.getFirstEndTime()!=null) {
+                //复制公共字段生成新对象
+                ScheduleWorkRecord newScheduleWorkRecord = new ScheduleWorkRecord();
+                BeanUtils.copyProperties(scheduleWorkRecord, newScheduleWorkRecord);
+                newScheduleWorkRecord.setStatus(0L);
+                newScheduleWorkRecord.setStartTime(scheduleShiftManagement.getFirstStartTime());
+                newScheduleWorkRecord.setEndTime(scheduleShiftManagement.getFirstEndTime());
+                newScheduleWorkRecord.setDuration(scheduleShiftManagement.getFirstDuration());
+                scheduleWorkRecords.add(newScheduleWorkRecord);
+            }
+            if(scheduleShiftManagement.getSecondStartTime()!=null&&scheduleShiftManagement.getSecondEndTime()!=null) {
+                //复制公共字段生成新对象
+                ScheduleWorkRecord newScheduleWorkRecord = new ScheduleWorkRecord();
+                BeanUtils.copyProperties(scheduleWorkRecord, newScheduleWorkRecord);
+                newScheduleWorkRecord.setStatus(0L);
+                newScheduleWorkRecord.setStartTime(scheduleShiftManagement.getSecondStartTime());
+                newScheduleWorkRecord.setEndTime(scheduleShiftManagement.getSecondEndTime());
+                newScheduleWorkRecord.setDuration(scheduleShiftManagement.getSecondDuration());
+                scheduleWorkRecords.add(newScheduleWorkRecord);
+            }
+
+        }
+        return scheduleWorkRecords;
     }