更新索引--涉及任务下发、定时器修改、任务执行

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/AppCheckInputRespone.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 public class AppCheckInputRespone{
 	private String inputName;
+
+	private String pointId;
 	
 	private String inputValue;
 	
@@ -24,7 +26,9 @@ public class AppCheckInputRespone{
 	public String getDefaultValue() {
 		return defaultValue;
 	}
-
+	public String getPointId() {
+		return pointId;
+	}
 	public void setDefaultValue(String defaultValue) {
 		this.defaultValue = defaultValue;
 	}

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanMapper.java

@@ -58,4 +58,6 @@ public interface PlanMapper extends BaseMapper {
 	 * 初始化计划下次执行时间
 	 */
 	void initUpdatePlanNextGenDate();
+
+	Plan getPlan(String planId);
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/PlanTaskStaticDto.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import lombok.Data;
+
+import java.util.Collection;
+@Data
+public class PlanTaskStaticDto {
+    private String planTaskId;
+
+    private String finshNum;
+
+    private String omission;
+
+    private String unqualified;
+
+    private String unplan;
+
+    private String taskPlanNum;
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -167,4 +167,8 @@
 	<update id="initUpdatePlanNextGenDate">
 	 	UPDATE p_plan p SET  p.next_gen_date = CURDATE() WHERE p.is_delete = 0 AND p.status = 0 AND p.plan_end IS NULL AND p.next_gen_date <![CDATA[ < ]]> CURDATE();
 	</update>
+
+	<select id="getPlan" resultType="com.yeejoin.amos.patrol.dao.entity.Plan">
+		select * from p_plan where id = #{planId}
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1761,4 +1761,109 @@
 			#{id}
 		</foreach>
 	</select>
+
+	<select id="queryPlanTaskStaticById" resultType="com.yeejoin.amos.patrol.business.dto.PlanTaskStaticDto">
+		SELECT
+			a.planTaskId,
+			sum(a.finish) finshNum,
+			sum(a.omission) omission,
+			sum(a.unqualified) unqualified,
+			sum(a.unplan) unplan,
+			count(a.finish) taskPlanNum
+		FROM
+			(
+				SELECT
+					pt.id planTaskId,
+
+					CASE ptd.status
+						WHEN 1 THEN
+							1
+						ELSE
+							0
+						END finish,
+					CASE ptd.status
+						WHEN 3 THEN
+							1
+						ELSE
+							0
+						END omission,
+					CASE ptd.status
+						WHEN 2 THEN
+							1
+						ELSE
+							0
+						END unqualified,
+					CASE ptd.status
+						WHEN 0 THEN
+							1
+						ELSE
+							0
+						END unplan
+				FROM
+					p_plan_task_detail ptd
+						LEFT JOIN p_plan_task pt ON ptd.task_no = pt.id
+			) a
+		where  a.planTaskId IN
+			<foreach item="id" collection="planTaskIds" index="index" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+		GROUP BY a.planTaskId
+	</select>
+
+	<select id="selectTaskDetailList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
+		SELECT
+			pptd.id,
+			pptd.task_no planTaskId,
+			pptd.status pointStatus,
+			pp.id pointId,
+			pp.name pointName,
+			pp.point_no pointNo,
+			pp.shot_min_number shortMinNumber,
+			pp.shot_max_number shortMaxNumber,
+			'0' checkId
+		FROM
+			"p_plan_task_detail" pptd  LEFT JOIN p_point pp ON pp.id = pptd.point_id WHERE
+				task_no IN
+			<foreach item="id" collection="taskIds" index="index" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+	</select>
+
+	<select id="selectTaskInfoList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
+		SELECT
+			id planTaskId,
+			date_format(ppt.begin_time,'%Y-%m-%d %H:%i:%s') beginTime,
+			date_format(ppt.end_time,'%Y-%m-%d %H:%i:%s') endTime,
+			ppt.finish_status taskStatus
+		FROM
+			p_plan_task ppt
+		WHERE
+			plan_id = #{id};
+	</select>
+
+	<select id="selectPointInputs" resultType="com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone">
+		SELECT
+			ppi.point_id,
+			null inputValue,
+			null pointInputImgUrls,
+			pii.default_value,
+			pii.ID inputItemId,
+			pii.NAME inputName,
+			pii.ID checkInputId,
+			pii.item_type itemType,
+			pii.risk_desc riskDesc,
+			pii.data_json dataJson,
+			pii.is_must isMust,
+			pii.default_value defaultValue,
+			pii.picture_json pictureJson,
+			pii.is_multiline isMultiline,
+			pii.order_no orderNo
+		FROM
+			p_point_inputitem ppi
+				LEFT JOIN p_input_item pii ON ppi.input_item_id = pii."id"
+	</select>
+
+	<select id="getPlanTaskIds" resultType="java.lang.String">
+		SELECT ID FROM p_plan_task WHERE plan_id = #{id}
+	</select>
 </mapper>
\ No newline at end of file