1.修改电子巡更 排班任务 开始时创建监测记录

cjy-project/src/main/java/com/cjy/patrol/controller/PatrolTaskController.java

@@ -218,7 +218,9 @@ public class PatrolTaskController extends BaseController
     @GetMapping("startTask")
     public AjaxResult startTask(@Validated(UpdaeGroup.class) PatrolTaskDTO patrolTaskDTO)
     {
+        patrolTaskDTO.setOrganCode(getUserOrganCode().toString());
         patrolTaskDTO.setTaskState("2");
+        patrolTaskDTO.setCreateBy(getUserId().toString());
         return toAjax(patrolTaskService.stopOrStartTask(patrolTaskDTO));
     }
 }

cjy-project/src/main/java/com/cjy/patrol/dto/PatrolTaskDTO.java

@@ -17,6 +17,26 @@ public class PatrolTaskDTO {
 
 	private String taskState;
 
+	private String organCode;
+	private String createBy;
+
+
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getOrganCode() {
+		return organCode;
+	}
+
+	public void setOrganCode(String organCode) {
+		this.organCode = organCode;
+	}
+
 	public String getId() {
 		return id;
 	}

cjy-project/src/main/java/com/cjy/patrol/mapper/PatrolTaskPeopleMapper.java

@@ -61,4 +61,6 @@ public interface PatrolTaskPeopleMapper
     public int deletePatrolTaskPeopleByIds(Long[] ids);
 
     List<String> listUserScheduleInfo(Long userId);
+    List<String> listUserScheduleInfoAlluserId();
+
 }

cjy-project/src/main/java/com/cjy/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -132,9 +132,47 @@ public class PatrolTaskServiceImpl implements IPatrolTaskService {
 	 */
 	@Override
 	public int stopOrStartTask(PatrolTaskDTO patrolTaskDTO) {
+		if (patrolTaskDTO.getTaskState().equals("2")) {
+			// 通过任务ID和
+			//如果这个任务是排班
+			PatrolTask patrolTask = patrolTaskMapper.selectPatrolTaskById(Long.parseLong(patrolTaskDTO.getId()));
+			List<PatrolTaskPeople> list = new ArrayList();
+			List<PatrolTaskMonitor> userScheduleList = new ArrayList();
+
+			List<String> listUserIds=patrolTaskPeopleMapper.listUserScheduleInfoAlluserId();
+			//如果这个任务是排班任务
+			if (patrolTask.getPatrolType().equals("1")) {
+				listUserIds.stream().forEach(item->{
+					PatrolTaskPeople patrolTaskPeople = new PatrolTaskPeople();
+					patrolTaskPeople.setPatrolTaskId(Long.parseLong(patrolTaskDTO.getId()));
+					patrolTaskPeople.setOrganCode(Long.parseLong(patrolTaskDTO.getOrganCode()));
+					patrolTaskPeople.setCreateBy(patrolTaskDTO.getCreateBy());
+					list.add(patrolTaskPeople);
+					//获取值班用户信息 只获取排版大于当前时间的排班信息
+					patrolTaskPeople.setPatrolPeopleId(Long.parseLong(item));
+					//获取所有值班用户的ID
+					List<String> userScheduleInfoList = patrolTaskPeopleMapper.listUserScheduleInfo(Long.parseLong(item));
+					for (String itemUserScheduleInfoList : userScheduleInfoList) {
+
+						PatrolTaskMonitor patrolTaskMonitor = new PatrolTaskMonitor();
+						patrolTaskMonitor.setPatrolTaskId(Long.parseLong(patrolTaskDTO.getId()));
+
+						patrolTaskMonitor.setOrganCode(Long.parseLong(patrolTaskDTO.getOrganCode()));
+						patrolTaskMonitor.setCreateBy(patrolTaskDTO.getCreateBy());
+						patrolTaskMonitor.setPatrolDate(itemUserScheduleInfoList);
+						patrolTaskMonitor.setCompleteness("0");
+						patrolTaskMonitor.setPatrolmanId(Long.parseLong(item));
+						userScheduleList.add(patrolTaskMonitor);
+					}
+				});
+
+				//先删除在添加
+				patrolTaskMonitorMapper.insertPatrolTaskMonitor(userScheduleList);
+				patrolTaskPeopleMapper.insertPatrolTaskPeople(list);
+			}
+		}
 		return patrolTaskMapper.stopOrStartTask(patrolTaskDTO);
 	}
-
 	/**
 	 * 批量删除巡更任务
 	 *

cjy-project/src/main/resources/mapper/patrol/PatrolTaskPeopleMapper.xml

@@ -43,6 +43,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             t2.user_id = #{userId} and (t1.scheduling_type='2' or t1.scheduling_type='3') and  scheduling_time > now()
     </select>
+    <select id="listUserScheduleInfoAlluserId" resultType="java.lang.String">
+        SELECT
+            t2.user_id
+        FROM
+            ti_scheduling t1
+                LEFT JOIN ti_scheduling_person  t2 on t1.id=t2.scheduling_id
+
+        WHERE
+         (t1.scheduling_type='2' or t1.scheduling_type='3') and  scheduling_time > now()
+
+    </select>
 
     <insert id="insertPatrolTaskPeople" parameterType="PatrolTaskPeople" useGeneratedKeys="true" keyProperty="id">
         insert into patrol_task_people(patrol_people_id, patrol_task_id, create_by,organ_code)
@@ -77,4 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+
 </mapper>