qsw 优化

qushaowei

2023-08-21 4a42e08604da919ec975f4c1a04132499ba16728

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -118,9 +118,13 @@
      if(StringUtils.isNotBlank(equipment.getTechnologyStatus())){
         queryWrapper.eq("technology_status",equipment.getTechnologyStatus());
      }
      if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
         queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
      }

      queryWrapper.eq("status","1");
      queryWrapper.eq("del_flag",0);
      queryWrapper.orderByDesc("create_time");

      Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
      IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
@@ -138,17 +142,17 @@
            eq.setPrecisionParametersTemplateName("");
         }

         String processParametersTemplateId = eq.getProcessParametersTemplateId();
         if(StringUtils.isNotBlank(processParametersTemplateId)){
            ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
            if(processParametersTemplate != null){
               eq.setProcessParametersTemplateName(processParametersTemplate.getName());
            }else{
               eq.setProcessParametersTemplateName("");
            }
         }else{
            eq.setProcessParametersTemplateName("");
         }
//         String processParametersTemplateId = eq.getProcessParametersTemplateId();
//         if(StringUtils.isNotBlank(processParametersTemplateId)){
//            ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
//            if(processParametersTemplate != null){
//               eq.setProcessParametersTemplateName(processParametersTemplate.getName());
//            }else{
//               eq.setProcessParametersTemplateName("");
//            }
//         }else{
//            eq.setProcessParametersTemplateName("");
//         }
         //查询封存原因和封存日期
         List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
               .eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();