Quellcode durchsuchen

修改抽检功能的bug问题

oyq28 vor 3 Jahren
Ursprung
Commit
01bbc58226

+ 4 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/InspectionServiceImpl.java

@@ -122,13 +122,15 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
 
     private List<TaskNode> addSupportNodes(List<TaskNode> supportNodes, boolean isHeader, Long taskId, List<TaskNode> taskNodeList,TaskNode lastNode, String zoneName){
         List<TaskNode> dataList = dozer.mapList(supportNodes, TaskNode.class);
+
         dataList.forEach(item->{
             item.setTaskId(taskId).setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE))
                     .setExeStatus("1").setPrority(lastNode.getPrority()+1+taskNodeList.size());
             if(isHeader){
                 item.setNodeName("抽检:"+item.getNodeName());
             }else{
-                if(item.getAutoNode().isFinal()){
+                TaskNode finalNode = dataList.get(dataList.size()-1);
+                if(item == finalNode){
                     item.setNodeName("抽检:运到"+ zoneName +"线接驳位");
                 }else{
                     item.setNodeName("抽检:"+item.getNodeName());
@@ -168,7 +170,7 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
 
         //获取产线名称
         String zoneNo = zoneService.getById(model.getZoneId()).getNo();
-        String zoneName = (zoneNo=="capsule")? "舱体":((zoneNo=="framework")? "框体": "保障中心");
+        String zoneName = zoneNo.equals("capsule")? "舱体":((zoneNo.equals("framework")? "框体": "保障中心"));
 
         BomProcedure bomProcedure = bomProcedureService.getById(task.getProcedureId());
 

+ 1 - 1
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/InspectionController.java

@@ -65,7 +65,7 @@ public class InspectionController extends SuperController<InspectionService, Lon
         LbqWrapper<Inspection> wrapper = wrap.lambda();
         Inspection inspection = BeanUtil.toBean(data, Inspection.class);
 
-        wrapper.eq(Inspection::getPlanId, inspection.getPlanId()).orderByDesc(Inspection::getCreateTime);
+        wrapper.eq(Inspection::getPlanId, inspection.getPlanId()).orderByAsc(Inspection::getCreateTime);
         baseService.pageList(page, wrapper);
     }