[清退 file] 代码提交

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -282,7 +282,7 @@ public class JavaToPdfHtmlFreeMarker {
             // 获取模板,并设置编码方式
             Template template = freemarkerCfg.getTemplate("bill2.html");
             template.setEncoding("UTF-8");
-            List<DocumentDevice> list=confirm.getConfirmDevices();
+            List<DocumentDevice> list=confirm.getConfirmDevices().stream().sorted(Comparator.comparing(DocumentDevice::getModel)).collect(Collectors.toList());
                 boolean falg=true;
                 Integer page=0;
                 int pageNum = page + 1;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -157,22 +157,22 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<DevRepelVo> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo) {
         Units units=  unitsService.findById(modelAndTypeVo.getUnitId());
-//        if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
-//          return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
-//                  .map(this::devRepelVo).collect(Collectors.toList());
-//        }else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
-//            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
-//                    .map(this::devRepelVo).collect(Collectors.toList());
-//        }else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
+        if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
           return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
-                    .filter(deviceLibrary -> deviceLibrary.getType()==null ||deviceLibrary.getType().equals(modelAndTypeVo.getType()))
-                    .filter(deviceLibrary -> deviceLibrary.getModel()==null|| deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
                   .map(this::devRepelVo).collect(Collectors.toList());
-//        }else {
-//          return  deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
-//                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
-//                   .map(this::devRepelVo).collect(Collectors.toList());
-//        }
+        }else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
+            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
+                    .map(this::devRepelVo).collect(Collectors.toList());
+        }else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
+            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
+                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+//                    .filter(deviceLibrary -> deviceLibrary.getModel()==null|| deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
+                    .map(this::devRepelVo).collect(Collectors.toList());
+        }else {
+          return  deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
+                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+                   .map(this::devRepelVo).collect(Collectors.toList());
+        }
     }