中扬CRM客户关系管理系统
LSH
2023-10-09 26ebf71529e5ee4f70c4ad3ed52ea5e59c1b46e5
src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -124,19 +124,22 @@
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
                case 0:
//                case 0:
//                    dto.setTitle("开始");
//                    dto.setMsg(user.getUsername() + "创建了审批");
//                    dto.setUserId(user.getId());
//                    dto.setUsername(user.getUsername());
//                    dto.setTime(DateUtils.convert(new Date()));
//                    dto.setCurr(Boolean.TRUE);
//                    list.add(dto);
//                    break;
                case 1:
                    dto.setTitle("开始");
                    dto.setMsg(user.getUsername() + "创建了审批");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setUsername(user.getNickname());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
                    break;
                case 1:
                    dto.setTitle("提交报销");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    list.add(dto);
                    break;
                case 2:
@@ -207,7 +210,7 @@
        return list;
    }
    public static List<SettleDto> initSalesPricing(User manager ,User user,List<String> names ,int nodes) {
    public static List<SettleDto> initSalesPricing(User manager ,User user,User userUp,List<String> names ,int nodes) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < nodes+1; i++) {
            SettleDto dto = new SettleDto();
@@ -215,9 +218,9 @@
            switch (i) {
                case 0:
                    dto.setTitle("开始");
                    dto.setMsg(user.getUsername() + names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setMsg(userUp.getUsername() + names.get(i));
                    dto.setUserId(userUp.getId());
                    dto.setUsername(userUp.getUsername());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
@@ -236,6 +239,8 @@
                    break;
                case 3:
                    dto.setTitle(names.get(i));
                    dto.setUserId(userUp.getId());
                    dto.setUsername(userUp.getUsername());
                    list.add(dto);
                    break;
                default:
@@ -280,6 +285,8 @@
                    break;
                case 4:
                    dto.setTitle(names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    list.add(dto);
                    break;
                default: