diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index d4e9f4589..fce9cc117 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -142,4 +142,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @TableField(exist = false) @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; + + @TableField(exist = false) + private String orderByField; + + // 1顺序 2倒序 + @TableField(exist = false) + private String orderBy; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 6a36942a6..6ccf3ec38 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -587,11 +587,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + + String orderByField = authDummyInventoryInfoEO.getOrderByField(); + String orderBy = authDummyInventoryInfoEO.getOrderBy(); + // 如果排序字段不为空 + if(org.apache.commons.lang.StringUtils.isNotEmpty(orderByField)){ +// if (StringUtils.equals(orderBy,"2")) { +// orderBy = " DESC"; +// }else { +// orderBy = " ASC"; +// } + // 转换字段 + orderByField = convertOrderByField(orderByField); + queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField); + }else { + queryWrapper.orderByDesc("create_time"); + } + List authDummyInventoryInfoEOList = this.list(queryWrapper); return authDummyInventoryInfoEOList; } + private String convertOrderByField(String orderByField) { + if(StringUtils.isEmpty(orderByField)){ + return null; + } + switch (orderByField) { + case "category" : return "category"; + case "inspectionItem" : return"inspection_item"; + case "configItem" : return"config_item"; + case "wvtaId" : return"wvta_id"; + case "serialNumber" : return "serial_number"; + case "dutyTerritory" : return "duty_territory"; + case "deliverableType" : return "deliverable_type"; + default: return null; + } + } + @Override public Result copyInfoByIds(String ids, String cut) { String resultMsg = "";