防错-接口

application-facade/src/main/java/com/factory/controller/web/PreventMistakeController.java

@@ -11,15 +11,18 @@ import org.springframework.web.bind.annotation.RestController;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.pm.OnsiteItem;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
+import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.PmItemResultListRes;
+import com.factory.web.entity.pm.res.PmPlanListForPadRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 import com.factory.web.service.pm.PreventMistakeService;
@@ -37,14 +40,14 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Api(tags = "WEB - 防错")
 @RestController
-@RequestMapping("/benteler/web/pm")
+@RequestMapping("/benteler/pm")
 @Slf4j
 public class PreventMistakeController {
 	@Autowired
 	private PreventMistakeService preventMistakeService;
 
 	@ApiOperation(value = "新建防错计划")
-	@PostMapping("/addPmPlan")
+	@PostMapping("//addPmPlan")
 	@ApiOperationSupport(order = 1)
 	public ResponseBean addPmPlan(@RequestBody AddPmPlanReq req) {
 		return ResponseBeanBuilder.ok(preventMistakeService.addPmPlan(req));
@@ -71,7 +74,7 @@ public class PreventMistakeController {
 		return preventMistakeService.disablePmPlan(req);
 	}
 	
-	@ApiOperation(value = "取得工作站信息")
+	@ApiOperation(value = "取得工作站及站下巡检项目信息")
 	@ApiOperationSupport(order = 5)
 	@PostMapping("/getWorkshop")
 	public ResponseBean<OnsiteWorkshop> getWorkshop(@RequestBody SearchWorkshopReq req) {
@@ -93,4 +96,25 @@ public class PreventMistakeController {
 	}
 	
 	// TODO 详细页面-上方-计划审批通过时间（质量经理、产品经理）、每频次的检查人和检查时间。
+	
+	@ApiOperation(value = "取得Pad端防错计划列表")
+	@ApiOperationSupport(order = 8)
+	@PostMapping("/getPmPlanListForPad")
+	public ResponseBean<List<PmPlanListForPadRes>> getPmPlanListForPad(@RequestBody SearchPmPlanListForPadReq req) {
+		return preventMistakeService.getPmPlanListForPad(req);
+	}
+	
+	@ApiOperation(value = "通过计划ID取得工作站列表")
+	@ApiOperationSupport(order = 9)
+	@PostMapping("/getWorkshopList")
+	public ResponseBean<List<OnsiteWorkshop>> getWorkshopList(@RequestBody SearchPmPlanReq req) {
+		return preventMistakeService.getWorkshopList(req);
+	}
+	
+	@ApiOperation(value = "通过工作站ID取得巡检项目列表")
+	@ApiOperationSupport(order = 9)
+	@PostMapping("/getItemList")
+	public ResponseBean<List<OnsiteItem>> getItemList(@RequestBody SearchWorkshopReq req) {
+		return preventMistakeService.getItemList(req);
+	}
 }

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteApprovalTask.java

@@ -0,0 +1,44 @@
+package com.factory.web.entity.pm;
+
+import java.time.LocalDate;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 任务审批
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@TableName("onsite_approval_task")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteApprovalTask {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "任务审批id")
+	private Long id;
+
+	@ApiModelProperty(value = "任务id")
+	private Long onsiteTaskId;
+
+	@ApiModelProperty(value = "1代表1级别审批 2代表2级别审批")
+	private Integer approvalLevel;
+
+	@ApiModelProperty(value = "审批人")
+	private Long approvalUserId;
+	
+	@ApiModelProperty(value = "审批状态 0初始化 1放行")
+	private Integer status;
+
+}

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteItemResult.java

@@ -0,0 +1,52 @@
+package com.factory.web.entity.pm;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 任务点检结果
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@TableName("onsite_item_result")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteItemResult {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "任务id")
+	private Long id;
+
+	@ApiModelProperty(value = "任务id")
+	private Long onsiteTaskId;
+	
+	@ApiModelProperty(value = "巡检项目id")
+	private Long onsiteItemId;
+
+	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
+	private Integer result;
+	
+	@TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createdUserId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+}

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteTask.java

@@ -0,0 +1,47 @@
+package com.factory.web.entity.pm;
+
+import java.time.LocalDate;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 任务
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@TableName("onsite_task")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteTask {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "任务id")
+	private Long id;
+
+	@ApiModelProperty(value = "巡检时间表id")
+	private Long onsiteCalendarId;
+
+	@ApiModelProperty(value = "0初始化 1待审核状态 2放行 3不通过")
+	private Integer status;
+
+	@ApiModelProperty(value = "任务创建时间")
+	private LocalDate taskTime;
+
+	@ApiModelProperty(value = "是否发送了任务提醒给操作者 0没提醒 1已提醒")
+	private Integer remindTaskFlag;
+	
+	@ApiModelProperty(value = "没工作提醒是不是已经完成 0没提醒 1已提醒")
+	private Integer remindNoworkFalg;
+
+}

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmPlanListForPadReq.java

