2.0bug修改

无关风月

2024-07-25 a1d7b7b122f92f7de47f7f35212f029f01e3e71a

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java

@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 系统设置控制器
@@ -120,7 +121,8 @@
    @RequestMapping(value = "/redSet/list")
    @ResponseBody
    public Object redSetList() {

        List<String> strings = new ArrayList<>();
        strings.add("updateTime");
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
@@ -129,7 +131,16 @@
            for (Map<String, Object> stringObjectMap : list) {
                stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
            }
            page.setRecords(list);
            List<Map<String, Object>> sortedList = list.stream()
                    .sorted((map1, map2) -> {
                        // 获取 updateTime 字段
                        String time1 = map1.get("updateTime").toString();
                        String time2 = map2.get("updateTime").toString();
                        // 倒序排列
                        return time2.compareTo(time1);
                    })
                    .collect(Collectors.toList());
            page.setRecords(sortedList);
        }
        return super.packForBT(page);
    }
@@ -172,7 +183,7 @@
        String s = replace + ":00";
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Date date = dateFormat.parse(s);
        tSysRedSet.setInsertTime(date);
        tSysRedSet.setEffectiveDate(date);
        tSysRedSet.setUpdateTime(new Date());
        redEnvelopePaymentSettingsService.updateById(tSysRedSet);
        return SUCCESS_TIP;