首件 历史版本不应该倒序

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

@@ -1,88 +0,0 @@
-//package com.factory.controller.web;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//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.onsite.OnsiteItem2;
-//import com.factory.web.entity.onsite.OnsiteItemReq;
-//import com.factory.web.entity.onsite.OnsiteItemRes;
-//import com.factory.web.service.onsite.OnsiteItemService2;
-//
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//
-//@Api(tags = "巡检项目设置")
-//@RestController
-//@RequestMapping("/benteler/onsite")
-//public class OnsiteItemController {
-//
-//	@Autowired
-//	private OnsiteItemService2 onsiteItemService2;
-//
-//	@ApiOperation(value = "添加巡检项目")
-//	@PostMapping("/addOnsiteItem")
-//	public ResponseBean addOnsiteItem(@RequestBody OnsiteItemReq req) {
-//		OnsiteItem2 onsiteItem = OnsiteItem2.builder()
-//				.workshopId(req.getWorkshopId())
-//				.itemContent(req.getItemContent())
-//				.typeFlag(req.getTypeFlag())
-//				.inspectionFlag(req.getInspectionFlag())
-//				.build();
-//		//onsiteItemService.save(onsiteItem);
-//		return ResponseBeanBuilder.ok(onsiteItemService2.save(onsiteItem));
-//	}
-//
-//	@ApiOperation(value = "取得巡检项目")
-//	@PostMapping("/getOnsiteItem")
-//	public ResponseBean<OnsiteItem2> getOnsiteItem(@RequestBody OnsiteItemReq req) {
-//		OnsiteItem2 onsiteItem = onsiteItemService2.getById(req.getId());
-//		return ResponseBeanBuilder.ok(onsiteItem);
-//	}
-//	
-//	@ApiOperation(value = "修改巡检项目")
-//	@PostMapping("/updateOnsiteItem")
-//	public ResponseBean updateOnsiteItem(@RequestBody OnsiteItemReq req) {
-//		OnsiteItem2 onsiteItem = OnsiteItem2.builder()
-//				.id(req.getId())
-//				.itemContent(req.getItemContent())
-//				.build();
-//		return ResponseBeanBuilder.ok(onsiteItemService2.updateById(onsiteItem));
-//	}
-//	
-//	@ApiOperation(value = "取得巡检项目列表")
-//	@PostMapping("/getOnsiteItemList")
-//	public ResponseBean<PageBean<OnsiteItem2>> getOnsiteItemList(@RequestBody OnsiteItemReq req) {
-//		QueryWrapper<OnsiteItem2> queryWrapper = new QueryWrapper<>();
-//		queryWrapper.orderByDesc("id");
-//        if (req.getTypeFlag() != null) {
-//        	queryWrapper.eq("type_flag", req.getTypeFlag());
-//        }
-//        if (req.getItemContent() != null) {
-//        	queryWrapper.like("item_content", req.getItemContent());
-//        }
-//        
-//		IPage<OnsiteItem2> page = new Page<>(req.getPage(), req.getSize());
-//        IPage<OnsiteItem2> userInfoPage = onsiteItemService2.page(page, queryWrapper);
-//        
-//        return ResponseBeanBuilder.ok(userInfoPage);
-//	}
-//	
-//	@ApiOperation(value = "取得列表")
-//	@PostMapping("/getList")
-//	public ResponseBean<PageBean<OnsiteItemRes>> getList(@RequestBody OnsiteItemReq req) {
-//		
-//		return onsiteItemService2.getList(req);
-//	}
-//	
-//	
-//
-//}

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

@@ -1232,30 +1232,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                         .eq(BentelerPlan::getPlanType, plan.getPlanType())
                         .eq(BentelerPlan::getOriginalId, plan.getOriginalId())
                         .in(BentelerPlan::getStatus, PlanStatus.APPROVAL_PASS.value, PlanStatus.APPROVAL_FORMAL.value, PlanStatus.HISTORY.value)
-                        .orderByDesc(BentelerPlan::getId)
                 );
             }
-
-//            List<PlanBind> bindList = planBindService.list(Wrappers.<PlanBind>lambdaQuery().eq(PlanBind::getOldBentelerPlanId, req.getId())
-//            		.select(PlanBind::getNewBentelerPlanId));
-//            List<Long> psids = new ArrayList<>();
-//            for (PlanBind b : bindList) {
-//                psids.add(b.getNewBentelerPlanId());
-//            }
-//            psids.add(plan.getId());//把最初版本放入到信息里面
-//            if(psids.size()>0){
-//                List<OnsiteApprovalPlan> approvals=onsiteApprovalPlanService.list(Wrappers.<OnsiteApprovalPlan>lambdaQuery().eq(OnsiteApprovalPlan::getApprovalLevel,2)
-//                       .eq(OnsiteApprovalPlan::getStatus,1)
-//                       .in(OnsiteApprovalPlan::getBentelerPlanId,psids));
-//                psids = new ArrayList<>();
-//                for (OnsiteApprovalPlan b : approvals) {
-//                    psids.add(b.getBentelerPlanId());
-//                }
-//                if(psids.size()>0){
-//                	list = planService.list(Wrappers.<BentelerPlan>lambdaQuery() .eq(BentelerPlan::getPlanType, plan.getPlanType()).in(BentelerPlan::getId, psids));
-//                    
-//                }
-//            }
         }
 
         return ResponseBeanBuilder.ok(list, Function.identity());