防错-接口-追加点检频次过滤

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

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchItemListReq {
 	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+	
 	@ApiModelProperty(value = "任务id")
 	private Long onsiteTaskId;
 	

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

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchPmAllCheckFlagReq {
 	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+	
 	@ApiModelProperty(value = "计划Id")
 	private Long bentelerPlanId;
 	

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

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchPmItemNoGoListReq {
 	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+	
 	@ApiModelProperty(value = "工作站Id")
 	private Long workshopId;
 	

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

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchPmWorkshopNoGoListReq {
 	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+	
 	@ApiModelProperty(value = "计划Id")
 	private Long bentelerPlanId;
 	

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

@@ -29,4 +29,7 @@ public class SearchPmWsAllCheckFlagReq {
 	@ApiModelProperty(value = "任务id")
 	private Long onsiteTaskId;
 	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+	
 }

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

@@ -9,6 +9,7 @@ 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.OnsiteApprovalPlan;
+import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.SearchAbnormalReq;
 import com.factory.web.entity.pm.req.SearchApprovalUserReq;
 import com.factory.web.entity.pm.req.SearchCheckRecordReq;
@@ -210,6 +211,13 @@ public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
      */
     public List<AbnormalItemResultRes> getFaAbnormalItemResultList(@Param("req") SearchAbnormalReq req);
     
+    /**
+     * 取得PAD端工作站
+     * @param req
+     * @return PAD端工作站
+     */
+    public List<OnsiteWorkshop> getPmWorkshopListForPad(@Param("req") SearchPmAllCheckFlagReq req);
+    
     
     
     

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

@@ -793,14 +793,16 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      */
     @Override
     public ResponseBean<List<OnsiteWorkshop>> getWorkshopList(SearchPmAllCheckFlagReq req) {
-    	List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
-                .eq(OnsiteWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
+    	List<OnsiteWorkshop> onsiteWorkshopList = preventMistakeMapper.getPmWorkshopListForPad(req);
+//    	List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
+//                .eq(OnsiteWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
     	SearchPmWsAllCheckFlagReq searchPmWsAllCheckFlagReq = null;
     	for (OnsiteWorkshop onsiteWorkshop : onsiteWorkshopList) {
     		/* 判断工作站下项目是否都检查完 */
     		searchPmWsAllCheckFlagReq = new SearchPmWsAllCheckFlagReq();
     		searchPmWsAllCheckFlagReq.setOnsiteTaskId(req.getOnsiteTaskId());
     		searchPmWsAllCheckFlagReq.setWorkshopId(onsiteWorkshop.getId());
+    		searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());   		
 
     		int itemCount = preventMistakeMapper.getPmWsItemCount(searchPmWsAllCheckFlagReq);
     		int itemResultCount = preventMistakeMapper.getPmWsItemResultCount(searchPmWsAllCheckFlagReq);
@@ -822,7 +824,8 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     @Override
     public ResponseBean<List<OnsiteItem>> getItemList(SearchItemListReq req) {
     	List<OnsiteItem> onsiteItemList = onsiteItemService.list(Wrappers.<OnsiteItem>lambdaQuery()
-                .eq(OnsiteItem::getWorkshopId, req.getWorkshopId()));
+                .eq(OnsiteItem::getWorkshopId, req.getWorkshopId())
+                .eq(OnsiteItem::getTypeFlag, req.getTypeFlag()));
 
     	for (OnsiteItem onsiteItem : onsiteItemList) {
     		OnsiteItemResult onsiteItemResult = onsiteItemResultService.getOne(new LambdaQueryWrapper<OnsiteItemResult>()

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

@@ -158,10 +158,10 @@
 			   oir.result 
 		FROM   onsite_item_result oir,
 			   onsite_task ot,
-			   onsite_calendar oc 
+			   onsite_item oi
 		WHERE  oir.onsite_task_id = ot.id 
-		AND    ot.onsite_calendar_id = oc.id 
-		AND    oc.type_flag = #{req.typeFlag}
+		AND    oir.onsite_item_id = oi.id 
+		AND    oi.type_flag = #{req.typeFlag}
 		<if test="req.yearMonth != null and req.yearMonth != ''">
 		AND    DATE_FORMAT(ot.task_time, '%Y-%m') = #{req.yearMonth}
 		</if>
@@ -246,6 +246,7 @@
 		AND     oir.result = 1
 		AND     ow.benteler_plan_id = #{req.bentelerPlanId}
 		AND     oir.onsite_task_id = #{req.onsiteTaskId}
+		AND     oi.type_flag = #{req.typeFlag}
     </select>
     
     <!-- 取得不放行任务对应的点检项目 -->
@@ -266,6 +267,7 @@
 			AND oir.result = 1 
 			AND oi.workshop_id = #{req.workshopId}
 			AND oir.onsite_task_id = #{req.onsiteTaskId}
+			AND oi.type_flag = #{req.typeFlag}
     </select>
     <!-- 取得不放行任务对应的审批人、审批意见、审批时间 -->
     <select id="getPmNoGoTaskAapproval" resultType="com.factory.web.entity.pm.res.PmNoGoTaskAapprovalRes">
@@ -357,6 +359,7 @@
 	    SELECT COUNT(oi.id)
 		FROM   onsite_item oi
 		WHERE  oi.workshop_id = #{req.workshopId}
+		AND    oi.type_flag = #{req.typeFlag}
 	</select>
 	
 	<!-- 取得工作站下当前task的点检结果数 -->
@@ -367,6 +370,7 @@
 		WHERE   oir.onsite_item_id = oi.id
 		AND     oi.workshop_id = #{req.workshopId}
 		AND     oir.onsite_task_id = #{req.onsiteTaskId}
+		AND     oi.type_flag = #{req.typeFlag}
 	</select>
 	
 	
@@ -554,4 +558,16 @@
 			</if>
     </select>
     
+    <!--取得PAD端工作站 -->
+    <select id="getPmWorkshopListForPad" resultType="com.factory.web.entity.pm.OnsiteWorkshop">
+        SELECT  DISTINCT ow.id,
+		        ow.benteler_plan_id,
+		        ow.ws_name
+		FROM    onsite_workshop ow,
+		        onsite_item oi
+		WHERE   ow.id = oi.workshop_id
+		AND     ow.benteler_plan_id = #{req.bentelerPlanId}
+		AND     oi.type_flag = #{req.typeFlag}
+    </select>
+    
 </mapper>