修改freemaker

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -797,6 +797,54 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         predicateBuilder.eq("isRoot",0);
         return predicateBuilder.build();
     }
+//    private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
+//        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+//        Integer level = userUtils.getCurrentUnitLevel();
+//        if (level == 2) {
+//            predicateBuilder.in("invisibleRange", new Integer[]{2, 3});
+//        }
+//        if (level == 3) {
+//            predicateBuilder.eq("invisibleRange", 3);
+//        }
+//        if (packingLibrarySelectVo != null) {
+//            if (packingLibrarySelectVo.getContent() != null) {
+//                Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
+//                Field[] declaredFields = packingLibraryEntityClass.getDeclaredFields();
+//                PredicateBuilder<PackingLibrary> p = Specifications.or();
+//                for (Field field : declaredFields) {
+//                    if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
+//                        p.like(field.getName(), "%" + packingLibrarySelectVo.getContent() + "%");
+//                    }
+//                }
+//                predicateBuilder.predicate(p.build());
+//            }
+//            if (packingLibrarySelectVo.getStartTime() != null) {
+//                predicateBuilder.gt("createTime", packingLibrarySelectVo.getStartTime());
+//            }
+//            if (packingLibrarySelectVo.getEndTime() != null) {
+//                predicateBuilder.lt("updateTime", packingLibrarySelectVo.getEndTime());
+//            }
+//            if (packingLibrarySelectVo.getModel() != null) {
+//                predicateBuilder.eq("model", packingLibrarySelectVo.getModel());
+//            }
+//            if (packingLibrarySelectVo.getType() != null) {
+//                predicateBuilder.eq("type", packingLibrarySelectVo.getType());
+//            }
+//            if (packingLibrarySelectVo.getSecretLevel() != null) {
+//                predicateBuilder.eq("secretLevel", packingLibrarySelectVo.getSecretLevel());
+//            }
+//            if (packingLibrarySelectVo.getInvisibleRange() != null) {
+//                predicateBuilder.eq("invisibleRange", packingLibrarySelectVo.getInvisibleRange());
+//            }
+//            if (packingLibrarySelectVo.getName() != null) {
+//                predicateBuilder.eq("name", packingLibrarySelectVo.getName());
+//            }
+//        }
+//        predicateBuilder.eq("packingStatus", 2);
+////        predicateBuilder.eq("isRoot",0);
+//        predicateBuilder.in("isRoot",new Integer[]{0,1});
+//        return predicateBuilder.build();
+//    }
 
     private Specification<PackingLibrary> getSelectSpecification2(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
@@ -846,6 +894,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             else {
                 predicateBuilder.eq("packingStatus", 3);
             }
+            //新增
+//            predicateBuilder.in("isRoot",new Integer[]{0,1});
         }
 //        predicateBuilder.eq("isPart", 0);
         return predicateBuilder.build();

dev-union/src/main/resources/bill10.html

@@ -302,7 +302,7 @@
                             <tr>
                                 <td style="overflow: hidden">${dev.model!}</td>
                                 <td style="overflow: hidden">${dev.name!}</td>
-                                <td>${dev.count!}</td>
+                                <td width="40px">${dev.count!}</td>
                             </tr>
                         </#if>
                         <tr>