Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java =================================================================== diff -u -r14960 -r14962 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 14960) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 14962) @@ -150,7 +150,8 @@ return items; } - private void sortTousseTemplateItems(List items) { + @Override + public void sortTousseTemplateItems(List items) { Collections.sort(items, new Comparator() { @Override public int compare(TousseDefinitionTemplateItem o1, Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java =================================================================== diff -u -r13017 -r14962 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java (.../DepartmentAppTemplateManager.java) (revision 13017) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java (.../DepartmentAppTemplateManager.java) (revision 14962) @@ -57,4 +57,10 @@ public JSONArray diposableTemplateItems2JsonArray(JSONArray jsonArray, List items, double diposablePriceFloatPercent); + + /** + * 机械包定义模板按照SortNumber排序 + * @param items + */ + void sortTousseTemplateItems(List items); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14960 -r14962 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14960) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14962) @@ -75,6 +75,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -869,7 +870,8 @@ //如果是普通机械包申请单则要过滤掉消毒物品,如果是消毒物品申请单则要过滤机械包的普通物品(只留消毒物品) List tempList = this.filterGoodByType(template,isTousseApplicationForm ? TousseDefinition.PACKAGE_TYPE_DISINFECTION:TousseDefinition.PACKAGE_TYPE_INSIDE); - + //按照sortNumber重新排序 + departmentAppTemplateManager.sortTousseTemplateItems(tempList); departmentAppTemplateManager.tousseDefinitionTemplateItems2JsonArray(toussesJsonArray, tempList, tousseDefinitionFloatPercent); updateItemsApplyInfo(applicationItemMap, toussesJsonArray,applicationId); @@ -1050,7 +1052,7 @@ * @return 返回过滤后的物品 */ private List filterGoodByType(DepartmentAppTemplate template,String goodType){ - List tempList = new ArrayList<>(); + List tempList = new LinkedList<>(); List tempLists = template.getTousseDefinitionTemplateItems(); for (TousseDefinitionTemplateItem t : tempLists) { if (!goodType.equals(t.getTousseDefinition().getTousseType())){