历史计划信息

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

@@ -3,6 +3,7 @@ package com.factory.controller.web;
 import java.util.List;
 
 import com.factory.user.entity.vo.res.FileRes;
+import com.factory.web.entity.fa.req.*;
 import com.factory.web.entity.vo.req.exportInitialPlanDetailsReq;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,22 +17,6 @@ import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
-import com.factory.web.entity.fa.req.AddFaItemResultListReq;
-import com.factory.web.entity.fa.req.AddFaPlanReq;
-import com.factory.web.entity.fa.req.EditFaItemResultListReq;
-import com.factory.web.entity.fa.req.EditFaPlanReq;
-import com.factory.web.entity.fa.req.SearchALLPlanListReq;
-import com.factory.web.entity.fa.req.SearchFaCalendarReq;
-import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
-import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
-import com.factory.web.entity.fa.req.SearchFaPlanCheckListReq;
-import com.factory.web.entity.fa.req.SearchFaPlanListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaPlanReq;
-import com.factory.web.entity.fa.req.SearchFaTaskReq;
-import com.factory.web.entity.fa.req.SearchFaWorkshopListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
-import com.factory.web.entity.fa.req.SubmitFaTaskReq;
 import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
@@ -66,7 +51,7 @@ import lombok.extern.slf4j.Slf4j;
 public class FirstArticleController {
 	@Autowired
 	private FirstArticleService firstArticleService;
-	
+
 	@Autowired
 	private PreventMistakeService preventMistakeService;
 
@@ -84,70 +69,70 @@ public class FirstArticleController {
 		FaPlanRes faPlanRes = firstArticleService.getFaPlan(req);
 		return ResponseBeanBuilder.ok(faPlanRes);
 	}
-	
+
 	@ApiOperation(value = "修改首件计划")
 	@PostMapping("/editFaPlan")
 	@ApiOperationSupport(order = 3)
 	public ResponseBean editFaPlan(@RequestBody EditFaPlanReq req) {
 		return firstArticleService.editFaPlan(req);
 	}
-	
+
 	@ApiOperation(value = "禁用解禁首件计划")
 	@PostMapping("/disableFaPlan")
 	@ApiOperationSupport(order = 4)
 	public ResponseBean disableFaPlan(@RequestBody PmPlanPauseFlagReq req) {
 		return preventMistakeService.disablePmPlan(req);
 	}
-	
+
 	@ApiOperation(value = "取得Web端首件计划点检列表")
 	@ApiOperationSupport(order = 5)
 	@PostMapping("/getFaPlanCheckList")
 	public ResponseBean<PageBean<FaPlanListRes>> getFaPlanCheckList(@RequestBody SearchFaPlanCheckListReq req) {
 		return firstArticleService.getFaPlanCheckList(req);
 	}
-	
+
 	@ApiOperation(value = "取得Pad端首件计划列表")
 	@ApiOperationSupport(order = 6)
 	@PostMapping("/getFaPlanListForPad")
 	public ResponseBean<List<FaPlanListForPadRes>> getFaPlanListForPad(@RequestBody SearchFaPlanListForPadReq req) {
 		return firstArticleService.getFaPlanListForPad(req);
 	}
-	
+
 	@ApiOperation(value = "取得Pad端工作站列表")
 	@ApiOperationSupport(order = 7)
 	@PostMapping("/getFaWorkshopListForPad")
 	public ResponseBean<List<FirstArticleWorkshop>> getFaWorkshopListForPad(@RequestBody SearchFaWorkshopListForPadReq req) {
 		return firstArticleService.getFaWorkshopListForPad(req);
 	}
-	
+
 	@ApiOperation(value = "取得Pad端巡检项目列表")
 	@ApiOperationSupport(order = 8)
 	@PostMapping("/getFaItemListForPad")
 	public ResponseBean<List<FaItemListForPadRes>> getFaItemListForPad(@RequestBody SearchFaItemListForPadReq req) {
 		return firstArticleService.getFaItemListForPad(req);
 	}
-	
+
 	@ApiOperation(value = "添加巡检项目检查结果")
 	@PostMapping("/addFaItemResult")
 	@ApiOperationSupport(order = 9)
 	public ResponseBean addFaItemResult(@RequestBody AddFaItemResultListReq req) {
 		return firstArticleService.addFaItemResult(req);
 	}
-	
+
 	@ApiOperation(value = "任务检查完后提交")
 	@PostMapping("/submitFaTask")
 	@ApiOperationSupport(order = 10)
 	public ResponseBean submitFaTask(@RequestBody SubmitFaTaskReq req) {
 		return firstArticleService.submitFaTask(req);
 	}
-	
+
 	@ApiOperation(value = "取得不放行任务对应的工作站")
 	@ApiOperationSupport(order = 11)
 	@PostMapping("/getFaWorkshopNoGoList")
 	public ResponseBean<List<FaWorkshopNoGoListRes>> getFaWorkshopNoGoList(@RequestBody SearchFaWorkshopNoGoListReq req) {
 		return firstArticleService.getFaWorkshopNoGoList(req);
 	}
-	
+
 	@ApiOperation(value = "取得不放行任务对应的点检项目")
 	@ApiOperationSupport(order = 12)
 	@PostMapping("/getFaItemNoGoList")
@@ -161,7 +146,7 @@ public class FirstArticleController {
 	public ResponseBean editFaItemResult(@RequestBody EditFaItemResultListReq req) {
 		return firstArticleService.editFaItemResult(req);
 	}
-	
+
 	@ApiOperation(value = "通过计划ID取得表头")
 	@ApiOperationSupport(order = 14)
 	@PostMapping("/getFaTitle")
@@ -169,28 +154,35 @@ public class FirstArticleController {
 		FirstArticleTitle firstArticleTitle = firstArticleService.getFaTitle(req.getBentelerPlanId());
 		return ResponseBeanBuilder.ok(firstArticleTitle);
 	}
-	
+
 	@ApiOperation(value = "取得不放行任务对应的质量经理审批信息")
 	@ApiOperationSupport(order = 15)
 	@PostMapping("/getFaNoGoTaskAapproval")
 	public ResponseBean<FaNoGoTaskAapprovalRes> getFaNoGoTaskAapproval(@RequestBody SearchFaTaskReq req) {
 		return firstArticleService.getFaNoGoTaskAapproval(req);
 	}
-	
+
 	@ApiOperation(value = "取得计划审批信息")
 	@ApiOperationSupport(order = 16)
 	@PostMapping("/getFaPlanApprovalList")
 	public ResponseBean<List<OnsiteApprovalPlan>> getFaPlanApprovalList(@RequestBody SearchPmPlanReq req) {
 		return preventMistakeService.getPmPlanApprovalList(req);
 	}
-	
+
 	@ApiOperation(value = "取得所有计划(首件、防错)")
 	@ApiOperationSupport(order = 17)
 	@PostMapping("/getALLPlanList")
 	public ResponseBean<List<BentelerPlan>> getALLPlanList(@RequestBody SearchALLPlanListReq req) {
 		return firstArticleService.getALLPlanList(req);
 	}
-	
+
+	@ApiOperation(value = "取得某个计划生成的历史计划信息(首件、防错)")
+	@ApiOperationSupport(order = 100)
+	@PostMapping("/getHisPlanList")
+	public ResponseBean<List<BentelerPlan>> getHisPlanList(@RequestBody SearchHisPlanListReq req) {
+		return firstArticleService.getHisPlanList(req);
+	}
+
 	@ApiOperation(value = "检查记录列表")
 	@ApiOperationSupport(order = 18)
 	@PostMapping("/getFaCheckRecordList")
@@ -209,26 +201,26 @@ public class FirstArticleController {
 	public ResponseBean<FileRes> exportInitialPlanDetails(@RequestBody exportInitialPlanDetailsReq req) {
 		return firstArticleService.exportInitialPlanDetails(req);
 	}
-	
+
 //	@ApiOperation(value = "判断检验结果是否填写完成")
 //	@PostMapping("/getFaAllCheckFlag")
 //	@ApiOperationSupport(order = 19)
 //	public ResponseBean<FaAllCheckFlagRes> getFaAllCheckFlag(@RequestBody SearchFaAllCheckFlagReq req) {
 //		return ResponseBeanBuilder.ok(firstArticleService.getFaAllCheckFlag(req));
 //	}
-	
+
 	@ApiOperation(value = "取得用户列表")
 	@PostMapping("/getUserList")
 	@ApiOperationSupport(order = 20)
 	public ResponseBean<List<UserListRes>> getUserList() {
 		return ResponseBeanBuilder.ok(firstArticleService.getUserList());
 	}
-	
+
 	@ApiOperation(value = "取得点检人和点检日期")
 	@PostMapping("/getFaCalendarList")
 	@ApiOperationSupport(order = 21)
 	public ResponseBean<List<FaCalendarRes>> getFaCalendarList(@RequestBody SearchFaCalendarReq req) {
 		return ResponseBeanBuilder.ok(firstArticleService.getFaCalendarList(req));
 	}
-	
+
 }

application-facade/src/main/java/com/factory/web/entity/fa/req/SearchHisPlanListReq.java

@@ -0,0 +1,23 @@
+package com.factory.web.entity.fa.req;
+
+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;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class SearchHisPlanListReq implements Serializable {
+
+    @ApiModelProperty(value = "计划id")
+    private long id;
+}

application-facade/src/main/java/com/factory/web/service/fa/FirstArticleService.java

@@ -2,6 +2,7 @@ package com.factory.web.service.fa;
 
 import java.util.List;
 
+import com.factory.web.entity.fa.req.*;
 import com.factory.web.entity.vo.req.exportInitialPlanDetailsReq;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,25 +15,6 @@ import com.factory.web.entity.fa.FirstArticleItemResult;
 import com.factory.web.entity.fa.FirstArticleTask;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
-import com.factory.web.entity.fa.req.AddFaItemResultListReq;
-import com.factory.web.entity.fa.req.AddFaPlanReq;
-import com.factory.web.entity.fa.req.EditFaItemResultListReq;
-import com.factory.web.entity.fa.req.EditFaPlanReq;
-import com.factory.web.entity.fa.req.SearchALLPlanListReq;
-import com.factory.web.entity.fa.req.SearchFaAllCheckFlagReq;
-import com.factory.web.entity.fa.req.SearchFaCalendarReq;
-import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
-import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
-import com.factory.web.entity.fa.req.SearchFaItemResultListReq;
-import com.factory.web.entity.fa.req.SearchFaPlanCheckListReq;
-import com.factory.web.entity.fa.req.SearchFaPlanListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaPlanReq;
-import com.factory.web.entity.fa.req.SearchFaTaskInfoReq;
-import com.factory.web.entity.fa.req.SearchFaTaskReq;
-import com.factory.web.entity.fa.req.SearchFaWorkshopListForPadReq;
-import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
-import com.factory.web.entity.fa.req.SubmitFaTaskReq;
 import com.factory.web.entity.fa.res.FaAllCheckFlagRes;
 import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
@@ -54,9 +36,16 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public interface FirstArticleService extends IService<BentelerPlan> {
 
+	/**
+	 * 获取历史信息计划
+	 * @param req
+	 * @return
+	 */
+	public ResponseBean<List<BentelerPlan>> getHisPlanList(SearchHisPlanListReq req) ;
+
 	/**
 	 * 新建首件计划
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -64,7 +53,7 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 
 	/**
 	 * 校验计划名是否存在
-	 * 
+	 *
 	 * @param name
 	 * @return true存在，false不存在
 	 */
@@ -72,20 +61,20 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 
 	/**
 	 * 校验工作站名是否存在
-	 * 
+	 *
 	 * @param wsName
 	 * @return true存在，false不存在
 	 */
 	public boolean checkWsNameExist(String wsName);
-	
+
 	/**
 	 * 取得首件计划信息
-	 * 
+	 *
 	 * @param req
 	 * @return 首件计划信息
 	 */
 	public FaPlanRes getFaPlan(SearchFaPlanReq req);
-	
+
 	/**
 	 * 校验当前计划是否审批通过
      *
@@ -93,10 +82,10 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 	 * @return true通过，false不通过
 	 */
 	public boolean checkApprovalPlan(long bentelerPlanId);
-	
+
 	/**
 	 * 修改首件计划
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -104,74 +93,74 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 
 	/**
 	 * 取得首件计划点检列表
-	 * 
+	 *
 	 * @param req
 	 * @return 首件计划点检列表
 	 */
 	public ResponseBean<PageBean<FaPlanListRes>> getFaPlanCheckList(SearchFaPlanCheckListReq req);
-	
+
 	/**
 	 * 取得Pad端首件计划列表
-	 * 
+	 *
 	 * @param req
 	 * @return Pad端首件计划列表
 	 */
 	public ResponseBean<List<FaPlanListForPadRes>> getFaPlanListForPad(SearchFaPlanListForPadReq req);
-	
+
 	/**
      * 得Pad端工作站
      * @param req
      * @return 工作站
      */
     public ResponseBean<List<FirstArticleWorkshop>> getFaWorkshopListForPad(SearchFaWorkshopListForPadReq req);
-    
+
     /**
      * 取得Pad端巡检项目
      * @param req
      * @return 巡检项目
      */
     public ResponseBean<List<FaItemListForPadRes>> getFaItemListForPad(SearchFaItemListForPadReq req);
-    
+
     /**
 	 * 添加巡检项目检查结果
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
 	public ResponseBean addFaItemResult(AddFaItemResultListReq req);
-	
+
 	/**
 	 * 任务提交
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
 	public ResponseBean submitFaTask(SubmitFaTaskReq req);
-	
+
 	/**
 	 * 取得不放行任务对应的工作站
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的工作站
 	 */
 	public ResponseBean<List<FaWorkshopNoGoListRes>> getFaWorkshopNoGoList(SearchFaWorkshopNoGoListReq req);
-	
+
 	/**
 	 * 取得不放行任务对应的点检项目
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的点检项目
 	 */
 	public ResponseBean<List<FaItemNoGoListRes>> getFaItemNoGoList(SearchFaItemNoGoListReq req);
-	
+
 	/**
 	 * 修改巡检项目检查结果(这里只有重检走这里)
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
 	public ResponseBean editFaItemResult(EditFaItemResultListReq req);
-	
+
 	/**
 	 * 任务和巡检结果记录历史
 	 *
@@ -179,10 +168,10 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 	 * @return
 	 */
 	public void setFirstArticleTaskHis(Long firstArticleTaskId);
-	
+
 	/**
 	 * 取得表头信息
-	 * 
+	 *
 	 * @param bentelerPlanId
 	 * @return 表头信息
 	 */
@@ -194,52 +183,52 @@ public interface FirstArticleService extends IService<BentelerPlan> {
      * @return 任务
      */
     public FirstArticleTask getFaTaskInfo(SearchFaTaskInfoReq req);
-    
+
     /**
      * 查询中断最新的task
      * @param req
      * @return 任务
      */
     public FirstArticleTask getFaTaskInfoCatchLatest(SearchFaTaskInfoReq req);
-    
+
     /**
 	 * 取得不放行任务对应的质量经理审批信息
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的质量经理审批信息
 	 */
 	public ResponseBean<FaNoGoTaskAapprovalRes> getFaNoGoTaskAapproval(SearchFaTaskReq req);
-	
+
 	/**
 	 * 取得所有计划
-	 * 
+	 *
 	 * @param req
 	 * @return 所有计划
 	 */
 	public ResponseBean<List<BentelerPlan>> getALLPlanList(SearchALLPlanListReq req);
-	
+
 	/**
 	 * 检查记录列表
-	 * 
+	 *
 	 * @param req
 	 * @return 检查记录列表
 	 */
 	public ResponseBean<FaCheckRecordListRes> getFaCheckRecordList(SearchFaCheckRecordListReq req);
-	
+
 	/**
      * 取得首件、200件、中断每天的点检记录
      * @param req
      * @return 首件、200件、中断每天的点检记录
      */
     public List<FirstArticleItemResult> getFaItemResultList(SearchFaItemResultListReq req);
-    
+
 //    /**
 //     * 判断检验结果是否填写完成
 //     * @param req
 //     * @return 判断检验结果是否填写完成
 //     */
 //    public FaAllCheckFlagRes getFaAllCheckFlag(SearchFaAllCheckFlagReq req);
-    
+
     /**
      * 取得用户列表
      * @param req

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1073,6 +1074,20 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         return ResponseBeanBuilder.ok(aLLPlanList, Function.identity());
     }
 
+     @Override
+    public ResponseBean<List<BentelerPlan>> getHisPlanList(SearchHisPlanListReq req) {
+        BentelerPlan plan = planService.getById(req.getId());
+        List<PlanBind> bindList = planBindService.list(Wrappers.<PlanBind>lambdaQuery().eq(PlanBind::getOldBentelerPlanId, req.getId()));
+        List<Long> psids = new ArrayList<>();
+        for (PlanBind b : bindList) {
+            psids.add(b.getNewBentelerPlanId());
+        }
+        List<BentelerPlan> hisplans = planService.list(Wrappers.<BentelerPlan>lambdaQuery()
+                .eq(BentelerPlan::getPlanType, plan.getPlanType()).in(BentelerPlan::getId, psids));
+        return ResponseBeanBuilder.ok(hisplans, Function.identity());
+    }
+
+
     /**
      * 检查记录列表
      *
@@ -1161,7 +1176,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 //    	SearchFaTaskInfoReq searchFaTaskInfoReq = new SearchFaTaskInfoReq();
 //    	searchFaTaskInfoReq.setBentelerPlanId(req.getBentelerPlanId());
 //    	searchFaTaskInfoReq.setTypeFlag(req.getTypeFlag());
-//    	
+//
 //    	FirstArticleTask faTaskInfo = null;
 //    	if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
 //    		searchFaTaskInfoReq.setUserId(req.getUserId());
@@ -1170,7 +1185,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 //    		/* 取得中断最新的task */
 //    		faTaskInfo = this.getFaTaskInfoCatchLatest(searchFaTaskInfoReq);
 //    	}
-//    	
+//
 //    	long firstArticleTaskId = 0;
 //    	if (faTaskInfo != null) {
 //    		firstArticleTaskId = faTaskInfo.getId();
@@ -1353,8 +1368,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         titleMap.put("title", plan.getName());
 
 
-
-
         ArrayList<Map<String, String>> arrayList = new ArrayList<>();
         //返回工作站结果
         firstArticleWorkshopList.forEach(item -> {
@@ -1464,4 +1477,4 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         return ob;
     }
 
-}
+}