@@ -0,0 +1,36 @@
+package com.factory.web.entity.pm.req;
+
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 防错计划，Pad端点检人员可见的计划列表
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class SearchPmPlanListForPadReq {
+
+	@ApiModelProperty(value = "Pad端登录的检查人员用户Id")
+	private Long userId;
+
+	@ApiModelProperty(value = "任务创建时间，当前日期")
+	private LocalDateTime taskTime;
+
+	@ApiModelProperty(value = "0未完成 1已完成")
+	private Integer type;
+}

application-facade/src/main/java/com/factory/web/entity/pm/res/PmPlanListForPadRes.java

@@ -0,0 +1,41 @@
+package com.factory.web.entity.pm.res;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 防错计划，Pad端点检人员可见的计划列表
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class PmPlanListForPadRes {
+	
+	@ApiModelProperty(value = "任务ID")
+	private Long onsiteTaskId;
+	
+	@ApiModelProperty(value = "任务状态 0初始化 1待审核状态 2放行 3不通过")
+	private Integer status;
+
+	@ApiModelProperty(value = "计划ID")
+	private Long bentelerPlanId;
+
+	@ApiModelProperty(value = "计划名称")
+	private String bentelerPlanName;
+
+	@ApiModelProperty(value = "规则id")
+	private Long onsiteCalendarId;
+
+}

application-facade/src/main/java/com/factory/web/entity/pm/res/PmPlanListRes.java

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.time.LocalDateTime;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -36,6 +38,6 @@ public class PmPlanListRes {
 	private String planStatus;
 
 	@ApiModelProperty(value = "计划创建日期")
-	private Long createdTime;
+	private LocalDateTime createdTime;
 
 }

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteApprovalTaskMapper.java

@@ -0,0 +1,18 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteApprovalTask;
+
+
+/**
+ * 任务审批
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteApprovalTaskMapper extends BaseMapper<OnsiteApprovalTask> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteItemResultMapper.java

@@ -0,0 +1,18 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteItemResult;
+
+
+/**
+ * 任务点检结果
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteItemResultMapper extends BaseMapper<OnsiteItemResult> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteTaskMapper.java

@@ -0,0 +1,18 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteTask;
+
+
+/**
+ * 任务
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteTaskMapper extends BaseMapper<OnsiteTask> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/PreventMistakeMapper.java

@@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
+import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.res.PmItemResultListRes;
+import com.factory.web.entity.pm.res.PmPlanListForPadRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 
 /**
@@ -36,4 +38,11 @@ public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
      * @return 检查记录列表
      */
     public List<PmItemResultListRes> getPmItemResultList(@Param("req") SearchPmItemResultListReq req);
+    
+    /**
+     * 取得Pad端防错计划列表
+     * @param req
+     * @return Pad端防错计划列表
+     */
+    public List<PmPlanListForPadRes> getPmPlanListForPad(@Param("req") SearchPmPlanListForPadReq req);
 }

application-facade/src/main/java/com/factory/web/service/impl/pm/OnsiteApprovalTaskServiceImpl.java

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteApprovalTask;
+import com.factory.web.mapper.pm.OnsiteApprovalTaskMapper;
+import com.factory.web.service.pm.OnsiteApprovalTaskService;
+
+
+/**
+ * 任务审批
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteApprovalTaskService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteApprovalTaskServiceImpl extends ServiceImpl<OnsiteApprovalTaskMapper, OnsiteApprovalTask> implements OnsiteApprovalTaskService {
+
+}

application-facade/src/main/java/com/factory/web/service/impl/pm/OnsiteItemResultServiceImpl.java

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteItemResult;
+import com.factory.web.mapper.pm.OnsiteItemResultMapper;
+import com.factory.web.service.pm.OnsiteItemResultService;
+
+
+/**
+ * 任务点检结果
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteItemResultService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteItemResultServiceImpl extends ServiceImpl<OnsiteItemResultMapper, OnsiteItemResult> implements OnsiteItemResultService {
+
+}

application-facade/src/main/java/com/factory/web/service/impl/pm/OnsiteTaskServiceImpl.java

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteTask;
+import com.factory.web.mapper.pm.OnsiteTaskMapper;
+import com.factory.web.service.pm.OnsiteTaskService;
+
+
+/**
+ * 任务
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteTaskService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteTaskServiceImpl extends ServiceImpl<OnsiteTaskMapper, OnsiteTask> implements OnsiteTaskService {
+
+}

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -29,10 +29,12 @@ import com.factory.web.entity.pm.req.OnsiteItemReq;
 import com.factory.web.entity.pm.req.OnsiteWorkshopReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
+import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.PmItemResultListRes;
+import com.factory.web.entity.pm.res.PmPlanListForPadRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 import com.factory.web.mapper.pm.PreventMistakeMapper;
@@ -357,5 +359,37 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     	List<PmItemResultListRes> listRes = preventMistakeMapper.getPmItemResultList(req);
 		return ResponseBeanBuilder.ok(listRes, Function.identity());
     }
+    
+    /**
+     * 取得Pad端防错计划列表
+     * @param req
+     * @return Pad端防错计划列表
+     */
+    public ResponseBean<List<PmPlanListForPadRes>> getPmPlanListForPad(SearchPmPlanListForPadReq req) {
+    	List<PmPlanListForPadRes> listRes = preventMistakeMapper.getPmPlanListForPad(req);
+		return ResponseBeanBuilder.ok(listRes, Function.identity());
+    }
+    
+    /**
+     * 取得工作站列表
+     * @param req
+     * @return 工作站列表
+     */
+    public ResponseBean<List<OnsiteWorkshop>> getWorkshopList(SearchPmPlanReq req) {
+    	List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
+                .eq(OnsiteWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
+		return ResponseBeanBuilder.ok(onsiteWorkshopList, Function.identity());
+    }
+    
+    /**
+     * 取得巡检项目列表
+     * @param req
+     * @return 巡检项目列表
+     */
+    public ResponseBean<List<OnsiteItem>> getItemList(SearchWorkshopReq req) {
+    	List<OnsiteItem> onsiteItemList = onsiteItemService.list(Wrappers.<OnsiteItem>lambdaQuery()
+                .eq(OnsiteItem::getWorkshopId, req.getWorkshopId()));
+    	return ResponseBeanBuilder.ok(onsiteItemList, Function.identity());
+    }
    
 }

application-facade/src/main/java/com/factory/web/service/pm/OnsiteApprovalTaskService.java

@@ -0,0 +1,15 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteApprovalTask;
+
+
+/**
+ * 任务审批
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteApprovalTaskService extends IService<OnsiteApprovalTask> {
+
+}

application-facade/src/main/java/com/factory/web/service/pm/OnsiteItemResultService.java

@@ -0,0 +1,15 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteItemResult;
+
+
+/**
+ * 任务点检结果
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteItemResultService extends IService<OnsiteItemResult> {
+
+}

application-facade/src/main/java/com/factory/web/service/pm/OnsiteTaskService.java

@@ -0,0 +1,15 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteTask;
+
+
+/**
+ * 任务
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteTaskService extends IService<OnsiteTask> {
+
+}

application-facade/src/main/java/com/factory/web/service/pm/PreventMistakeService.java

@@ -2,21 +2,22 @@ package com.factory.web.service.pm;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.po.benteler.BentelerPlan;
+import com.factory.web.entity.pm.OnsiteItem;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
+import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.PmItemResultListRes;
+import com.factory.web.entity.pm.res.PmPlanListForPadRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 
@@ -90,6 +91,26 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
      * @return 检查记录列表
      */
     public ResponseBean<List<PmItemResultListRes>> getPmItemResultList(SearchPmItemResultListReq req);
-   
     
+    /**
+     * 取得Pad端防错计划列表
+     * @param req
+     * @return Pad端防错计划列表
+     */
+    public ResponseBean<List<PmPlanListForPadRes>> getPmPlanListForPad(SearchPmPlanListForPadReq req);
+    
+    /**
+     * 取得工作站列表
+     * @param req
+     * @return 工作站列表
+     */
+    public ResponseBean<List<OnsiteWorkshop>> getWorkshopList(SearchPmPlanReq req);
+    
+    /**
+     * 取得巡检项目列表
+     * @param req
+     * @return 巡检项目列表
+     */
+    public ResponseBean<List<OnsiteItem>> getItemList(SearchWorkshopReq req);
+
 }

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -42,7 +42,30 @@
 		AND    DATE_FORMAT(oir.created_time,'%Y') = #{req.year}
         ORDER BY oi.workshop_id, oir.onsite_item_id
     </select>
-    
+
+    <!--取得Pad端防错计划列表 -->
+    <select id="getPmPlanListForPad" resultType="com.factory.web.entity.pm.res.PmPlanListForPadRes">
+        SELECT ot.id AS onsite_task_id,
+		       ot.`status`,
+			   oc.benteler_plan_id,
+			   bp.`name` AS benteler_plan_name,
+			   oc.id AS onsite_calendar_id
+		FROM   onsite_task ot,
+		       onsite_calendar oc,
+			   benteler_plan bp
+		WHERE  ot.onsite_calendar_id = oc.id
+		AND    oc.benteler_plan_id = bp.id
+		AND    bp.pause_flag = 0
+		<if test="req.type == 0"> <!-- 未完成 -->
+		AND    ot.`status` in (0, 1, 3)
+		</if>
+		<if test="req.type == 1"> <!-- 已完成 -->
+		AND    ot.`status` = 2
+		</if>
+		AND    ot.task_time = #{req.taskTime}
+		AND    oc.user_id = #{req.userId}
+        GROUP BY ot.id
+    </select>
 
 
 </mapper>